Skip to content

Commit

Permalink
merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
Laerte committed Jul 19, 2023
2 parents 7357306 + b63d9d2 commit 5066550
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 13 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ jobs:
- python-version: "3.10"
env:
TOXENV: linter
- python-version: "3.10"
env:
TOXENV: twinecheck

steps:
- uses: actions/checkout@v3
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
7 changes: 2 additions & 5 deletions aes_pkcs5/__init__.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
from sys import version_info

if version_info >= (3, 8):
from importlib.metadata import metadata
else:
from importlib_metadata import metadata
from importlib.metadata import metadata

_pkg_info = metadata("aes_pkcs5")

__version__ = _pkg_info["Version"]
__author__ = _pkg_info["Author"]

__all__ = ("__version__", "__author__")
__all__ = ("__version__", "__author__")
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = aes_pkcs5
version = 1.0.0
version = 1.0.2
description = Implementation of AES with CBC/ECB mode and padding scheme PKCS5
long_description = file: README.rst
author = Laerte Pereira
Expand All @@ -25,7 +25,7 @@ classifiers =

[options]
packages = find:
python_requires = >=3.7
python_requires = >=3.8
install_requires =
cryptography >= 38.0.1

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ def install_for_development(self):
system("pre-commit install")


setup(cmdclass={"develop": CustomDevelopCommand})
setup(cmdclass={"develop": CustomDevelopCommand})
11 changes: 10 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
envlist = py, linter

[testenv]
whitelist_externals = make
allowlist_externals = make
deps =
-rtests/requirements.txt
commands =
Expand Down Expand Up @@ -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/*

0 comments on commit 5066550

Please sign in to comment.