Divmod

Merge lp://staging/~lvh/divmod.org/remove-pythonpath-toxini-1269428 into lp://staging/divmod.org

remove-pythonpath-toxini-1269428
Merge into trunk

Proposed by Laurens Van Houtven on 2014-01-15

Status:

Merged

Merged at revision:

2735

Proposed branch:

lp://staging/~lvh/divmod.org/remove-pythonpath-toxini-1269428

Merge into:

lp://staging/divmod.org

Diff against target:

13 lines (+1/-2)

1 file modified

Axiom/tox.ini (+1/-2)

To merge this branch:

bzr merge lp://staging/~lvh/divmod.org/remove-pythonpath-toxini-1269428

Undecided

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Tristan Seligmann		2014-01-15	Needs Fixing on 2014-01-15
Review via email: mp+201781@code.staging.launchpad.net

Description of the change

This fixes #1269428

Revision history for this message

Tristan Seligmann (mithrandi) wrote on 2014-01-15:

Looks good to me. I tested it locally as well, and it seems to do the right thing now.

review: Approve

Revision history for this message

Tristan Seligmann (mithrandi) wrote on 2014-01-15:

Sorry, spoke too soon, it's still running the tests against the wrong Axiom locally, trying to figure out why now.

review: Needs Fixing

Revision history for this message

Tristan Seligmann (mithrandi) wrote on 2014-01-15:

If I do "changedir = {toxworkdir}" in tox.ini additionally, then I get the expected result (upgrader tests fail, due to missing files; I think the batch process test failure is for the same reason).

review: Needs Fixing

lp://staging/~lvh/divmod.org/remove-pythonpath-toxini-1269428 updated on 2014-01-15

2736. By Laurens Van Houtven on 2014-01-15: Also change the working directory to the tox workdir to make sure we're not secretly including PYTHONPATH that way