Skip to content

Commit 75ae24a

Browse files
authored
chore: address linter concerns (#508)
1 parent c2babf8 commit 75ae24a

File tree

4 files changed

+24
-23
lines changed

4 files changed

+24
-23
lines changed

Diff for: decrypt_oracle/test/integration/test_i_decrypt_oracle.py

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ def test_all_vectors(vector):
2525
decrypt_endpoint(),
2626
data=vector.ciphertext,
2727
headers={"Content-Type": "application/octet-stream", "Accept": "application/octet-stream"},
28+
timeout=120 # 2 minutes
2829
)
2930
assert response.status_code == 200
3031
assert response.content == vector.plaintext

Diff for: decrypt_oracle/tox.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ basepython = python3
188188
deps =
189189
-rtest/requirements.txt
190190
{[testenv:generate-pipeline]deps}
191-
pyflakes
192-
pylint
191+
pyflakes==2.5.0
192+
pylint==2.15.0
193193
commands =
194194
pylint \
195195
--rcfile=src/pylintrc \

Diff for: src/aws_encryption_sdk/__init__.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
)
3838

3939
warnings.warn(
40-
'This major version (1.x) of the AWS Encryption SDK for Python has reached End-of-Support.\n' +
41-
'It will no longer receive security updates or bug fixes.\n' +
42-
'Consider updating to the latest version of the AWS Encryption SDK.',
40+
'This major version (1.x) of the AWS Encryption SDK for Python has reached End-of-Support.\n'
41+
+ 'It will no longer receive security updates or bug fixes.\n'
42+
+ 'Consider updating to the latest version of the AWS Encryption SDK.',
4343
DeprecationWarning,
4444
)
4545

Diff for: tox.ini

+18-18
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ commands = {[testenv:test-upstream-requirements-base]commands}
132132

133133
# Linters
134134
[testenv:flake8]
135-
basepython = python3
135+
basepython = python3.8
136136
deps =
137137
-rdev_requirements/linter-requirements.txt
138138
commands =
@@ -164,7 +164,7 @@ commands =
164164
examples/test/
165165

166166
[testenv:pylint]
167-
basepython = python3
167+
basepython = {[testenv:flake8]basepython}
168168
deps =
169169
{[testenv]deps}
170170
-rdev_requirements/linter-requirements.txt
@@ -192,7 +192,7 @@ commands =
192192
test/integration/
193193

194194
[testenv:blacken-src]
195-
basepython = python3
195+
basepython = {[testenv:flake8]basepython}
196196
deps =
197197
-rdev_requirements/linter-requirements.txt
198198
commands =
@@ -206,26 +206,26 @@ commands =
206206

207207

208208
[testenv:blacken]
209-
basepython = python3
209+
basepython = {[testenv:pylint]basepython}
210210
deps =
211211
{[testenv:blacken-src]deps}
212212
commands =
213213
{[testenv:blacken-src]commands}
214214

215215
[testenv:black-check]
216-
basepython = python3
216+
basepython = {[testenv:pylint]basepython}
217217
deps =
218218
{[testenv:blacken]deps}
219219
commands =
220220
{[testenv:blacken-src]commands} --diff
221221

222222
[testenv:isort-seed]
223-
basepython = python3
223+
basepython = {[testenv:pylint]basepython}
224224
deps = -rdev_requirements/linter-requirements.txt
225225
commands = seed-isort-config
226226

227227
[testenv:isort]
228-
basepython = python3
228+
basepython = {[testenv:pylint]basepython}
229229
deps = -rdev_requirements/linter-requirements.txt
230230
commands = isort -rc \
231231
src \
@@ -237,12 +237,12 @@ commands = isort -rc \
237237
{posargs}
238238

239239
[testenv:isort-check]
240-
basepython = python3
240+
basepython = {[testenv:pylint]basepython}
241241
deps = {[testenv:isort]deps}
242242
commands = {[testenv:isort]commands} -c
243243

244244
[testenv:autoformat]
245-
basepython = python3
245+
basepython = {[testenv:pylint]basepython}
246246
deps =
247247
{[testenv:blacken]deps}
248248
{[testenv:isort]deps}
@@ -251,30 +251,30 @@ commands =
251251
{[testenv:isort]commands}
252252

253253
[testenv:doc8]
254-
basepython = python3
254+
basepython = {[testenv:pylint]basepython}
255255
deps =
256256
-rdev_requirements/linter-requirements.txt
257257
commands = doc8 doc/index.rst README.rst CHANGELOG.rst
258258

259259
[testenv:readme]
260-
basepython = python3
260+
basepython = {[testenv:pylint]basepython}
261261
deps = -rdev_requirements/linter-requirements.txt
262262
commands = python setup.py check -r -s
263263

264264
[testenv:bandit]
265-
basepython = python3
265+
basepython = {[testenv:pylint]basepython}
266266
deps =
267267
-rdev_requirements/linter-requirements.txt
268268
commands = bandit -r src/aws_encryption_sdk/
269269

270270
# Prone to false positives: only run independently
271271
[testenv:vulture]
272-
basepython = python3
272+
basepython = {[testenv:pylint]basepython}
273273
deps = -rdev_requirements/linter-requirements.txt
274274
commands = vulture src/aws_encryption_sdk/
275275

276276
[testenv:linters]
277-
basepython = python3
277+
basepython = {[testenv:pylint]basepython}
278278
deps =
279279
{[testenv:flake8]deps}
280280
{[testenv:pylint]deps}
@@ -289,7 +289,7 @@ commands =
289289
{[testenv:bandit]commands}
290290

291291
[testenv:linters-tests]
292-
basepython = python3
292+
basepython = {[testenv:pylint]basepython}
293293
deps =
294294
{[testenv:flake8-tests]deps}
295295
{[testenv:pylint-tests]deps}
@@ -298,7 +298,7 @@ commands =
298298
{[testenv:pylint-tests]commands}
299299

300300
[testenv:linters-examples]
301-
basepython = python3
301+
basepython = {[testenv:pylint]basepython}
302302
deps =
303303
{[testenv:flake8-examples]deps}
304304
{[testenv:pylint-examples]deps}
@@ -308,13 +308,13 @@ commands =
308308

309309
# Documentation
310310
[testenv:docs]
311-
basepython = python3
311+
basepython = {[testenv:pylint]basepython}
312312
deps = -rdoc/requirements.txt
313313
commands =
314314
sphinx-build -E -c doc/ -b html doc/ doc/build/html
315315

316316
[testenv:serve-docs]
317-
basepython = python3
317+
basepython = {[testenv:pylint]basepython}
318318
skip_install = true
319319
changedir = doc/build/html
320320
deps =

0 commit comments

Comments
 (0)