3 new commits in tox:

https://bitbucket.org/hpk42/tox/commits/ea96b4c04ab4/
changeset:   ea96b4c04ab4
branch:      develop-pip-win32
user:        RonnyPfannschmidt
date:        2013-02-20 09:16:41
summary:     use py.builtin.callable instead of own backward compat
affected #:  1 file

diff -r 4012a13eac2b473a55ace8084e257b66e21b230a -r 
ea96b4c04ab46b9143815b8262b90d6ff3ed5006 tox/_config.py
--- a/tox/_config.py
+++ b/tox/_config.py
@@ -12,14 +12,6 @@
 
 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(","):
@@ -498,7 +490,7 @@
 
             raise tox.exception.ConfigError(
                 "substitution key %r not found" % key)
-        if callable(val):
+        if py.builtin.callable(val):
             val = val()
         return str(val)
 


https://bitbucket.org/hpk42/tox/commits/e992e9b1a100/
changeset:   e992e9b1a100
branch:      develop-pip-win32
user:        RonnyPfannschmidt
date:        2013-02-20 09:16:56
summary:     close before merge
affected #:  0 files



https://bitbucket.org/hpk42/tox/commits/005c8cb84ddd/
changeset:   005c8cb84ddd
user:        RonnyPfannschmidt
date:        2013-02-20 09:17:14
summary:     merge develop-pip-win32
affected #:  7 files

diff -r 69e75192ec3afde1ff39b572726f6438e9572a89 -r 
005c8cb84ddd23b2e9ebced73b65c653aeed0560 CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 1.4.3
 -----------------
 
+- use pip-script.py instead of pip.exe on win32 to avoid the lock exe file on 
execution issue
+  (thanks Philip Thiem)
+
 - introduce -l|--listenv option to list configured environments
   (thanks  Lukasz Balcerzak)
 

diff -r 69e75192ec3afde1ff39b572726f6438e9572a89 -r 
005c8cb84ddd23b2e9ebced73b65c653aeed0560 CONTRIBUTORS
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -7,3 +7,4 @@
 Jannis Leidl
 Ronny Pfannschmidt
 Lukasz Balcerzak 
+Philip Thiem

diff -r 69e75192ec3afde1ff39b572726f6438e9572a89 -r 
005c8cb84ddd23b2e9ebced73b65c653aeed0560 doc/announce/release-1.4.3.txt
--- a/doc/announce/release-1.4.3.txt
+++ b/doc/announce/release-1.4.3.txt
@@ -11,6 +11,8 @@
 - (experimental) "--installpkg=localpath" option which will skip the
   sdist-creation of a package and instead install the given localpath package.
 
+- use pip-script.py instead of pip.exe on win32 to avoid windows locking the 
.exe
+
 Note that the sister project "detox" should continue to work - it's a 
 separately released project which drives tox test runs on multiple CPUs
 in parallel.

diff -r 69e75192ec3afde1ff39b572726f6438e9572a89 -r 
005c8cb84ddd23b2e9ebced73b65c653aeed0560 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)
 
 

diff -r 69e75192ec3afde1ff39b572726f6438e9572a89 -r 
005c8cb84ddd23b2e9ebced73b65c653aeed0560 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 69e75192ec3afde1ff39b572726f6438e9572a89 -r 
005c8cb84ddd23b2e9ebced73b65c653aeed0560 tox/_config.py
--- a/tox/_config.py
+++ b/tox/_config.py
@@ -12,6 +12,7 @@
 
 import tox
 
+
 defaultenvs = {'jython': 'jython', 'pypy': 'pypy'}
 for _name in "py,py24,py25,py26,py27,py30,py31,py32,py33,py34".split(","):
     if _name == "py":
@@ -489,7 +490,7 @@
 
             raise tox.exception.ConfigError(
                 "substitution key %r not found" % key)
-        if callable(val):
+        if py.builtin.callable(val):
             val = val()
         return str(val)
 

diff -r 69e75192ec3afde1ff39b572726f6438e9572a89 -r 
005c8cb84ddd23b2e9ebced73b65c653aeed0560 tox/_venv.py
--- a/tox/_venv.py
+++ b/tox/_venv.py
@@ -211,6 +211,9 @@
 
     def pip_install(self, args, indexserver=None, action=None):
         argv = ["pip", "install"] + self._commoninstallopts(indexserver)
+        # use pip-script on win32 to avoid the executable locking
+        if sys.platform == "win32":
+            argv[0] = "pip-script.py"
         if self.envconfig.downloadcache:
             self.envconfig.downloadcache.ensure(dir=1)
             argv.append("--download-cache=%s" %

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

Reply via email to