[Pytest-commit] commit/tox: hpk42: fix issue148: ignore __PYVENV_LAUNCHER__ for subproc

[commits-noreply at bitbucket.org]

1 new commit in tox:

https://bitbucket.org/hpk42/tox/commits/7693f02ac23f/
Changeset:   7693f02ac23f
User:        hpk42
Date:        2014-09-02 14:55:16
Summary:     fix issue148: ignore __PYVENV_LAUNCHER__ for subproc
Affected #:  6 files

diff -r 031118307d9191807de402ddff95876eb694385b -r 7693f02ac23fd4baa8acf7c5024bd0a36311b0d6 CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,9 @@
 - new multi-dimensional configuration support.  Many thanks to
   Alexander Schepanovski for the complete PR with docs.
 
+- fix issue148: remove "__PYVENV_LAUNCHER__" from os.environ when starting
+  subprocesses. Thanks Seven Myint.
+
 
 1.7.2
 -----------

diff -r 031118307d9191807de402ddff95876eb694385b -r 7693f02ac23fd4baa8acf7c5024bd0a36311b0d6 doc/Makefile
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -37,7 +37,7 @@
 	-rm -rf $(BUILDDIR)/*
 
 install: clean html 
-	@rsync -avz $(BUILDDIR)/html/ testrun.org:/www/testrun.org/tox/latest
+	@rsync -avz $(BUILDDIR)/html/ testrun.org:/www/testrun.org/tox/dev
     #latexpdf
 	#@scp $(BUILDDIR)/latex/*.pdf testrun.org:www-tox/latest
 

diff -r 031118307d9191807de402ddff95876eb694385b -r 7693f02ac23fd4baa8acf7c5024bd0a36311b0d6 doc/conf.py
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -48,7 +48,8 @@
 # built documents.
 #
 # The short X.Y version.
-release = version = "1.7.2"
+release = "1.8"
+version = "1.8.0.dev"
 # The full version, including alpha/beta/rc tags.
 
 # The language for content autogenerated by Sphinx. Refer to documentation

diff -r 031118307d9191807de402ddff95876eb694385b -r 7693f02ac23fd4baa8acf7c5024bd0a36311b0d6 setup.py
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@
         description='virtualenv-based automation of test activities',
         long_description=open("README.rst").read(),
         url='http://tox.testrun.org/',
-        version='1.7.2',
+        version='1.8.0.dev1',
         license='http://opensource.org/licenses/MIT',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
         author='holger krekel',

diff -r 031118307d9191807de402ddff95876eb694385b -r 7693f02ac23fd4baa8acf7c5024bd0a36311b0d6 tests/test_venv.py
--- a/tests/test_venv.py
+++ b/tests/test_venv.py
@@ -485,9 +485,11 @@
         py.test.raises(ZeroDivisionError, "venv._pcall([1,2,3])")
         monkeypatch.setenv("PIP_RESPECT_VIRTUALENV", "1")
         monkeypatch.setenv("PIP_REQUIRE_VIRTUALENV", "1")
+        monkeypatch.setenv("__PYVENV_LAUNCHER__", "1")
         py.test.raises(ZeroDivisionError, "venv.run_install_command(['qwe'])")
         assert 'PIP_RESPECT_VIRTUALENV' not in os.environ
         assert 'PIP_REQUIRE_VIRTUALENV' not in os.environ
+        assert '__PYVENV_LAUNCHER__' not in os.environ
 
 def test_setenv_added_to_pcall(tmpdir, mocksession, newconfig):
     pkg = tmpdir.ensure("package.tar.gz")

diff -r 031118307d9191807de402ddff95876eb694385b -r 7693f02ac23fd4baa8acf7c5024bd0a36311b0d6 tox/__init__.py
--- a/tox/__init__.py
+++ b/tox/__init__.py
@@ -1,5 +1,5 @@
 #
-__version__ = '1.7.2'
+__version__ = '1.8.0.dev1'
 
 class exception:
     class Error(Exception):

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.