Skip to content

Commit

Permalink
Merge pull request #94 from mattsb42-aws/travis-zones
Browse files Browse the repository at this point in the history
CI organization tweaks
  • Loading branch information
mattsb42-aws committed Nov 6, 2018
2 parents 3a02cb6 + 1470ebd commit 83a904e
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 2 deletions.
55 changes: 55 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,95 +5,130 @@ matrix:
# CPython 2.7
- python: 2.7
env: TOXENV=py27-local
stage: Client Tests
- python: 2.7
env: TOXENV=py27-integ
stage: Client Tests
- python: 2.7
env: TOXENV=py27-accept
stage: Client Tests
- 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
stage: Client Tests
- python: 3.5
env: TOXENV=py35-integ
stage: Client Tests
- python: 3.5
env: TOXENV=py35-accept
stage: Client Tests
- python: 3.5
env: TOXENV=py35-examples
stage: Client Tests
# CPython 3.6
- python: 3.6
env: TOXENV=py36-local
stage: Client Tests
- python: 3.6
env: TOXENV=py36-integ
stage: Client Tests
- python: 3.6
env: TOXENV=py36-accept
stage: Client Tests
- python: 3.6
env: TOXENV=py36-examples
stage: Client Tests
# 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
dist: xenial
sudo: true
stage: Client Tests
- python: 3.7
env: TOXENV=py37-integ
dist: xenial
sudo: true
stage: Client Tests
- python: 3.7
env: TOXENV=py37-accept
dist: xenial
sudo: true
stage: Client Tests
- python: 3.7
env: TOXENV=py37-examples
dist: xenial
sudo: true
stage: Client Tests
# Upstream tests
- python: 3.6
env: TOXENV=nocmk
stage: Upstream Tests
- python: 2.7
env: TOXENV=test-upstream-requirements-py27
stage: Upstream Tests
# 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
stage: Upstream Tests
# Security
- python: 3.6
env: TOXENV=bandit
stage: Security Checks
# Linting and autoformatting
- python: 3.6
env: TOXENV=doc8
stage: Formatting Checks
- python: 3.6
env: TOXENV=docs
stage: Formatting Checks
- python: 3.6
env: TOXENV=readme
stage: Formatting Checks
- python: 3.6
env: TOXENV=flake8
stage: Formatting Checks
- python: 3.6
env: TOXENV=pylint
stage: Formatting Checks
- python: 3.6
env: TOXENV=flake8-tests
stage: Formatting Checks
- python: 3.6
env: TOXENV=pylint-tests
stage: Formatting Checks
- python: 3.6
env: TOXENV=flake8-examples
stage: Formatting Checks
- python: 3.6
env: TOXENV=pylint-examples
stage: Formatting Checks
- python: 3.6
env: TOXENV=black-check
stage: Formatting Checks
- python: 3.6
env: TOXENV=isort-check
stage: Formatting Checks
########################
# Test Vector Handlers #
########################
Expand All @@ -102,81 +137,98 @@ matrix:
env:
TEST_VECTOR_HANDLERS=1
TOXENV=py27-awses_1.3.3
stage: Test Vector Handler Tests
- python: 2.7
env:
TEST_VECTOR_HANDLERS=1
TOXENV=py27-awses_1.3.max
stage: Test Vector Handler Tests
- python: 2.7
env:
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:
TEST_VECTOR_HANDLERS=1
TOXENV=py35-awses_1.3.3
stage: Test Vector Handler Tests
- python: 3.5
env:
TEST_VECTOR_HANDLERS=1
TOXENV=py35-awses_1.3.max
stage: Test Vector Handler Tests
- python: 3.5
env:
TEST_VECTOR_HANDLERS=1
TOXENV=py35-awses_latest
stage: Test Vector Handler Tests
# CPython 3.6
- python: 3.6
env:
TEST_VECTOR_HANDLERS=1
TOXENV=py36-awses_1.3.3
stage: Test Vector Handler Tests
- python: 3.6
env:
TEST_VECTOR_HANDLERS=1
TOXENV=py36-awses_1.3.max
stage: Test Vector Handler Tests
- python: 3.6
env:
TEST_VECTOR_HANDLERS=1
TOXENV=py36-awses_latest
stage: Test Vector Handler Tests
# CPython 3.7
- python: 3.7
env:
TEST_VECTOR_HANDLERS=1
TOXENV=py37-awses_1.3.3
dist: xenial
sudo: true
stage: Test Vector Handler Tests
- python: 3.7
env:
TEST_VECTOR_HANDLERS=1
TOXENV=py37-awses_1.3.max
dist: xenial
sudo: true
stage: Test Vector Handler Tests
- python: 3.7
env:
TEST_VECTOR_HANDLERS=1
TOXENV=py37-awses_latest
dist: xenial
sudo: true
stage: Test Vector Handler Tests
# Linters
- python: 3.6
env:
TEST_VECTOR_HANDLERS=1
TOXENV=bandit
stage: Test Vector Handler Formatting Checks
- python: 3.6
env:
TEST_VECTOR_HANDLERS=1
TOXENV=readme
stage: Test Vector Handler Formatting Checks
# Pending buildout of docs
#- python: 3.6
# env:
Expand Down Expand Up @@ -212,15 +264,18 @@ matrix:
env:
DECRYPT_ORACLE=1
TOXENV=py36-local
stage: Decrypt Oracle Tests
# Linters
- python: 3.6
env:
DECRYPT_ORACLE=1
TOXENV=bandit
stage: Decrypt Oracle Formatting Checks
- python: 3.6
env:
DECRYPT_ORACLE=1
TOXENV=readme
stage: Decrypt Oracle Formatting Checks
# Pending buildout of docs
#- python: 3.6
# env:
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ aws-encryption-sdk
.. image:: https://travis-ci.org/aws/aws-encryption-sdk-python.svg?branch=master
:target: https://travis-ci.org/aws/aws-encryption-sdk-python

.. image:: https://ci.appveyor.com/api/projects/status/v42snaej4lavd5lm/branch/master?svg=true
:target: https://ci.appveyor.com/project/mattsb42-aws/aws-encryption-sdk-python-m2mgl
.. image:: https://ci.appveyor.com/api/projects/status/p3e2e63gsnp3cwd8/branch/master?svg=true
:target: https://ci.appveyor.com/project/mattsb42-aws/aws-encryption-sdk-python-qvyet/branch/master

The AWS Encryption SDK for Python provides a fully compliant, native Python implementation of the `AWS Encryption SDK`_.

Expand Down

0 comments on commit 83a904e

Please sign in to comment.