Skip to content

Commit 83a904e

Browse files
mattsb42-awsmattsb42-aws
authored
Merge pull request #94 from mattsb42-aws/travis-zones
CI organization tweaks
2 parents 3a02cb6 + 1470ebd commit 83a904e

File tree

2 files changed

+57
-2
lines changed

2 files changed

+57
-2
lines changed

‎.travis.yml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,95 +5,130 @@ matrix:
55
# CPython 2.7
66
- python: 2.7
77
env: TOXENV=py27-local
8+
stage: Client Tests
89
- python: 2.7
910
env: TOXENV=py27-integ
11+
stage: Client Tests
1012
- python: 2.7
1113
env: TOXENV=py27-accept
14+
stage: Client Tests
1215
- python: 2.7
1316
env: TOXENV=py27-examples
17+
stage: Client Tests
1418
# CPython 3.4
1519
- python: 3.4
1620
env: TOXENV=py34-local
21+
stage: Client Tests
1722
- python: 3.4
1823
env: TOXENV=py34-integ
24+
stage: Client Tests
1925
- python: 3.4
2026
env: TOXENV=py34-accept
27+
stage: Client Tests
2128
- python: 3.4
2229
env: TOXENV=py34-examples
30+
stage: Client Tests
2331
# CPython 3.5
2432
- python: 3.5
2533
env: TOXENV=py35-local
34+
stage: Client Tests
2635
- python: 3.5
2736
env: TOXENV=py35-integ
37+
stage: Client Tests
2838
- python: 3.5
2939
env: TOXENV=py35-accept
40+
stage: Client Tests
3041
- python: 3.5
3142
env: TOXENV=py35-examples
43+
stage: Client Tests
3244
# CPython 3.6
3345
- python: 3.6
3446
env: TOXENV=py36-local
47+
stage: Client Tests
3548
- python: 3.6
3649
env: TOXENV=py36-integ
50+
stage: Client Tests
3751
- python: 3.6
3852
env: TOXENV=py36-accept
53+
stage: Client Tests
3954
- python: 3.6
4055
env: TOXENV=py36-examples
56+
stage: Client Tests
4157
# CPython 3.7
4258
# xenial + sudo are currently needed to get 3.7
4359
# https://github.com/travis-ci/travis-ci/issues/9815
4460
- python: 3.7
4561
env: TOXENV=py37-local
4662
dist: xenial
4763
sudo: true
64+
stage: Client Tests
4865
- python: 3.7
4966
env: TOXENV=py37-integ
5067
dist: xenial
5168
sudo: true
69+
stage: Client Tests
5270
- python: 3.7
5371
env: TOXENV=py37-accept
5472
dist: xenial
5573
sudo: true
74+
stage: Client Tests
5675
- python: 3.7
5776
env: TOXENV=py37-examples
5877
dist: xenial
5978
sudo: true
79+
stage: Client Tests
6080
# Upstream tests
6181
- python: 3.6
6282
env: TOXENV=nocmk
83+
stage: Upstream Tests
6384
- python: 2.7
6485
env: TOXENV=test-upstream-requirements-py27
86+
stage: Upstream Tests
6587
# xenial + sudo are currently needed to get 3.7
6688
# https://github.com/travis-ci/travis-ci/issues/9815
6789
- python: 3.7
6890
env: TOXENV=test-upstream-requirements-py37
6991
dist: xenial
7092
sudo: true
93+
stage: Upstream Tests
7194
# Security
7295
- python: 3.6
7396
env: TOXENV=bandit
97+
stage: Security Checks
7498
# Linting and autoformatting
7599
- python: 3.6
76100
env: TOXENV=doc8
101+
stage: Formatting Checks
77102
- python: 3.6
78103
env: TOXENV=docs
104+
stage: Formatting Checks
79105
- python: 3.6
80106
env: TOXENV=readme
107+
stage: Formatting Checks
81108
- python: 3.6
82109
env: TOXENV=flake8
110+
stage: Formatting Checks
83111
- python: 3.6
84112
env: TOXENV=pylint
113+
stage: Formatting Checks
85114
- python: 3.6
86115
env: TOXENV=flake8-tests
116+
stage: Formatting Checks
87117
- python: 3.6
88118
env: TOXENV=pylint-tests
119+
stage: Formatting Checks
89120
- python: 3.6
90121
env: TOXENV=flake8-examples
122+
stage: Formatting Checks
91123
- python: 3.6
92124
env: TOXENV=pylint-examples
125+
stage: Formatting Checks
93126
- python: 3.6
94127
env: TOXENV=black-check
128+
stage: Formatting Checks
95129
- python: 3.6
96130
env: TOXENV=isort-check
131+
stage: Formatting Checks
97132
########################
98133
# Test Vector Handlers #
99134
########################
@@ -102,81 +137,98 @@ matrix:
102137
env:
103138
TEST_VECTOR_HANDLERS=1
104139
TOXENV=py27-awses_1.3.3
140+
stage: Test Vector Handler Tests
105141
- python: 2.7
106142
env:
107143
TEST_VECTOR_HANDLERS=1
108144
TOXENV=py27-awses_1.3.max
145+
stage: Test Vector Handler Tests
109146
- python: 2.7
110147
env:
111148
TEST_VECTOR_HANDLERS=1
112149
TOXENV=py27-awses_latest
150+
stage: Test Vector Handler Tests
113151
# CPython 3.4
114152
- python: 3.4
115153
env:
116154
TEST_VECTOR_HANDLERS=1
117155
TOXENV=py34-awses_1.3.3
156+
stage: Test Vector Handler Tests
118157
- python: 3.4
119158
env:
120159
TEST_VECTOR_HANDLERS=1
121160
TOXENV=py34-awses_1.3.max
161+
stage: Test Vector Handler Tests
122162
- python: 3.4
123163
env:
124164
TEST_VECTOR_HANDLERS=1
125165
TOXENV=py34-awses_latest
166+
stage: Test Vector Handler Tests
126167
# CPython 3.5
127168
- python: 3.5
128169
env:
129170
TEST_VECTOR_HANDLERS=1
130171
TOXENV=py35-awses_1.3.3
172+
stage: Test Vector Handler Tests
131173
- python: 3.5
132174
env:
133175
TEST_VECTOR_HANDLERS=1
134176
TOXENV=py35-awses_1.3.max
177+
stage: Test Vector Handler Tests
135178
- python: 3.5
136179
env:
137180
TEST_VECTOR_HANDLERS=1
138181
TOXENV=py35-awses_latest
182+
stage: Test Vector Handler Tests
139183
# CPython 3.6
140184
- python: 3.6
141185
env:
142186
TEST_VECTOR_HANDLERS=1
143187
TOXENV=py36-awses_1.3.3
188+
stage: Test Vector Handler Tests
144189
- python: 3.6
145190
env:
146191
TEST_VECTOR_HANDLERS=1
147192
TOXENV=py36-awses_1.3.max
193+
stage: Test Vector Handler Tests
148194
- python: 3.6
149195
env:
150196
TEST_VECTOR_HANDLERS=1
151197
TOXENV=py36-awses_latest
198+
stage: Test Vector Handler Tests
152199
# CPython 3.7
153200
- python: 3.7
154201
env:
155202
TEST_VECTOR_HANDLERS=1
156203
TOXENV=py37-awses_1.3.3
157204
dist: xenial
158205
sudo: true
206+
stage: Test Vector Handler Tests
159207
- python: 3.7
160208
env:
161209
TEST_VECTOR_HANDLERS=1
162210
TOXENV=py37-awses_1.3.max
163211
dist: xenial
164212
sudo: true
213+
stage: Test Vector Handler Tests
165214
- python: 3.7
166215
env:
167216
TEST_VECTOR_HANDLERS=1
168217
TOXENV=py37-awses_latest
169218
dist: xenial
170219
sudo: true
220+
stage: Test Vector Handler Tests
171221
# Linters
172222
- python: 3.6
173223
env:
174224
TEST_VECTOR_HANDLERS=1
175225
TOXENV=bandit
226+
stage: Test Vector Handler Formatting Checks
176227
- python: 3.6
177228
env:
178229
TEST_VECTOR_HANDLERS=1
179230
TOXENV=readme
231+
stage: Test Vector Handler Formatting Checks
180232
# Pending buildout of docs
181233
#- python: 3.6
182234
# env:
@@ -212,15 +264,18 @@ matrix:
212264
env:
213265
DECRYPT_ORACLE=1
214266
TOXENV=py36-local
267+
stage: Decrypt Oracle Tests
215268
# Linters
216269
- python: 3.6
217270
env:
218271
DECRYPT_ORACLE=1
219272
TOXENV=bandit
273+
stage: Decrypt Oracle Formatting Checks
220274
- python: 3.6
221275
env:
222276
DECRYPT_ORACLE=1
223277
TOXENV=readme
278+
stage: Decrypt Oracle Formatting Checks
224279
# Pending buildout of docs
225280
#- python: 3.6
226281
# env:

‎README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ aws-encryption-sdk
2121
.. image:: https://travis-ci.org/aws/aws-encryption-sdk-python.svg?branch=master
2222
:target: https://travis-ci.org/aws/aws-encryption-sdk-python
2323

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

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

0 commit comments

Comments
 (0)