Skip to content

Commit

Permalink
chore: drop py3.6 from Oracle & Test Vectors (#529)
Browse files Browse the repository at this point in the history
  • Loading branch information
texastony committed Nov 24, 2022
1 parent d064bf8 commit 8b6a493
Show file tree
Hide file tree
Showing 13 changed files with 217 additions and 107 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci_decrypt-oracle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
# The oracle runs in a Python 3.6 Lamba
python-version: 3.6
# The oracle will run on a Python 3.9 Lamba
python-version: 3.9
- run: |
python -m pip install --upgrade pip
pip install --upgrade -r dev_requirements/ci-requirements.txt
Expand All @@ -41,7 +41,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: 3.9
- run: |
python -m pip install --upgrade pip
pip install --upgrade -r dev_requirements/ci-requirements.txt
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/ci_test-vector-handler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:
- windows-latest
- macos-latest
python:
- 2.7
- 3.6
- 3.7
- 3.8
- 3.x
Expand Down Expand Up @@ -75,7 +73,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: 3.9
- run: |
python -m pip install --upgrade pip
pip install --upgrade -r dev_requirements/ci-requirements.txt
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/ci_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ jobs:
- windows-latest
- macos-latest
python:
- 3.6
- 3.7
- 3.8
- 3.9
Expand Down
2 changes: 0 additions & 2 deletions buildspec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ batch:
buildspec: codebuild/py36/integ.yml
- identifier: py36_examples
buildspec: codebuild/py36/examples.yml
- identifier: py36_awses_local
buildspec: codebuild/py36/awses_local.yml

- identifier: py37_integ
buildspec: codebuild/py37/integ.yml
Expand Down
27 changes: 0 additions & 27 deletions codebuild/py36/awses_local.yml

This file was deleted.

1 change: 0 additions & 1 deletion decrypt_oracle/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ def get_requirements():
"Natural Language :: English",
"License :: OSI Approved :: Apache Software License",
"Programming Language :: Python",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
Expand Down
42 changes: 6 additions & 36 deletions decrypt_oracle/tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
envlist =
py{36,37,38,39}-{local,integ},
py{39}-{local,integ},
bandit, doc8, readme, docs,
{flake8,pylint}{,-tests},
# prone to false positives
Expand Down Expand Up @@ -35,7 +35,7 @@ envlist =


[testenv:generate-pipeline]
basepython = python3
basepython = python3.9
skip_install = true
deps =
troposphere[policy]
Expand All @@ -44,7 +44,7 @@ commands = python .chalice/pipeline.py {posargs}


[testenv:chalice-prep]
basepython = python3.6
basepython = python3.9
skip_install = true
recreate = true
deps = {[testenv:build]deps}
Expand All @@ -59,7 +59,7 @@ commands =
python {toxinidir}/.chalice/build-requirements.py

[testenv:chalice]
basepython = python3.6
basepython = python3.9
recreate = true
deps =
{[testenv:chalice-prep]deps}
Expand All @@ -69,7 +69,7 @@ commands =
chalice {posargs}

[testenv:chalice-deploy]
basepython = python3.6
basepython = python3.9
recreate = true
deps =
{[testenv:chalice]deps}
Expand Down Expand Up @@ -141,17 +141,6 @@ commands =
{posargs}
{[testenv:mypy-coverage]commands}

[testenv:mypy-py2]
basepython = {[testenv:mypy-common]basepython}
deps = {[testenv:mypy-common]deps}
commands =
python -m mypy \
--py2 \
--linecoverage-report build \
src/aws_encryption_sdk_decrypt_oracle/ \
{posargs}
{[testenv:mypy-coverage]commands}

# Linters
[testenv:flake8]
basepython = python3
Expand All @@ -167,7 +156,6 @@ commands =
app.py \
setup.py \
.chalice/pipeline.py \
#doc/conf.py \
{posargs}

[testenv:flake8-tests]
Expand Down Expand Up @@ -218,7 +206,6 @@ commands =
src/aws_encryption_sdk_decrypt_oracle/ \
setup.py \
app.py \
#doc/conf.py \
test/ \
.chalice/pipeline.py \
{posargs}
Expand Down Expand Up @@ -276,7 +263,7 @@ basepython = python3
deps =
sphinx
doc8
commands = doc8 doc/index.rst README.rst CHANGELOG.rst
commands = doc8 README.rst

[testenv:readme]
basepython = python3
Expand Down Expand Up @@ -319,21 +306,6 @@ commands =
{[testenv:flake8-tests]commands}
{[testenv:pylint-tests]commands}

# Documentation
[testenv:docs]
basepython = python3
deps = -rdoc/requirements.txt
commands =
sphinx-build -E -c doc/ -b html doc/ doc/build/html

[testenv:serve-docs]
basepython = python3
skip_install = true
changedir = doc/build/html
deps =
commands =
python -m http.server {posargs}

# Release tooling
[testenv:park]
basepython = python3
Expand All @@ -347,11 +319,9 @@ commands = python setup.py park
basepython = python3
skip_install = true
deps =
#{[testenv:docs]deps}
wheel
setuptools
commands =
#{[testenv:docs]commands}
python setup.py sdist bdist_wheel

[testenv:test-release]
Expand Down

0 comments on commit 8b6a493

Please sign in to comment.