Skip to content

Commit 8b6a493

Browse files
authored
chore: drop py3.6 from Oracle & Test Vectors (aws#529)
1 parent d064bf8 commit 8b6a493

File tree

13 files changed

+217
-107
lines changed

13 files changed

+217
-107
lines changed

.github/workflows/ci_decrypt-oracle.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
- uses: actions/checkout@v3
1515
- uses: actions/setup-python@v4
1616
with:
17-
# The oracle runs in a Python 3.6 Lamba
18-
python-version: 3.6
17+
# The oracle will run on a Python 3.9 Lamba
18+
python-version: 3.9
1919
- run: |
2020
python -m pip install --upgrade pip
2121
pip install --upgrade -r dev_requirements/ci-requirements.txt
@@ -41,7 +41,7 @@ jobs:
4141
- uses: actions/checkout@v3
4242
- uses: actions/setup-python@v4
4343
with:
44-
python-version: 3.8
44+
python-version: 3.9
4545
- run: |
4646
python -m pip install --upgrade pip
4747
pip install --upgrade -r dev_requirements/ci-requirements.txt

.github/workflows/ci_test-vector-handler.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ jobs:
2121
- windows-latest
2222
- macos-latest
2323
python:
24-
- 2.7
25-
- 3.6
2624
- 3.7
2725
- 3.8
2826
- 3.x
@@ -75,7 +73,7 @@ jobs:
7573
- uses: actions/checkout@v3
7674
- uses: actions/setup-python@v4
7775
with:
78-
python-version: 3.8
76+
python-version: 3.9
7977
- run: |
8078
python -m pip install --upgrade pip
8179
pip install --upgrade -r dev_requirements/ci-requirements.txt

.github/workflows/ci_tests.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ jobs:
2828
- windows-latest
2929
- macos-latest
3030
python:
31-
- 3.6
3231
- 3.7
3332
- 3.8
3433
- 3.9

buildspec.yml

-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ batch:
77
buildspec: codebuild/py36/integ.yml
88
- identifier: py36_examples
99
buildspec: codebuild/py36/examples.yml
10-
- identifier: py36_awses_local
11-
buildspec: codebuild/py36/awses_local.yml
1210

1311
- identifier: py37_integ
1412
buildspec: codebuild/py37/integ.yml

codebuild/py36/awses_local.yml

-27
This file was deleted.

decrypt_oracle/setup.py

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ def get_requirements():
4545
"Natural Language :: English",
4646
"License :: OSI Approved :: Apache Software License",
4747
"Programming Language :: Python",
48-
"Programming Language :: Python :: 3.6",
4948
"Programming Language :: Python :: 3.7",
5049
"Programming Language :: Python :: 3.8",
5150
"Programming Language :: Python :: 3.9",

decrypt_oracle/tox.ini

+6-36
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
envlist =
3-
py{36,37,38,39}-{local,integ},
3+
py{39}-{local,integ},
44
bandit, doc8, readme, docs,
55
{flake8,pylint}{,-tests},
66
# prone to false positives
@@ -35,7 +35,7 @@ envlist =
3535

3636

3737
[testenv:generate-pipeline]
38-
basepython = python3
38+
basepython = python3.9
3939
skip_install = true
4040
deps =
4141
troposphere[policy]
@@ -44,7 +44,7 @@ commands = python .chalice/pipeline.py {posargs}
4444

4545

4646
[testenv:chalice-prep]
47-
basepython = python3.6
47+
basepython = python3.9
4848
skip_install = true
4949
recreate = true
5050
deps = {[testenv:build]deps}
@@ -59,7 +59,7 @@ commands =
5959
python {toxinidir}/.chalice/build-requirements.py
6060

6161
[testenv:chalice]
62-
basepython = python3.6
62+
basepython = python3.9
6363
recreate = true
6464
deps =
6565
{[testenv:chalice-prep]deps}
@@ -69,7 +69,7 @@ commands =
6969
chalice {posargs}
7070

7171
[testenv:chalice-deploy]
72-
basepython = python3.6
72+
basepython = python3.9
7373
recreate = true
7474
deps =
7575
{[testenv:chalice]deps}
@@ -141,17 +141,6 @@ commands =
141141
{posargs}
142142
{[testenv:mypy-coverage]commands}
143143

144-
[testenv:mypy-py2]
145-
basepython = {[testenv:mypy-common]basepython}
146-
deps = {[testenv:mypy-common]deps}
147-
commands =
148-
python -m mypy \
149-
--py2 \
150-
--linecoverage-report build \
151-
src/aws_encryption_sdk_decrypt_oracle/ \
152-
{posargs}
153-
{[testenv:mypy-coverage]commands}
154-
155144
# Linters
156145
[testenv:flake8]
157146
basepython = python3
@@ -167,7 +156,6 @@ commands =
167156
app.py \
168157
setup.py \
169158
.chalice/pipeline.py \
170-
#doc/conf.py \
171159
{posargs}
172160

173161
[testenv:flake8-tests]
@@ -218,7 +206,6 @@ commands =
218206
src/aws_encryption_sdk_decrypt_oracle/ \
219207
setup.py \
220208
app.py \
221-
#doc/conf.py \
222209
test/ \
223210
.chalice/pipeline.py \
224211
{posargs}
@@ -276,7 +263,7 @@ basepython = python3
276263
deps =
277264
sphinx
278265
doc8
279-
commands = doc8 doc/index.rst README.rst CHANGELOG.rst
266+
commands = doc8 README.rst
280267

281268
[testenv:readme]
282269
basepython = python3
@@ -319,21 +306,6 @@ commands =
319306
{[testenv:flake8-tests]commands}
320307
{[testenv:pylint-tests]commands}
321308

322-
# Documentation
323-
[testenv:docs]
324-
basepython = python3
325-
deps = -rdoc/requirements.txt
326-
commands =
327-
sphinx-build -E -c doc/ -b html doc/ doc/build/html
328-
329-
[testenv:serve-docs]
330-
basepython = python3
331-
skip_install = true
332-
changedir = doc/build/html
333-
deps =
334-
commands =
335-
python -m http.server {posargs}
336-
337309
# Release tooling
338310
[testenv:park]
339311
basepython = python3
@@ -347,11 +319,9 @@ commands = python setup.py park
347319
basepython = python3
348320
skip_install = true
349321
deps =
350-
#{[testenv:docs]deps}
351322
wheel
352323
setuptools
353324
commands =
354-
#{[testenv:docs]commands}
355325
python setup.py sdist bdist_wheel
356326

357327
[testenv:test-release]

0 commit comments

Comments
 (0)