Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci_static-analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: '3.10'
- run: |
python -m pip install --upgrade pip
pip install --upgrade -r dev_requirements/ci-requirements.txt
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/ci_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,8 @@ jobs:
# x86 builds are only meaningful for Windows
- os: windows-latest
architecture: x86
- os: macos-13
architecture: x64
- os: macos-14
python:
- 3.8
- 3.9
- "3.10"
- "3.11"
- "3.12"
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/python-examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,8 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
python-version: ['3.10', '3.11', '3.12']
include:
- python-version: '3.8'
tox-env: 'py38-examples'
- python-version: '3.9'
tox-env: 'py39-examples'
- python-version: '3.10'
tox-env: 'py310-examples'
- python-version: '3.11'
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/python-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,8 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
python-version: ['3.10', '3.11', '3.12']
include:
- python-version: '3.8'
tox-env: 'py38-integ'
- python-version: '3.9'
tox-env: 'py39-integ'
- python-version: '3.10'
tox-env: 'py310-integ'
- python-version: '3.11'
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version: 2
build:
os: ubuntu-22.04
tools:
python: "3.8"
python: "3.10"

# Build documentation in the doc/ directory with Sphinx
sphinx:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Changelog

Deprecation
-----------
* The AWS Encryption SDK CLI no longer supports Python < 3.10 as of major version 4.3.x; only Python 3.10+ is supported.
* Removed ``pkg_resources`` in favor of ``importlib.metadata``
`#428 <https://github.com/aws/aws-encryption-sdk-cli/pull/428>`_

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Getting Started
Required Prerequisites
======================

* Python 3.8+
* Python 3.10+
* aws-encryption-sdk >= 3.1.0

Installation
Expand Down
10 changes: 2 additions & 8 deletions api_compatibility_tests/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,10 @@ def get_requirements():
"Natural Language :: English",
"License :: OSI Approved :: Apache Software License",
"Programming Language :: Python",
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"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 :: 3.12",
"Programming Language :: Python :: Implementation :: CPython",
"Topic :: Security",
"Topic :: Security :: Cryptography",
Expand Down
12 changes: 6 additions & 6 deletions dev_requirements/linter-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
bandit==1.7.5
bandit==1.9.2
black==22.8.0
doc8==1.0.0
flake8==4.0.1
flake8-docstrings==1.6.0
flake8-print==4.0.0
flake8==5.0.4
flake8-docstrings==1.7.0
flake8-print==5.0.0
isort==5.10.1
mock==4.0.3
pyflakes==2.4.0
pylint==2.12.2
pyflakes==2.5.0
pylint==3.0.3
pytest==7.4.0
pytest-cov==4.1.0
pytest-mock==3.11.1
Expand Down
3 changes: 0 additions & 3 deletions examples/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ def get_requirements():
"License :: OSI Approved :: Apache Software 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 :: Implementation :: CPython",
"Topic :: Security",
Expand Down
2 changes: 0 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ def get_requirements():
"License :: OSI Approved :: Apache Software 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 :: 3.12",
Expand Down
2 changes: 1 addition & 1 deletion src/aws_encryption_sdk_cli/internal/arg_parsing.py
Original file line number Diff line number Diff line change
Expand Up @@ -664,6 +664,6 @@ def parse_args(raw_args=None):
if parsed_args.caching is not None:
parsed_args.caching = _process_caching_config(parsed_args.caching)
except ParameterParseError as error:
parser.error(*error.args)
parser.error(*error.args) # pylint: disable=no-value-for-parameter

return parsed_args
2 changes: 1 addition & 1 deletion src/aws_encryption_sdk_cli/internal/io_handling.py
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ def process_single_file(self, stream_args, source, destination):
operation_result = OperationResult.FAILED
raise
finally:
if operation_result.needs_cleanup and destination != "-": # pylint: disable=no-member
if operation_result.needs_cleanup and destination != "-": # pylint:disable=no-member,used-before-assignment
_LOGGER.warning("Operation failed: deleting output file: %s", destination)
try:
os.remove(destination)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def _discover_entry_points():
_LOGGER.debug("Discovering master key provider plugins")

for dist in distributions():
dist_name = dist.metadata.get("Name") or dist.metadata.get("name") or "unknown"
dist_name = dist.metadata['Name'] or dist.metadata['name'] or "unknown"

for entry_point in dist.entry_points:
if entry_point.group != MASTER_KEY_PROVIDERS_ENTRY_POINT:
Expand Down
1 change: 1 addition & 0 deletions src/pylintrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[MESSAGES CONTROL]
errors-only = yes
# Disabling messages that we either don't care about
# for tests or are necessary to break for tests.
disable =
Expand Down
1 change: 1 addition & 0 deletions test/pylintrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[MESSAGES CONTROL]
errors-only = yes
# Disabling messages that we either don't care about
# for tests or are necessary to break for tests.
#
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
envlist =
py{38,39,310,311,312}-{local,integ,examples},
py{310,311,312}-{local,integ,examples},
mypy-py{3},
bandit, doc8, readme, docs,
flake8{,-tests,-examples}, pylint{,-tests,-examples},
Expand Down