[Pytest-commit] commit/tox: 2 new changesets

[commits-noreply at bitbucket.org]

2 new commits in tox:

https://bitbucket.org/hpk42/tox/commits/e978c8c8935b/
Changeset:   e978c8c8935b
User:        myint
Date:        2014-09-01 17:12:16
Summary:     Fix "__PYVENV_LAUNCHER__" problem

This resolves the use of the non-virtualenv Python executable.

This fixes #171.
Affected #:  1 file

diff -r d835cca51418210730ba8c9cc88a8829bc7cb05d -r e978c8c8935b841288385a87cd447ec5fe071c66 tox/_venv.py
--- a/tox/_venv.py
+++ b/tox/_venv.py
@@ -272,7 +272,8 @@
         if '{opts}' in argv:
             i = argv.index('{opts}')
             argv[i:i+1] = list(options)
-        for x in ('PIP_RESPECT_VIRTUALENV', 'PIP_REQUIRE_VIRTUALENV'):
+        for x in ('PIP_RESPECT_VIRTUALENV', 'PIP_REQUIRE_VIRTUALENV',
+                  '__PYVENV_LAUNCHER__'):
             try:
                 del os.environ[x]
             except KeyError:


https://bitbucket.org/hpk42/tox/commits/031118307d91/
Changeset:   031118307d91
User:        hpk42
Date:        2014-09-02 14:52:12
Summary:     Merged in myint/tox (pull request #118)

Fix "__PYVENV_LAUNCHER__" problem
Affected #:  1 file

diff -r 8c6dbbf625b7f41e851ea083faada2695bbdc1c0 -r 031118307d9191807de402ddff95876eb694385b tox/_venv.py
--- a/tox/_venv.py
+++ b/tox/_venv.py
@@ -272,7 +272,8 @@
         if '{opts}' in argv:
             i = argv.index('{opts}')
             argv[i:i+1] = list(options)
-        for x in ('PIP_RESPECT_VIRTUALENV', 'PIP_REQUIRE_VIRTUALENV'):
+        for x in ('PIP_RESPECT_VIRTUALENV', 'PIP_REQUIRE_VIRTUALENV',
+                  '__PYVENV_LAUNCHER__'):
             try:
                 del os.environ[x]
             except KeyError:

Repository URL: https://bitbucket.org/hpk42/tox/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.