Skip to content

Commit

Permalink
Merge pull request #25 from ApplauseOSS/chore/update-deps
Browse files Browse the repository at this point in the history
chore: update pytest/flake8 packages
  • Loading branch information
agaffney authored Dec 2, 2024
2 parents db81cb8 + d1574f7 commit 16349cf
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion kmsencryption/__init__.py
Original file line number Diff line number Diff line change
@@ -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']
2 changes: 1 addition & 1 deletion kmsencryption/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
10 changes: 5 additions & 5 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -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
13 changes: 1 addition & 12 deletions setup.py
Original file line number Diff line number Diff line change
@@ -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.',
Expand All @@ -33,7 +25,4 @@ def finalize_options(self):
]
},
scripts=["kmsencryption/scripts/decrypt-and-start"],
cmdclass={
'release_to_pypi': ReleaseToPyPICommand
}
)

0 comments on commit 16349cf

Please sign in to comment.