Skip to content

Commit 4a9a1a5

Browse files
martin-majlis-s1martin-majlis-s1
committed
Fix tox.ini to be compatible with latest version
1 parent bc78d98 commit 4a9a1a5

File tree

2 files changed

+138
-25
lines changed

2 files changed

+138
-25
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
default_language_version:
2-
python: python3.6
2+
python: python3.10
33

44
exclude: '(third_party.*|third_party_tls.*)'
55
repos:

‎tox.ini‎

Lines changed: 137 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ envlist = py{27,36,37,38,39,310}-{linux,macos,windows}-unittests, py{27,36,37,38
33
skipsdist = true
44
ignore_basepython_conflict = true
55
# NOTE: We pass the TERM env to preserve colors
6-
passenv = TERM XDG_CACHE_HOME
6+
passenv =
7+
TERM
8+
XDG_CACHE_HOME
79
setenv =
810
PY_COLORS=1
911

@@ -39,7 +41,10 @@ basepython =
3941
{py3.9-unit-tests}: python3.9
4042
{py3.10-unit-tests}: python3.10
4143
# NOTE: We pass the TERM env to preserve colors
42-
passenv = TERM XDG_CACHE_HOME PYTEST_BENCH_FORCE_UNIT
44+
passenv =
45+
TERM
46+
XDG_CACHE_HOME
47+
PYTEST_BENCH_FORCE_UNIT
4348
setenv =
4449
LINT_FILES_TO_CHECK={env:LINT_FILES_TO_CHECK:*.py scripts/*.py scripts/circleci/*.py scripts/cicd/*.py benchmarks/scripts/*.py tests/ pylint_plugins/*.py .circleci/*.py .circleci/modernize/ scalyr_agent/ scalyr_agent/third_party/tcollector/ agent_build/}
4550
# Which Python binary to use for various lint targets
@@ -54,7 +59,7 @@ install_command = pip install -U --force-reinstall {opts} {packages}
5459
deps =
5560
-r dev-requirements.txt
5661
-r benchmarks/micro/requirements-compression-algorithms.txt
57-
whitelist_externals =
62+
allowlist_externals =
5863
rm
5964
bash
6065
commands =
@@ -93,7 +98,7 @@ commands =
9398
[testenv:generate-monitor-docs]
9499
deps =
95100
-r dev-requirements.txt
96-
whitelist_externals =
101+
allowlist_externals =
97102
bash
98103
commands =
99104
bash -c "scripts/generate-docs-for-all-monitors.sh"
@@ -211,7 +216,10 @@ commands =
211216
# Smoke tests related targets
212217
[testenv:py{27,36,37,38,39,310}-std-smoketests]
213218
passenv =
214-
SCALYR_API_KEY READ_API_KEY SCALYR_SERVER AGENT_HOST_NAME
219+
SCALYR_API_KEY
220+
READ_API_KEY
221+
SCALYR_SERVER
222+
AGENT_HOST_NAME
215223
commands =
216224
rm -rf test-results .coverage
217225
py.test tests/smoke_tests/standalone_test -vv --durations=5 --junitxml=test-results/junit-1.xml
@@ -226,136 +234,241 @@ setenv =
226234
SCALYR_MAX_REQUEST_SPACING_INTERVAL=0.5
227235
{[testenv]setenv}
228236
passenv =
229-
SCALYR_API_KEY READ_API_KEY SCALYR_SERVER AGENT_HOST_NAME
237+
SCALYR_API_KEY
238+
READ_API_KEY
239+
SCALYR_SERVER
240+
AGENT_HOST_NAME
230241
commands =
231242
rm -rf test-results .coverage
232243
py.test tests/smoke_tests/standalone_test_rate_limited.py -vv --durations=5 --junitxml=test-results/junit-1.xml
233244

234245
[testenv:py2.7-smoke-tests]
235246
passenv =
236-
SCALYR_API_KEY READ_API_KEY SCALYR_SERVER AGENT_HOST_NAME
247+
SCALYR_API_KEY
248+
READ_API_KEY
249+
SCALYR_SERVER
250+
AGENT_HOST_NAME
237251
commands =
238252
py.test tests/smoke_tests/standalone_test -s -vv --durations=5
239253

240254
[testenv:py3.5-smoke-tests]
241255
passenv =
242-
SCALYR_API_KEY READ_API_KEY SCALYR_SERVER AGENT_HOST_NAME
256+
SCALYR_API_KEY
257+
READ_API_KEY
258+
SCALYR_SERVER
259+
AGENT_HOST_NAME
243260
commands =
244261
py.test tests/smoke_tests/standalone_test -s -vv --durations=5
245262

246263
[testenv:py3.6-smoke-tests]
247264
passenv =
248-
SCALYR_API_KEY READ_API_KEY SCALYR_SERVER AGENT_HOST_NAME
265+
SCALYR_API_KEY
266+
READ_API_KEY
267+
SCALYR_SERVER
268+
AGENT_HOST_NAME
249269
commands =
250270
py.test tests/smoke_tests/standalone_test -s -vv --durations=5
251271

252272
[testenv:py3.7-smoke-tests]
253273
passenv =
254-
SCALYR_API_KEY READ_API_KEY SCALYR_SERVER AGENT_HOST_NAME
274+
SCALYR_API_KEY
275+
READ_API_KEY
276+
SCALYR_SERVER
277+
AGENT_HOST_NAME
255278
commands =
256279
py.test tests/smoke_tests/standalone_test -s -vv --durations=5
257280

258281
[testenv:py3.8-smoke-tests]
259282
passenv =
260-
SCALYR_API_KEY READ_API_KEY SCALYR_SERVER AGENT_HOST_NAME
283+
SCALYR_API_KEY
284+
READ_API_KEY
285+
SCALYR_SERVER
286+
AGENT_HOST_NAME
261287
commands =
262288
py.test tests/smoke_tests/standalone_test -s -vv --durations=5
263289

264290
[testenv:py3.5-smoke-tests-rate-limit]
265291
setenv =
266292
SCALYR_MAX_SEND_RATE_ENFORCEMENT="500KB/s" SCALYR_DISABLE_MAX_SEND_RATE_ENFORCEMENT_OVERRIDES="true" SCALYR_MIN_ALLOWED_REQUEST_SIZE="100" SCALYR_MAX_ALLOWED_REQUEST_SIZE="500000" SCALYR_MIN_REQUEST_SPACING_INTERVAL="0.0" SCALYR_MAX_REQUEST_SPACING_INTERVAL="0.5"
267293
passenv =
268-
SCALYR_API_KEY READ_API_KEY SCALYR_SERVER AGENT_HOST_NAME
294+
SCALYR_API_KEY
295+
READ_API_KEY
296+
SCALYR_SERVER
297+
AGENT_HOST_NAME
269298
commands =
270299
py.test tests/smoke_tests/standalone_test_rate_limited.py -s -vv --durations=5
271300

272301
# Package smoke tests related targets
273302
[testenv:agent_package_smoke_test_amazonlinux_python2]
274303
basepython = python3.6
275304
passenv =
276-
TERM SCALYR_API_KEY READ_API_KEY SCALYR_SERVER AGENT_HOST_NAME DOCKER_CERT_PATH DOCKER_HOST DOCKER_TLS_VERIFY
305+
TERM
306+
SCALYR_API_KEY
307+
READ_API_KEY
308+
SCALYR_SERVER
309+
AGENT_HOST_NAME
310+
DOCKER_CERT_PATH
311+
DOCKER_HOST
312+
DOCKER_TLS_VERIFY
277313
commands =
278314
py.test tests/smoke_tests/package_test.py::test_smoke_package_rpm_python2 -s -vv --durations=5 {posargs}
279315

280316
[testenv:agent_package_smoke_test_amazonlinux_python3]
281317
basepython = python3.6
282318
passenv =
283-
TERM SCALYR_API_KEY READ_API_KEY SCALYR_SERVER AGENT_HOST_NAME DOCKER_CERT_PATH DOCKER_HOST DOCKER_TLS_VERIFY
319+
TERM
320+
SCALYR_API_KEY
321+
READ_API_KEY
322+
SCALYR_SERVER
323+
AGENT_HOST_NAME
324+
DOCKER_CERT_PATH
325+
DOCKER_HOST
326+
DOCKER_TLS_VERIFY
284327
commands =
285328
py.test tests/smoke_tests/package_test.py::test_smoke_package_rpm_python3 -s -vv --durations=5 {posargs}
286329

287330
[testenv:agent_package_smoke_test_ubuntu_python2]
288331
basepython = python3.6
289332
passenv =
290-
TERM SCALYR_API_KEY READ_API_KEY SCALYR_SERVER AGENT_HOST_NAME DOCKER_CERT_PATH DOCKER_HOST DOCKER_TLS_VERIFY
333+
TERM
334+
SCALYR_API_KEY
335+
READ_API_KEY
336+
SCALYR_SERVER
337+
AGENT_HOST_NAME
338+
DOCKER_CERT_PATH
339+
DOCKER_HOST
340+
DOCKER_TLS_VERIFY
291341
commands =
292342
py.test tests/smoke_tests/package_test.py::test_smoke_package_deb_python2 -s -vv --durations=5 {posargs}
293343

294344
[testenv:agent_package_smoke_test_ubuntu_python3]
295345
basepython = python3.6
296346
passenv =
297-
TERM SCALYR_API_KEY READ_API_KEY SCALYR_SERVER AGENT_HOST_NAME DOCKER_CERT_PATH DOCKER_HOST DOCKER_TLS_VERIFY
347+
TERM
348+
SCALYR_API_KEY
349+
READ_API_KEY
350+
SCALYR_SERVER
351+
AGENT_HOST_NAME
352+
DOCKER_CERT_PATH
353+
DOCKER_HOST
354+
DOCKER_TLS_VERIFY
298355
commands =
299356
py.test tests/smoke_tests/package_test.py::test_smoke_package_deb_python3 -s -vv --durations=5 {posargs}
300357

301358
[testenv:agent_distributions_tests_ubuntu1604]
302359
basepython = python3.6
303360
passenv =
304-
TERM SCALYR_API_KEY READ_API_KEY SCALYR_SERVER AGENT_HOST_NAME DOCKER_CERT_PATH DOCKER_HOST DOCKER_TLS_VERIFY
361+
TERM
362+
SCALYR_API_KEY
363+
READ_API_KEY
364+
SCALYR_SERVER
365+
AGENT_HOST_NAME
366+
DOCKER_CERT_PATH
367+
DOCKER_HOST
368+
DOCKER_TLS_VERIFY
305369
commands =
306370
# NOTE: We use short traceback formatting since we run py.test inside py.test which results in hard to read output
307371
py.test tests/distribution/python_version_change_tests/ubuntu1604 -s -vv --tb=short --durations=5 {posargs}
308372

309373
[testenv:agent_distributions_tests_ubuntu2204]
310374
basepython = python3.6
311375
passenv =
312-
TERM SCALYR_API_KEY READ_API_KEY SCALYR_SERVER AGENT_HOST_NAME DOCKER_CERT_PATH DOCKER_HOST DOCKER_TLS_VERIFY
376+
TERM
377+
SCALYR_API_KEY
378+
READ_API_KEY
379+
SCALYR_SERVER
380+
AGENT_HOST_NAME
381+
DOCKER_CERT_PATH
382+
DOCKER_HOST
383+
DOCKER_TLS_VERIFY
313384
commands =
314385
# NOTE: We use short traceback formatting since we run py.test inside py.test which results in hard to read output
315386
py.test tests/distribution/basic_sanity_deb.py tests/distribution/python_version_change_tests/ubuntu2204 -s -vv --tb=short --durations=5 {posargs}
316387

317388
[testenv:agent_distributions_tests_amazonlinux2]
318389
basepython = python3.6
319390
passenv =
320-
TERM SCALYR_API_KEY READ_API_KEY SCALYR_SERVER AGENT_HOST_NAME DOCKER_CERT_PATH DOCKER_HOST DOCKER_TLS_VERIFY
391+
TERM
392+
SCALYR_API_KEY
393+
READ_API_KEY
394+
SCALYR_SERVER
395+
AGENT_HOST_NAME
396+
DOCKER_CERT_PATH
397+
DOCKER_HOST
398+
DOCKER_TLS_VERIFY
321399
commands =
322400
# NOTE: We use short traceback formatting since we run py.test inside py.test which results in hard to read output
323401
py.test tests/distribution/basic_sanity_rpm.py tests/distribution/python_version_change_tests/amazonlinux2_test.py -s -vv --tb=short --durations=5 {posargs}
324402

325403
[testenv:agent_distributions_tests_centos7]
326404
basepython = python3.6
327405
passenv =
328-
TERM SCALYR_API_KEY READ_API_KEY SCALYR_SERVER AGENT_HOST_NAME DOCKER_CERT_PATH DOCKER_HOST DOCKER_TLS_VERIFY
406+
TERM
407+
SCALYR_API_KEY
408+
READ_API_KEY
409+
SCALYR_SERVER
410+
AGENT_HOST_NAME
411+
DOCKER_CERT_PATH
412+
DOCKER_HOST
413+
DOCKER_TLS_VERIFY
329414
commands =
330415
# NOTE: We use short traceback formatting since we run py.test inside py.test which results in hard to read output
331416
py.test tests/distribution/python_version_change_tests/centos7 -s -vv --tb=short --durations=5 {posargs}
332417

333418
[testenv:agent_distributions_tests_centos8]
334419
basepython = python3.6
335420
passenv =
336-
TERM SCALYR_API_KEY READ_API_KEY SCALYR_SERVER AGENT_HOST_NAME DOCKER_CERT_PATH DOCKER_HOST DOCKER_TLS_VERIFY
421+
TERM
422+
SCALYR_API_KEY
423+
READ_API_KEY
424+
SCALYR_SERVER
425+
AGENT_HOST_NAME
426+
DOCKER_CERT_PATH
427+
DOCKER_HOST
428+
DOCKER_TLS_VERIFY
337429
commands =
338430
# NOTE: We use short traceback formatting since we run py.test inside py.test which results in hard to read output
339431
py.test tests/distribution/python_version_change_tests/centos8_test.py -s -vv --tb=short --durations=5 {posargs}
340432

341433
[testenv:agent_deb_package]
342434
basepython = python3.6
343435
passenv =
344-
TERM SCALYR_API_KEY READ_API_KEY SCALYR_SERVER AGENT_HOST_NAME DOCKER_CERT_PATH DOCKER_HOST DOCKER_TLS_VERIFY
436+
TERM
437+
SCALYR_API_KEY
438+
READ_API_KEY
439+
SCALYR_SERVER
440+
AGENT_HOST_NAME
441+
DOCKER_CERT_PATH
442+
DOCKER_HOST
443+
DOCKER_TLS_VERIFY
345444
commands =
346445
py.test tests/distribution/deb_package.py -s -vv --tb=short --durations=5 {posargs}
347446

348447
[testenv:agent_rpm_package]
349448
basepython = python3.6
350449
passenv =
351-
TERM SCALYR_API_KEY READ_API_KEY SCALYR_SERVER AGENT_HOST_NAME DOCKER_CERT_PATH DOCKER_HOST DOCKER_TLS_VERIFY
450+
TERM
451+
SCALYR_API_KEY
452+
READ_API_KEY
453+
SCALYR_SERVER
454+
AGENT_HOST_NAME
455+
DOCKER_CERT_PATH
456+
DOCKER_HOST
457+
DOCKER_TLS_VERIFY
352458
commands =
353459
py.test tests/distribution/rpm_package.py -s -vv --tb=short --durations=5 {posargs}
354460

355461
[testenv:agent_monitors_ubuntu]
356462
basepython = python3.6
357463
passenv =
358-
TERM SCALYR_API_KEY READ_API_KEY SCALYR_SERVER AGENT_HOST_NAME DOCKER_CERT_PATH DOCKER_HOST DOCKER_TLS_VERIFY
464+
TERM
465+
SCALYR_API_KEY
466+
READ_API_KEY
467+
SCALYR_SERVER
468+
AGENT_HOST_NAME
469+
DOCKER_CERT_PATH
470+
DOCKER_HOST
471+
DOCKER_TLS_VERIFY
359472
commands =
360473
py.test tests/utils/tests/ tests/smoke_tests/monitors_test/ -s -vv --tb=short --durations=5 --cov=scalyr_agent --cov=tests/ {posargs}
361474

0 commit comments

Comments
 (0)