Modernize Packaging

.github/workflows/ci.yml

@@ -8,9 +8,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - python-version: 3.7
-          env:
-            TOXENV: py
         - python-version: 3.8
           env:
             TOXENV: py
@@ -25,10 +22,10 @@ jobs:
             TOXENV: py
 
         # PyPy
-        - python-version: pypy3.7
+        - python-version: pypy3.8
           env:
             TOXENV: pypy3
-        - python-version: pypy3.9
+        - python-version: pypy3.10
           env:
             TOXENV: pypy3
 

.pre-commit-config.yaml

@@ -1,9 +1,9 @@
 repos:
 - repo: git@github.com:PyCQA/isort.git
-  rev: 5.10.1
+  rev: 5.12.0
   hooks:
     - id: isort
 - repo: git@github.com:psf/black.git
-  rev: 22.3.0
+  rev: 23.7.0
   hooks:
     - id: black

README.rst

@@ -22,7 +22,7 @@ Python implementation of AES with CBC/ECB mode and padding scheme PKCS5.
 ============
 Requirements
 ============
-* Python 3.7+
+* Python 3.8+
 
 Install
 =======

aes_pkcs5/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.0.1"

docs/conf.py

@@ -14,12 +14,13 @@
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
 from datetime import datetime
+from importlib.metadata import metadata
 
 # -- Project information -----------------------------------------------------
 
 project = "AESPKCS5"
-copyright = f"{datetime.utcnow():%Y}, Laerte Pereira"
-author = "Laerte Pereira"
+author = metadata("aes_pkcs5")["Author"]
+copyright = f"{datetime.utcnow():%Y}, {author}"
 
 # The full version, including alpha/beta/rc tags
 release = "2022"
@@ -53,9 +54,4 @@
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ["_static"]
 
-try:
-    from importlib.metadata import version
-except ModuleNotFoundError:  # Python < 3.8
-    from importlib_metadata import version
-
-version = version("aes_pkcs5")
+version = metadata("aes_pkcs5")["Version"]

docs/install.rst

@@ -5,7 +5,7 @@ Installation guide
 Supported Python versions
 =========================
 
-AESPKCS5 requires Python 3.7+ and depends only of ``cryptography`` package.
+AESPKCS5 requires Python 3.8+ and depends only of ``cryptography`` package.
 
 Installing AESPKCS5
 ====================

requirements-dev.txt

@@ -1,3 +1,3 @@
-black>=22.3.0
-isort>=5.10.1
-pre-commit>=2.19.0
+black>=23.7.0
+isort>=5.12.0
+pre-commit>=3.3.3

setup.cfg

@@ -0,0 +1,38 @@
+[metadata]
+name = aes_pkcs5
+version = 1.0.2
+description = Implementation of AES with CBC/ECB mode and padding scheme PKCS5
+long_description = file: README.rst
+long_description_content_type = text/x-rst
+author = Laerte Pereira
+author_email = hi@laerte.dev
+license = BSD License
+url = https://github.com/Laerte/aes_pkcs5
+project_urls =
+    Documentation = https://aes-pkcs5.readthedocs.io
+    Source = https://github.com/Laerte/aes_pkcs5
+    Tracker = https://github.com/Laerte/aes_pkcs5/issues
+classifiers =
+    Intended Audience :: Developers
+    Development Status :: 5 - Production/Stable
+    Operating System :: OS Independent
+    License :: OSI Approved :: BSD License
+    Programming Language :: Python
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
+    Programming Language :: Python :: Implementation :: CPython
+    Programming Language :: Python :: Implementation :: PyPy
+    Topic :: Software Development :: Libraries :: Python Modules
+
+[options]
+packages = find:
+python_requires = >=3.8
+install_requires = 
+    cryptography >= 41.0.2
+
+[options.packages.find]
+include = aes_pkcs5*
+exclude = tests.*

setup.py

@@ -1,10 +1,8 @@
 from os import system
 
-from setuptools import find_packages, setup
+from setuptools import setup
 from setuptools.command.develop import develop
 
-from aes_pkcs5 import __version__
-
 
 class CustomDevelopCommand(develop):
     """Instal development dependencies"""
@@ -14,48 +12,4 @@ def install_for_development(self):
         system("pre-commit install")
 
 
-requires = ["cryptography >= 38.0.1"]
-
-extras = {}
-
-with open("README.rst") as f:
-    long_description = f.read()
-
-setup(
-    name="aes_pkcs5",
-    version=__version__,
-    description="Implementation of AES with CBC/ECB mode and padding scheme PKCS5",
-    long_description=long_description,
-    long_description_content_type="text/x-rst",
-    author="Laerte Pereira",
-    author_email="hi@laerte.dev",
-    license="BSD",
-    url="https://github.com/Laerte/aes_pkcs5",
-    project_urls={
-        "Documentation": "https://aes-pkcs5.readthedocs.io",
-        "Source": "https://github.com/Laerte/aes_pkcs5",
-        "Tracker": "https://github.com/Laerte/aes_pkcs5/issues",
-    },
-    packages=find_packages(include=["aes_pkcs5*"], exclude=["tests.*"]),
-    classifiers=[
-        "Intended Audience :: Developers",
-        "Development Status :: 5 - Production/Stable",
-        "Operating System :: OS Independent",
-        "License :: OSI Approved :: BSD License",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 3",
-        "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 :: CPython",
-        "Programming Language :: Python :: Implementation :: PyPy",
-        "Topic :: Software Development :: Libraries :: Python Modules",
-    ],
-    python_requires=">=3.7",
-    include_package_data=True,
-    install_requires=requires,
-    extras_require=extras,
-    cmdclass={"develop": CustomDevelopCommand},
-)
+setup(cmdclass={"develop": CustomDevelopCommand})

tox.ini

@@ -11,8 +11,6 @@ commands =
 [docs]
 changedir = docs
 deps =
-    # importlib doesn't exist on python 3.7 so we need backport
-    importlib_metadata==4.11.4; python_version < '3.8'
     -rdocs/requirements.txt
 
 [testenv:docs]