Skip to content

chore: remove CPython3.4 advertised support and add CPython3.8 #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 5, 2020
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
74 changes: 45 additions & 29 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,6 @@ matrix:
- python: 2.7
env: TOXENV=py27-examples
stage: Client Tests
# CPython 3.4
- python: 3.4
env: TOXENV=py34-local
stage: Client Tests
- python: 3.4
env: TOXENV=py34-integ
stage: Client Tests
- python: 3.4
env: TOXENV=py34-accept
stage: Client Tests
- python: 3.4
env: TOXENV=py34-examples
stage: Client Tests
# CPython 3.5
- python: 3.5
env: TOXENV=py35-local
Expand Down Expand Up @@ -77,6 +64,29 @@ matrix:
dist: xenial
sudo: true
stage: Client Tests
# CPython 3.8
# xenial + sudo are currently needed to get 3.8
# https://github.com/travis-ci/travis-ci/issues/9815
- python: 3.8
env: TOXENV=py38-local
dist: xenial
sudo: true
stage: Client Tests
- python: 3.8
env: TOXENV=py38-integ
dist: xenial
sudo: true
stage: Client Tests
- python: 3.8
env: TOXENV=py38-accept
dist: xenial
sudo: true
stage: Client Tests
- python: 3.8
env: TOXENV=py38-examples
dist: xenial
sudo: true
stage: Client Tests
# Upstream tests
- python: 3.6
env: TOXENV=nocmk
Expand Down Expand Up @@ -148,22 +158,6 @@ matrix:
TEST_VECTOR_HANDLERS=1
TOXENV=py27-awses_latest
stage: Test Vector Handler Tests
# CPython 3.4
- python: 3.4
env:
TEST_VECTOR_HANDLERS=1
TOXENV=py34-awses_1.3.3
stage: Test Vector Handler Tests
- python: 3.4
env:
TEST_VECTOR_HANDLERS=1
TOXENV=py34-awses_1.3.max
stage: Test Vector Handler Tests
- python: 3.4
env:
TEST_VECTOR_HANDLERS=1
TOXENV=py34-awses_latest
stage: Test Vector Handler Tests
# CPython 3.5
- python: 3.5
env:
Expand Down Expand Up @@ -218,6 +212,28 @@ matrix:
dist: xenial
sudo: true
stage: Test Vector Handler Tests
# CPython 3.8
- python: 3.8
env:
TEST_VECTOR_HANDLERS=1
TOXENV=py38-awses_1.3.3
dist: xenial
sudo: true
stage: Test Vector Handler Tests
- python: 3.8
env:
TEST_VECTOR_HANDLERS=1
TOXENV=py38-awses_1.3.max
dist: xenial
sudo: true
stage: Test Vector Handler Tests
- python: 3.8
env:
TEST_VECTOR_HANDLERS=1
TOXENV=py38-awses_latest
dist: xenial
sudo: true
stage: Test Vector Handler Tests
# Linters
- python: 3.6
env:
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Getting Started
Required Prerequisites
======================

* Python 2.7+ or 3.4+
* Python 2.7+ or 3.5+
* cryptography >= 1.8.1
* boto3
* attrs
Expand Down
40 changes: 18 additions & 22 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,28 +24,6 @@ environment:
- PYTHON: "C:\\Python27-x64"
TOXENV: "py27-examples"

# Python 3.4
- PYTHON: "C:\\Python34"
TOXENV: "py34-local"
- PYTHON: "C:\\Python34"
TOXENV: "py34-integ"
- PYTHON: "C:\\Python34"
TOXENV: "py34-accept"
- PYTHON: "C:\\Python34"
TOXENV: "py34-examples"
- PYTHON: "C:\\Python34-x64"
DISTUTILS_USE_SDK: "1"
TOXENV: "py34-local"
- PYTHON: "C:\\Python34-x64"
DISTUTILS_USE_SDK: "1"
TOXENV: "py34-integ"
- PYTHON: "C:\\Python34-x64"
DISTUTILS_USE_SDK: "1"
TOXENV: "py34-accept"
- PYTHON: "C:\\Python34-x64"
DISTUTILS_USE_SDK: "1"
TOXENV: "py34-examples"

# Python 3.5
- PYTHON: "C:\\Python35"
TOXENV: "py35-local"
Expand Down Expand Up @@ -100,6 +78,24 @@ environment:
- PYTHON: "C:\\Python37-x64"
TOXENV: "py37-examples"

# Python 3.8
- PYTHON: "C:\\Python38"
TOXENV: "py38-local"
- PYTHON: "C:\\Python38"
TOXENV: "py38-integ"
- PYTHON: "C:\\Python38"
TOXENV: "py38-accept"
- PYTHON: "C:\\Python38"
TOXENV: "py38-examples"
- PYTHON: "C:\\Python38-x64"
TOXENV: "py38-local"
- PYTHON: "C:\\Python38-x64"
TOXENV: "py38-integ"
- PYTHON: "C:\\Python38-x64"
TOXENV: "py38-accept"
- PYTHON: "C:\\Python38-x64"
TOXENV: "py38-examples"

install:
# Prepend newly installed Python to the PATH of this build
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ def get_requirements():
"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 :: Implementation :: CPython",
"Topic :: Security",
"Topic :: Security :: Cryptography",
Expand Down
2 changes: 1 addition & 1 deletion test_vector_handlers/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Getting Started
Required Prerequisites
======================

* Python 2.7 or 3.4+
* Python 2.7 or 3.5+
* aws-encryption-sdk

Use
Expand Down
2 changes: 1 addition & 1 deletion test_vector_handlers/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ def get_requirements():
"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 :: Implementation :: CPython",
"Topic :: Security",
"Topic :: Security :: Cryptography",
Expand Down
2 changes: 1 addition & 1 deletion test_vector_handlers/tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
envlist =
py{27,34,35,36,37}-awses_{1.3.3,1.3.max,latest},
py{27,35,36,37,38}-awses_{1.3.3,1.3.max,latest},
# 1.2.0 and 1.2.max are being difficult because of attrs
bandit, doc8, readme, docs,
{flake8,pylint}{,-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{27,34,35,36,37}-{local,integ,accept,examples}, nocmk,
py{27,35,36,37,38}-{local,integ,accept,examples}, nocmk,
bandit, doc8, readme, docs,
{flake8,pylint}{,-tests,-examples},
isort-check, black-check,
Expand Down