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

[Bitbucket]

4 new commits in tox:

https://bitbucket.org/hpk42/tox/commits/a853f627bc5f/
changeset:   a853f627bc5f
branch:      develop-pip-win32
user:        philip_thiem
date:        2013-02-20 01:39:35
summary:     branch created
affected #:  0 files



https://bitbucket.org/hpk42/tox/commits/586fd3d32514/
changeset:   586fd3d32514
branch:      develop-pip-win32
user:        philip_thiem
date:        2013-02-20 02:15:36
summary:     On win32 call pip-script.py instead of pip.
Then _cmdline would need to be patched to add the interpreter
for the py script.
affected #:  2 files

diff -r a853f627bc5f0077256975c6ceddccbd6753888e -r 586fd3d325142efe071f727ed2a10a83e0fe2ff6 tox/_cmdline.py
--- a/tox/_cmdline.py
+++ b/tox/_cmdline.py
@@ -120,6 +120,14 @@
             if sys.platform != "win32" and isinstance(arg, py.path.local):
                 arg = cwd.bestrelpath(arg)
             newargs.append(str(arg))
+
+        #subprocess does not always take kindly to .py scripts
+        #so adding the interpreter here.
+        if sys.platform == "win32":
+            ext = os.path.splitext(str(newargs[0]))[1].lower()
+            if ext == '.py' and self.venv:
+                newargs = [str(self.venv.getcommandpath())] + newargs
+
         return newargs
 
     def _popen(self, args, cwd, stdout, stderr, env=None):

diff -r a853f627bc5f0077256975c6ceddccbd6753888e -r 586fd3d325142efe071f727ed2a10a83e0fe2ff6 tox/_venv.py
--- a/tox/_venv.py
+++ b/tox/_venv.py
@@ -211,6 +211,8 @@
 
     def pip_install(self, args, indexserver=None, action=None):
         argv = ["pip", "install"] + self._commoninstallopts(indexserver)
+        if sys.platform == "win32":
+            argv[0] = "pip-script.py"
         if self.envconfig.downloadcache:
             self.envconfig.downloadcache.ensure(dir=1)
             argv.append("--download-cache=%s" %


https://bitbucket.org/hpk42/tox/commits/e08ad7b3bca6/
changeset:   e08ad7b3bca6
branch:      develop-pip-win32
user:        philip_thiem
date:        2013-02-20 02:17:54
summary:     It would seem that python 3.1 lacked the keyword "callable"
affected #:  1 file

diff -r 586fd3d325142efe071f727ed2a10a83e0fe2ff6 -r e08ad7b3bca68d8855e213a1c15e958d61c71293 tox/_config.py
--- a/tox/_config.py
+++ b/tox/_config.py
@@ -12,6 +12,15 @@
 
 import tox
 
+#needed if supporting 3.1 as they had removed callable
+import collections
+try:
+    callable = callable
+except NameError:
+    def callable(x):
+        return isinstance(x, collections.Callable)
+
+
 defaultenvs = {'jython': 'jython', 'pypy': 'pypy'}
 for _name in "py,py24,py25,py26,py27,py30,py31,py32,py33,py34".split(","):
     if _name == "py":


https://bitbucket.org/hpk42/tox/commits/6abfe6e2646c/
changeset:   6abfe6e2646c
branch:      develop-pip-win32
user:        philip_thiem
date:        2013-02-20 03:11:03
summary:     Need to use the shell on win32 in order to get sphinx-build mapped
to sphinx-build.exe (thankfully there isn't a shpinux-build extension-less
sh/py script)
affected #:  1 file

diff -r e08ad7b3bca68d8855e213a1c15e958d61c71293 -r 6abfe6e2646c7af908adbcfbac30b8491d732a5a doc/check_sphinx.py
--- a/doc/check_sphinx.py
+++ b/doc/check_sphinx.py
@@ -5,13 +5,13 @@
     htmldir = tmpdir.join("html")
     subprocess.check_call([
         "sphinx-build", "-W", "-bhtml",
-          "-d", str(doctrees), ".", str(htmldir)])
+          "-d", str(doctrees), ".", str(htmldir)], shell=True)
 
 def test_linkcheck(tmpdir):
     doctrees = tmpdir.join("doctrees")
     htmldir = tmpdir.join("html")
     subprocess.check_call(
         ["sphinx-build", "-blinkcheck",
-          "-d", str(doctrees), ".", str(htmldir)])
+          "-d", str(doctrees), ".", str(htmldir)], shell=True)

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.