From b893ee622e38870dd8fc0d62b337b62ba671f07c Mon Sep 17 00:00:00 2001 From: mattsb42-aws Date: Thu, 30 Aug 2018 12:28:17 -0700 Subject: [PATCH 1/4] add CPython 3.7 CI testing and advertised support --- .travis.yml | 17 +++++++++++++++++ setup.py | 1 + 2 files changed, 18 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0429d18f..24562b1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,9 +22,26 @@ matrix: env: TOXENV=py36-local-slow - python: 3.6 env: TOXENV=py36-integ-slow + # CPython 3.7 + # xenial + sudo are currently needed to get 3.7 + # https://github.com/travis-ci/travis-ci/issues/9815 + - python: 3.7 + env: TOXENV=py37-local-slow + dist: xenial + sudo: true + - python: 3.7 + env: TOXENV=py37-integ-slow + dist: xenial + sudo: true # Upstream tests - python: 2.7 env: TOXENV=test-upstream-requirements-py27 + # xenial + sudo are currently needed to get 3.7 + # https://github.com/travis-ci/travis-ci/issues/9815 + - python: 3.7 + env: TOXENV=test-upstream-requirements-py37 + dist: xenial + sudo: true # MyPy # Disabled pending completion of integration # https://github.com/aws/aws-dynamodb-encryption-python/issues/66 diff --git a/setup.py b/setup.py index ce50254a..0a331375 100644 --- a/setup.py +++ b/setup.py @@ -58,6 +58,7 @@ def get_requirements(): 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: Implementation :: CPython', 'Topic :: Security', 'Topic :: Security :: Cryptography' From 1f38be6e6aa16ba1c5dc23e625ba1477e32c8c65 Mon Sep 17 00:00:00 2001 From: mattsb42-aws Date: Thu, 30 Aug 2018 16:30:36 -0700 Subject: [PATCH 2/4] work around https://github.com/travis-ci/travis-ci/issues/7940 --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 24562b1b..93127037 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,5 +69,9 @@ matrix: # env: TOXENV=flake8-tests # - python: 3.6 # env: TOXENV=pylint-tests -install: pip install tox +install: + # Clean up because Travis doesn't + # https://github.com/travis-ci/travis-ci/issues/7940 + - if [[ $TRAVIS_SUDO = true ]]; then sudo rm -f /etc/boto.cfg;done + - pip install tox script: travis_wait 60 tox -- -vv From 99413704125c436f27f9f26cfbbc1c642afd8a2d Mon Sep 17 00:00:00 2001 From: mattsb42-aws Date: Thu, 30 Aug 2018 16:34:08 -0700 Subject: [PATCH 3/4] tweak bash boolean check --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 93127037..c68bfd48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,6 +72,6 @@ matrix: install: # Clean up because Travis doesn't # https://github.com/travis-ci/travis-ci/issues/7940 - - if [[ $TRAVIS_SUDO = true ]]; then sudo rm -f /etc/boto.cfg;done + - if [[ $TRAVIS_SUDO ]]; then sudo rm -f /etc/boto.cfg;done - pip install tox script: travis_wait 60 tox -- -vv From 943a24aa6ecde7b37e733c9b2cc52f6133790c64 Mon Sep 17 00:00:00 2001 From: mattsb42-aws Date: Thu, 30 Aug 2018 16:36:05 -0700 Subject: [PATCH 4/4] remember how to bash --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c68bfd48..efac0f91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,6 +72,6 @@ matrix: install: # Clean up because Travis doesn't # https://github.com/travis-ci/travis-ci/issues/7940 - - if [[ $TRAVIS_SUDO ]]; then sudo rm -f /etc/boto.cfg;done + - if [[ $TRAVIS_SUDO ]]; then sudo rm -f /etc/boto.cfg; fi - pip install tox script: travis_wait 60 tox -- -vv