[Pytest-commit] commit/tox: hpk42: fix issue84 - pypy on windows creates a bin not a scripts venv directory

[Bitbucket]

1 new commit in tox:

https://bitbucket.org/hpk42/tox/commits/81a0cd4ac1bd/
changeset:   81a0cd4ac1bd
user:        hpk42
date:        2013-02-19 15:06:55
summary:     fix issue84 - pypy on windows creates a bin not a scripts venv 
directory
(thanks Lukasz Balcerzak)
affected #:  3 files

diff -r 40797cc09b794bc4052486d2f878b994407ecc59 -r 
81a0cd4ac1bdf797f4f0efbf8aea29606aa8a9b0 CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,9 @@
   downloadcache=PATH testenv setting is present. (The ENV setting
   takes precedence)
 
+- fix issue84 - pypy on windows creates a bin not a scripts venv directory
+  (thanks Lukasz Balcerzak)
+
 - experimentally introduce --installpkg=PATH option to install a package 
rather than
   create/install an sdist package.  This will still require and use
   tox.ini and tests from the current working dir (and not from the remote

diff -r 40797cc09b794bc4052486d2f878b994407ecc59 -r 
81a0cd4ac1bdf797f4f0efbf8aea29606aa8a9b0 tests/test_config.py
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -1,4 +1,5 @@
 import tox
+import pytest
 import os, sys
 from textwrap import dedent
 
@@ -362,14 +363,18 @@
         envconfig = config.envconfigs['python']
         assert envconfig.envpython == envconfig.envbindir.join("python")
 
-    def test_envbindir_jython(self, tmpdir, newconfig):
+    @pytest.mark.parametrize("bp", ["jython", "pypy"])
+    def test_envbindir_jython(self, tmpdir, newconfig, bp):
         config = newconfig("""
             [testenv]
-            basepython=jython
-        """)
+            basepython=%s
+        """ % bp)
         assert len(config.envconfigs) == 1
         envconfig = config.envconfigs['python']
-        assert envconfig.envpython == envconfig.envbindir.join("jython")
+        # on win32 and linux virtualenv uses "bin" for pypy/jython
+        assert envconfig.envbindir.basename == "bin"
+        if bp == "jython":
+            assert envconfig.envpython == envconfig.envbindir.join(bp)
 
     def test_setenv_overrides(self, tmpdir, newconfig):
         config = newconfig("""

diff -r 40797cc09b794bc4052486d2f878b994407ecc59 -r 
81a0cd4ac1bdf797f4f0efbf8aea29606aa8a9b0 tox/_config.py
--- a/tox/_config.py
+++ b/tox/_config.py
@@ -113,7 +113,8 @@
 
     @property
     def envbindir(self):
-        if sys.platform == "win32" and "jython" not in self.basepython:
+        if (sys.platform == "win32" and "jython" not in self.basepython
+                                    and "pypy" not in self.basepython):
             return self.envdir.join("Scripts")
         else:
             return self.envdir.join("bin")

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.
_______________________________________________
pytest-commit mailing list
pytest-commit@python.org
http://mail.python.org/mailman/listinfo/pytest-commit