2 new commits in tox:
https://bitbucket.org/hpk42/tox/commits/8fcc1bed3e91/
Changeset: 8fcc1bed3e91
User: hpk42
Date: 2013-06-22 09:17:14
Summary: fix whitelist_externals on windows, bump version for release prep
Affected #: 7 files
diff -r e286636af34ab70a5dac5ed815b1dc1a842f53b9 -r
8fcc1bed3e918b625d85864cc3f4623578852e7e doc/conf.py
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -48,7 +48,7 @@
# built documents.
#
# The short X.Y version.
-release = version = "1.4.3"
+release = version = "1.5.0"
# The full version, including alpha/beta/rc tags.
# The language for content autogenerated by Sphinx. Refer to documentation
diff -r e286636af34ab70a5dac5ed815b1dc1a842f53b9 -r
8fcc1bed3e918b625d85864cc3f4623578852e7e setup.py
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@
def main():
version = sys.version_info[:2]
- install_requires = ['virtualenv>=1.9.1', 'py>=1.4.13', ]
+ install_requires = ['virtualenv>=1.9.1', 'py>=1.4.15', ]
if version < (2, 7) or (3, 0) <= version <= (3, 1):
install_requires += ['argparse']
setup(
@@ -26,7 +26,7 @@
description='virtualenv-based automation of test activities',
long_description=open("README.rst").read(),
url='http://tox.testrun.org/',
- version='1.5.dev12',
+ version='1.5.0',
license='http://opensource.org/licenses/MIT',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
author='holger krekel',
diff -r e286636af34ab70a5dac5ed815b1dc1a842f53b9 -r
8fcc1bed3e918b625d85864cc3f4623578852e7e tests/test_config.py
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -894,8 +894,6 @@
*docs*
""")
- @py.test.mark.xfail("sys.version_info < (2,6)",
- reason="virtualenv3 cannot be imported")
def test_config_specific_ini(self, tmpdir, cmd):
ini = tmpdir.ensure("hello.ini")
result = cmd.run("tox", "-c", ini, "--showconfig")
diff -r e286636af34ab70a5dac5ed815b1dc1a842f53b9 -r
8fcc1bed3e918b625d85864cc3f4623578852e7e tox.ini
--- a/tox.ini
+++ b/tox.ini
@@ -1,20 +1,18 @@
[tox]
envlist=py27,py26,py25,py32,py33,docs,pypy
-indexserver =
- testrun = http://pypi.testrun.org
- pypi = https://pypi.python.org/simple
[testenv:X]
commands=echo {posargs}
[testenv]
-commands=py.test --junitxml={envlogdir}/junit-{envname}.xml {posargs}
+commands=py.test --instafail --junitxml={envlogdir}/junit-{envname}.xml
{posargs}
deps=pytest==2.3.4
+ pytest-instafail
[testenv:docs]
basepython=python
changedir=doc
-deps=:pypi:sphinx
+deps=sphinx
{[testenv]deps}
commands=
py.test -v \
diff -r e286636af34ab70a5dac5ed815b1dc1a842f53b9 -r
8fcc1bed3e918b625d85864cc3f4623578852e7e tox/__init__.py
--- a/tox/__init__.py
+++ b/tox/__init__.py
@@ -1,5 +1,5 @@
#
-__version__ = '1.5.dev12'
+__version__ = '1.5.0'
class exception:
class Error(Exception):
diff -r e286636af34ab70a5dac5ed815b1dc1a842f53b9 -r
8fcc1bed3e918b625d85864cc3f4623578852e7e tox/_venv.py
--- a/tox/_venv.py
+++ b/tox/_venv.py
@@ -83,11 +83,9 @@
if p is None:
raise tox.exception.InvocationError(
"could not find executable %r" % (name,))
+ # p is not found in virtualenv script/bin dir
if venv:
- for x in self.envconfig.whitelist_externals:
- if p.fnmatch(x):
- break
- else:
+ if not self.is_allowed_external(p):
self.session.report.warning(
"test command found but not installed in testenv\n"
" cmd: %s\n"
@@ -96,6 +94,18 @@
self.envconfig.envdir))
return str(p) # will not be rewritten for reporting
+ def is_allowed_external(self, p):
+ tryadd = [""]
+ if sys.platform == "win32":
+ tryadd += [os.path.normcase(x)
+ for x in os.environ['PATHEXT'].split(os.pathsep)]
+ p = py.path.local(os.path.normcase(str(p)))
+ for x in self.envconfig.whitelist_externals:
+ for add in tryadd:
+ if p.fnmatch(x + add):
+ return True
+ return False
+
def _ispython3(self):
return "python3" in str(self.envconfig.basepython)
diff -r e286636af34ab70a5dac5ed815b1dc1a842f53b9 -r
8fcc1bed3e918b625d85864cc3f4623578852e7e toxbootstrap.py
--- a/toxbootstrap.py
+++ b/toxbootstrap.py
@@ -58,7 +58,7 @@
"""
-__version__ = '1.5.dev12'
+__version__ = '1.5.0'
import sys
import os
https://bitbucket.org/hpk42/tox/commits/d1c4826481be/
Changeset: d1c4826481be
User: hpk42
Date: 2013-06-22 15:06:02
Summary: Added tag 1.5.0 for changeset 8fcc1bed3e91
Affected #: 1 file
diff -r 8fcc1bed3e918b625d85864cc3f4623578852e7e -r
d1c4826481bedb84636d1b805519ace5bffce9bf .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -12,3 +12,4 @@
3a68408fa3a210c2a2e52189e16f5ae6dfed287d 1.4.1
668f66e4781b0beae509db8125dc02218f6efe4e 1.4.2
f5177c612fbadb8552c58693fa7249388c1c1bd3 1.4.3
+8fcc1bed3e918b625d85864cc3f4623578852e7e 1.5.0
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
[email protected]
http://mail.python.org/mailman/listinfo/pytest-commit
