Skip to content

Change directory for py27 xdist-related envs #2874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 30, 2017
Merged

Change directory for py27 xdist-related envs #2874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3ba922
Change directory for py27 xdist-related envs
nicoddemus Oct 26, 2017
27cea34
Remove trailing whitespace
nicoddemus Oct 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion testing/test_assertrewrite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def test_place_initial_imports(self):
s = """'Doc string'\nother = stuff"""
m = rewrite(s)
# Module docstrings in 3.7 are part of Module node, it's not in the body
# so we remove it so the following body items have the same indexes on
# so we remove it so the following body items have the same indexes on
# all Python versions
if sys.version_info < (3, 7):
assert isinstance(m.body[0], ast.Expr)
Expand Down
6 changes: 4 additions & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,9 @@ deps =
mock
nose
hypothesis>=3.5.2
changedir=testing
commands =
pytest -n1 -rfsxX {posargs:testing}
pytest -n1 -rfsxX {posargs:.}

[testenv:py36-xdist]
deps = {[testenv:py27-xdist]deps}
Expand All @@ -91,10 +92,11 @@ deps =
pytest-xdist>=1.13
hypothesis>=3.5.2
distribute = true
changedir=testing
setenv =
PYTHONDONTWRITEBYTECODE=1
commands =
pytest -n3 -rfsxX {posargs:testing}
pytest -n3 -rfsxX {posargs:.}

[testenv:py27-trial]
deps = twisted
Expand Down