From 84ed48c11ca9ce53c46a288b6f3e232c301cae0a Mon Sep 17 00:00:00 2001 From: Laerte Pereira Date: Sat, 21 Jan 2023 22:47:35 -0300 Subject: [PATCH 1/5] chore(CI): Deprecate direct invocation of `setup.py` --- .github/workflows/publish.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5dfa62f..8fc579c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,10 +11,11 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: 3.8 - - run: pip install --upgrade setuptools wheel - - run: python setup.py sdist bdist_wheel + python-version: 3.11 + - run: | + pip install --upgrade build twine + python -m build - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: - password: ${{ secrets.PYPI_API_TOKEN }} + password: ${{ secrets.PYPI_API_TOKEN }} \ No newline at end of file From 3380949e8b15b1012a593db1cf70fdbc44ef2306 Mon Sep 17 00:00:00 2001 From: Laerte Pereira Date: Sat, 21 Jan 2023 22:50:56 -0300 Subject: [PATCH 2/5] chore: Add project urls to `setup.py` file, bump version --- aes_pkcs5/__init__.py | 2 +- setup.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/aes_pkcs5/__init__.py b/aes_pkcs5/__init__.py index 5becc17..5c4105c 100644 --- a/aes_pkcs5/__init__.py +++ b/aes_pkcs5/__init__.py @@ -1 +1 @@ -__version__ = "1.0.0" +__version__ = "1.0.1" diff --git a/setup.py b/setup.py index ec468b6..c3d1562 100644 --- a/setup.py +++ b/setup.py @@ -30,6 +30,11 @@ def install_for_development(self): 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", From e26a88d91b45237ca9204306148476e9237ebef4 Mon Sep 17 00:00:00 2001 From: Laerte Pereira Date: Sat, 21 Jan 2023 22:55:36 -0300 Subject: [PATCH 3/5] =?UTF-8?q?fix(tox):=20Rename=20whitelist=5Fexternals?= =?UTF-8?q?=20=E2=86=92=20allowlist=5Fexternals?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index f79e9ad..6607cd7 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ envlist = py, linter [testenv] -whitelist_externals = make +allowlist_externals = make deps = -rtests/requirements.txt commands = From 6f4f09d75653ed85e1cb6b665389b813f9b725cb Mon Sep 17 00:00:00 2001 From: Laerte Pereira Date: Sat, 21 Jan 2023 23:09:40 -0300 Subject: [PATCH 4/5] feat: Add twinecheck to tox --- .github/workflows/ci.yml | 3 +++ tox.ini | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 803f159..43eabdc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,6 +62,9 @@ jobs: - python-version: "3.10" env: TOXENV: linter + - python-version: "3.10" + env: + TOXENV: twinecheck steps: - uses: actions/checkout@v3 diff --git a/tox.ini b/tox.ini index 6607cd7..3ec7edc 100644 --- a/tox.ini +++ b/tox.ini @@ -33,3 +33,12 @@ commands = python setup.py develop isort . --check --diff black . --check + +[testenv:twinecheck] +basepython = python3 +deps = + twine==4.0.1 + build==0.9.0 +commands = + python -m build --sdist + twine check dist/* \ No newline at end of file From b63d9d2e78f16b4f9295e90ff435f8e072e767ac Mon Sep 17 00:00:00 2001 From: Laerte Pereira Date: Sat, 21 Jan 2023 23:13:39 -0300 Subject: [PATCH 5/5] chore: Add `long_description_content_type` --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index c3d1562..5cd32ba 100644 --- a/setup.py +++ b/setup.py @@ -26,6 +26,7 @@ def install_for_development(self): 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",