Skip to content

Commit 47746be

Browse files
jdmajorgreys
authored andcommitted
refactor: use tox flavor to specify Celery usedevelop setting
1 parent d4d857f commit 47746be

File tree

1 file changed

+5
-64
lines changed

1 file changed

+5
-64
lines changed

tox.ini

Lines changed: 5 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,11 @@ envlist =
143143
# meaning running on py3.x will fail
144144
# https://stackoverflow.com/questions/57459123/why-do-i-need-to-run-tox-twice-to-test-a-python-package-with-c-extension
145145
commands_pre={envpython} {toxinidir}/setup.py develop
146-
usedevelop = True
146+
usedevelop =
147+
# do not use develop mode with celery as running multiple python versions within
148+
# same job will cause problem for tests that use ddtrace-run
149+
celery_contrib: False
150+
!celery_contrib: True
147151

148152
deps =
149153
pdbpp
@@ -518,69 +522,6 @@ deps=
518522
commands=sphinx-build -W -b html docs docs/_build/html
519523
basepython=python
520524

521-
# do not use develop mode with celery as running multiple python versions within
522-
# same job will cause problem for tests that use ddtrace-run
523-
[celery_contrib]
524-
usedevelop = False
525-
[testenv:celery_contrib-py27-celery31-redis210]
526-
usedevelop = {[celery_contrib]usedevelop}
527-
[testenv:celery_contrib-py34-celery31-redis210]
528-
usedevelop = {[celery_contrib]usedevelop}
529-
[testenv:celery_contrib-py35-celery31-redis210]
530-
usedevelop = {[celery_contrib]usedevelop}
531-
[testenv:celery_contrib-py36-celery31-redis210]
532-
usedevelop = {[celery_contrib]usedevelop}
533-
[testenv:celery_contrib-py27-celery40-redis210-kombu43]
534-
usedevelop = {[celery_contrib]usedevelop}
535-
[testenv:celery_contrib-py27-celery40-redis320-kombu44]
536-
usedevelop = {[celery_contrib]usedevelop}
537-
[testenv:celery_contrib-py27-celery41-redis210-kombu43]
538-
usedevelop = {[celery_contrib]usedevelop}
539-
[testenv:celery_contrib-py27-celery41-redis320-kombu44]
540-
usedevelop = {[celery_contrib]usedevelop}
541-
[testenv:celery_contrib-py34-celery40-redis210-kombu43]
542-
usedevelop = {[celery_contrib]usedevelop}
543-
[testenv:celery_contrib-py34-celery40-redis320-kombu44]
544-
usedevelop = {[celery_contrib]usedevelop}
545-
[testenv:celery_contrib-py34-celery41-redis210-kombu43]
546-
usedevelop = {[celery_contrib]usedevelop}
547-
[testenv:celery_contrib-py34-celery41-redis320-kombu44]
548-
usedevelop = {[celery_contrib]usedevelop}
549-
[testenv:celery_contrib-py35-celery40-redis210-kombu43]
550-
usedevelop = {[celery_contrib]usedevelop}
551-
[testenv:celery_contrib-py35-celery40-redis320-kombu44]
552-
usedevelop = {[celery_contrib]usedevelop}
553-
[testenv:celery_contrib-py35-celery41-redis210-kombu43]
554-
usedevelop = {[celery_contrib]usedevelop}
555-
[testenv:celery_contrib-py35-celery41-redis320-kombu44]
556-
usedevelop = {[celery_contrib]usedevelop}
557-
[testenv:celery_contrib-py36-celery40-redis210-kombu43]
558-
usedevelop = {[celery_contrib]usedevelop}
559-
[testenv:celery_contrib-py36-celery40-redis320-kombu44]
560-
usedevelop = {[celery_contrib]usedevelop}
561-
[testenv:celery_contrib-py36-celery41-redis210-kombu43]
562-
usedevelop = {[celery_contrib]usedevelop}
563-
[testenv:celery_contrib-py36-celery41-redis320-kombu44]
564-
usedevelop = {[celery_contrib]usedevelop}
565-
[testenv:celery_contrib-py27-celery42-redis210-kombu43]
566-
usedevelop = {[celery_contrib]usedevelop}
567-
[testenv:celery_contrib-py34-celery42-redis210-kombu43]
568-
usedevelop = {[celery_contrib]usedevelop}
569-
[testenv:celery_contrib-py35-celery42-redis210-kombu43]
570-
usedevelop = {[celery_contrib]usedevelop}
571-
[testenv:celery_contrib-py36-celery42-redis210-kombu43]
572-
usedevelop = {[celery_contrib]usedevelop}
573-
[testenv:celery_contrib-py27-celery43-redis320-kombu44]
574-
usedevelop = {[celery_contrib]usedevelop}
575-
[testenv:celery_contrib-py34-celery43-redis320-kombu44]
576-
usedevelop = {[celery_contrib]usedevelop}
577-
[testenv:celery_contrib-py35-celery43-redis320-kombu44]
578-
usedevelop = {[celery_contrib]usedevelop}
579-
[testenv:celery_contrib-py36-celery43-redis320-kombu44]
580-
usedevelop = {[celery_contrib]usedevelop}
581-
[testenv:celery_contrib-py37-celery43-redis320-kombu44]
582-
usedevelop = {[celery_contrib]usedevelop}
583-
584525
[falcon_autopatch]
585526
setenv =
586527
DATADOG_SERVICE_NAME=my-falcon

0 commit comments

Comments
 (0)