Restructure the project in order to replace distutils with setuptoolsv1.1.0

8 files changed, 74 insertions, 60 deletions

diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..21a01e2
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,14 @@
+[build-system]
+requires = [
+    "setuptools>=51",
+    "wheel"
+]
+
+build-backend = "setuptools.build_meta"
+
+
+[tool.pytest.ini_options]
+minversion = "6.0"
+testpaths = [
+    "tests"
+]
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..d6b2eb9
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,42 @@
+[metadata]
+name = pyotp2289
+version = attr: otp2289.__version__
+author = attr: otp2289.__author__
+author_email = sgs@pichove.org
+description = A pure Python implementation of "A One-Time Password System"
+long_description = file: README.md
+long_description_content_type = text/markdown
+url = https://github.com/blackm0re/pyotp2289
+
+classifiers =
+    Development Status :: 5 - Production/Stable
+    Intended Audience :: Developers
+    License :: OSI Approved :: BSD License
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
+    Programming Language :: Python :: Implementation
+    Operating System :: OS Independent
+    Topic :: Security :: Cryptography
+
+project_urls =
+    Bug Tracker = https://github.com/blackm0re/pyotp2289/issues
+    Source = https://github.com/blackm0re/pyotp2289
+    API Documentation = https://gnulover.simeonov.no/docs/api/pyotp2289/latest/
+
+[options]
+package_dir =
+    = src
+packages = find:
+python_requires = >=3.6
+
+[options.packages.find]
+where = src
+
+[options.entry_points]
+console_scripts =
+    otp2289 = otp2289.__main__:main
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 875d966..0000000
--- a/setup.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import setuptools
-
-import otp2289
-
-
-with open('README.md', 'r') as fh:
-    long_description = fh.read()
-
-
-setuptools.setup(
-    name='pyotp2289',
-    version=otp2289.__version__,
-    author=otp2289.__author__,
-    author_email='sgs@pichove.org',
-    description='A pure Python implementation of "A One-Time Password System"',
-    license=otp2289.__license__,
-    long_description=long_description,
-    long_description_content_type='text/markdown',
-    url='https://github.com/blackm0re/pyotp2289',
-    packages=setuptools.find_packages(),
-    exclude_package_data={'': ['.gitignore']},
-    entry_points={
-        'console_scripts': [
-            'otp2289=otp2289.__main__:main',
-        ],
-    },
-    classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: BSD License',
-        'Programming Language :: Python :: 3 :: Only',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: Implementation',
-        'Operating System :: OS Independent',
-        'Topic :: Security :: Cryptography'
-    ],
-    keywords='2289 freebsd unix security cryptography otp password',
-    project_urls={
-        'Bug Reports': 'https://github.com/blackm0re/pyotp2289/issues',
-        'Source': 'https://github.com/blackm0re/pyotp2289',
-        'API Documentation': (
-            'http://gnulover.simeonov.no/docs/api/pyotp2289/latest/')
-    },
-    python_requires='>=3.6',
-)
diff --git a/sphinx_conf.py b/sphinx_conf.py
index c7247ee..561db43 100644
--- a/sphinx_conf.py
+++ b/sphinx_conf.py
@@ -12,20 +12,23 @@
 #
 # import os
 # import sys
-# sys.path.insert(0, '/home/sgs/development/gitprogs/python/pyotp2289/otp2289')
+# sys.path.insert(
+#     0,
+#     '/home/sgs/development/gitprogs/python/pyotp2289/src/otp2289',
+# )
 
 
 # -- Project information -----------------------------------------------------
 
 project = 'pyotp2289'
-copyright = '2020, Simeon Simeonov'
+copyright = '2020-2022, Simeon Simeonov'
 author = 'Simeon Simeonov'
 
 # The short X.Y version
-version = '1.0.0'
+version = '1.1.0'
 
 # The full version, including alpha/beta/rc tags
-release = '1.0.0'
+release = '1.1.0'
 
 
 # -- General configuration ---------------------------------------------------
@@ -81,4 +84,4 @@ html_static_path = ['_static']
 todo_include_todos = True
 
 # Generated by running: sphinx-apidoc with:
-# -P -F -o html -H pyotp2289 -A "Simeon Simeonov" -V "1.0.0" otp2289
+# -P -F -o html -H pyotp2289 -A "Simeon Simeonov" -V "1.1.0" otp2289
diff --git a/otp2289/__init__.py b/src/otp2289/__init__.py
index 59694a7..59694a7 100644
--- a/otp2289/__init__.py
+++ b/src/otp2289/__init__.py
diff --git a/otp2289/__main__.py b/src/otp2289/__main__.py
index 78e60e8..78e60e8 100644
--- a/otp2289/__main__.py
+++ b/src/otp2289/__main__.py
diff --git a/otp2289/generator.py b/src/otp2289/generator.py
index 7b86e1b..7b86e1b 100644
--- a/otp2289/generator.py
+++ b/src/otp2289/generator.py
diff --git a/otp2289/server.py b/src/otp2289/server.py
index 7f742cd..066cba2 100644
--- a/otp2289/server.py
+++ b/src/otp2289/server.py
@@ -456,11 +456,16 @@ class OTPStore:
         in a child class.
 
         dict_obj has the following format:
-        {'key': {'ot_hex': val1,
-                 'current_step': val2,
-                 'seed': val3,
-                 'hash_algo': val4},
-         ...., ....}
+        {
+            'key': {
+                'ot_hex': val1,
+                'current_step': val2,
+                'seed': val3,
+                'hash_algo': val4
+            },
+            ...,
+            ...,
+        }
 
         :param dict_obj: The dict-object
         :type dict_obj: dict