diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 88999ca..8fdec26 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -9,7 +9,7 @@ jobs: steps: - uses: actions/setup-python@v2 with: - python-version: '3.8' + python-version: '3.10' - uses: actions/checkout@v2 - run: pip3 install tox - run: tox diff --git a/kmsencryption/__init__.py b/kmsencryption/__init__.py index e794a92..e9661fd 100644 --- a/kmsencryption/__init__.py +++ b/kmsencryption/__init__.py @@ -1,6 +1,6 @@ -from kmsencryption.lib import encrypt from kmsencryption.lib import decrypt from kmsencryption.lib import decrypt_json +from kmsencryption.lib import encrypt from kmsencryption.lib import encrypt_json __all__ = ['encrypt', 'decrypt', 'decrypt_json', 'encrypt_json'] diff --git a/kmsencryption/__main__.py b/kmsencryption/__main__.py index f5fe296..f54e292 100644 --- a/kmsencryption/__main__.py +++ b/kmsencryption/__main__.py @@ -41,7 +41,7 @@ def decrypt(data, env, path, profile, prefix, no_newline): @click.option('--prefix', 'prefix', default='', help='An input prefix to be trimmed from the beginning before a value is decrypted.') @click.option('--allow-partial', default=False, is_flag=True, - help='If partially encrypted string values inside JSON are allowed. Substrings to decrypt are ' + + help='If partially encrypted string values inside JSON are allowed. Substrings to decrypt are ' 'identified by the starting prefix and end with a whitespace or end of string.') def decrypt_json(input, profile, prefix, allow_partial): click.echo(lib.decrypt_json(input, profile, prefix, allow_partial)) diff --git a/requirements-dev.txt b/requirements-dev.txt index e841901..78a058d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,9 +1,9 @@ -pytest==4.6.11 +pytest==8.3.4 pytest-cov==2.10.1 -pytest-flake8==0.6 +pytest-flake8==1.3.0 pycmd==1.2 -flake8==3.0.4 -isort==4.2.5 -flake8-isort==2.0.1 +flake8==7.1.1 +isort==5.13.2 +flake8-isort==6.1.1 ipython==8.10.0 ipdb==0.13.9 diff --git a/setup.py b/setup.py index 5fda072..eb62c1e 100644 --- a/setup.py +++ b/setup.py @@ -1,18 +1,10 @@ from setuptools import find_packages from setuptools import setup -from setuptools.command.upload import upload import os -class ReleaseToPyPICommand(upload): - - def finalize_options(self): - self.repository = os.environ['PYPI_URL'] - self.username = os.environ['PYPI_USERNAME'] - self.password = os.environ['PYPI_PASSWORD'] - setup( name='kms-encryption-toolbox', - version='0.2.3', + version='0.2.4', url='https://github.com/ApplauseOSS/kms-encryption-toolbox', license='MIT', description='Encryption toolbox to be used with the Amazon Key Management Service for securing your deployment secrets. It encapsulates the aws-encryption-sdk package to expose cmdline actions.', @@ -33,7 +25,4 @@ def finalize_options(self): ] }, scripts=["kmsencryption/scripts/decrypt-and-start"], - cmdclass={ - 'release_to_pypi': ReleaseToPyPICommand - } )