Skip to content

Commit

Permalink
feat: Deprecate Python 3.7 Support (#416)
Browse files Browse the repository at this point in the history
Advertise 3.11 & 3.12 on PyPi via setup.py
  • Loading branch information
texastony authored Apr 9, 2024
1 parent 95008aa commit 2ce5c80
Show file tree
Hide file tree
Showing 12 changed files with 102 additions and 77 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ci_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,11 @@ jobs:
- os: macos-latest
architecture: x64
python:
- 3.7
- 3.8
- 3.9
- 3.x
- "3.10"
- "3.11"
- "3.12"
category:
- local
# These require credentials.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- os: macos-latest
architecture: x64
python:
- 3.x
- "3.12"
category:
- local
# These require credentials.
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.7+
* Python 3.8+
* aws-encryption-sdk >= 3.1.0

Installation
Expand Down
23 changes: 18 additions & 5 deletions buildspec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@ version: 0.2
batch:
fast-fail: false
build-list:
- identifier: py37_integ
buildspec: codebuild/py37/integ.yml
- identifier: py37_examples
buildspec: codebuild/py37/examples.yml

- identifier: py38_integ
buildspec: codebuild/py38/integ.yml
- identifier: py38_examples
Expand All @@ -23,5 +18,23 @@ batch:
- identifier: py310_examples
buildspec: codebuild/py310/examples.yml

- identifier: py311_integ
buildspec: codebuild/py311/integ.yml
env:
image: aws/codebuild/standard:7.0
- identifier: py311_examples
buildspec: codebuild/py311/examples.yml
env:
image: aws/codebuild/standard:7.0

- identifier: py312_integ
buildspec: codebuild/py312/integ.yml
env:
image: aws/codebuild/standard:7.0
- identifier: py312_examples
buildspec: codebuild/py312/examples.yml
env:
image: aws/codebuild/standard:7.0

- identifier: code_coverage
buildspec: codebuild/coverage.yml
20 changes: 20 additions & 0 deletions codebuild/py311/examples.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
version: 0.2

env:
variables:
TOXENV: "py311-examples"
AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID: >-
arn:aws:kms:us-west-2:658956600833:key/b3537ef1-d8dc-4780-9f5a-55776cbb2f7f
AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID_2: >-
arn:aws:kms:eu-central-1:658956600833:key/75414c93-5285-4b57-99c9-30c1cf0a22c2
AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_MRK_KEY_ID_1: >-
arn:aws:kms:us-east-1:658956600833:key/mrk-80bd8ecdcd4342aebd84b7dc9da498a7
phases:
install:
runtime-versions:
python: 3.11
build:
commands:
- pip install -r dev_requirements/ci-requirements.txt
- tox
18 changes: 18 additions & 0 deletions codebuild/py311/integ.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
version: 0.2

env:
variables:
TOXENV: "py311-integ"
AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID: >-
arn:aws:kms:us-west-2:658956600833:key/b3537ef1-d8dc-4780-9f5a-55776cbb2f7f
AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_MRK_KEY_ID_1: >-
arn:aws:kms:us-east-1:658956600833:key/mrk-80bd8ecdcd4342aebd84b7dc9da498a7
phases:
install:
runtime-versions:
python: 3.11
build:
commands:
- pip install -r dev_requirements/ci-requirements.txt
- tox
20 changes: 20 additions & 0 deletions codebuild/py312/examples.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
version: 0.2

env:
variables:
TOXENV: "py312-examples"
AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID: >-
arn:aws:kms:us-west-2:658956600833:key/b3537ef1-d8dc-4780-9f5a-55776cbb2f7f
AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID_2: >-
arn:aws:kms:eu-central-1:658956600833:key/75414c93-5285-4b57-99c9-30c1cf0a22c2
AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_MRK_KEY_ID_1: >-
arn:aws:kms:us-east-1:658956600833:key/mrk-80bd8ecdcd4342aebd84b7dc9da498a7
phases:
install:
runtime-versions:
python: 3.12
build:
commands:
- pip install -r dev_requirements/ci-requirements.txt
- tox
18 changes: 18 additions & 0 deletions codebuild/py312/integ.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
version: 0.2

env:
variables:
TOXENV: "py312-integ"
AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID: >-
arn:aws:kms:us-west-2:658956600833:key/b3537ef1-d8dc-4780-9f5a-55776cbb2f7f
AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_MRK_KEY_ID_1: >-
arn:aws:kms:us-east-1:658956600833:key/mrk-80bd8ecdcd4342aebd84b7dc9da498a7
phases:
install:
runtime-versions:
python: 3.12
build:
commands:
- pip install -r dev_requirements/ci-requirements.txt
- tox
34 changes: 0 additions & 34 deletions codebuild/py37/examples.yml

This file was deleted.

32 changes: 0 additions & 32 deletions codebuild/py37/integ.yml

This file was deleted.

3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,11 @@ 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 :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: Implementation :: CPython",
"Topic :: Security",
"Topic :: Security :: Cryptography",
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{36,37,38,39,310,311,312}-{local,integ,examples},
py{38,39,310,311,312}-{local,integ,examples},
mypy-py{3},
bandit, doc8, readme, docs,
flake8{,-tests,-examples}, pylint{,-tests,-examples},
Expand Down

0 comments on commit 2ce5c80

Please sign in to comment.