2 new commits in tox:
https://bitbucket.org/hpk42/tox/commits/2897c9e3a019/
Changeset: 2897c9e3a019
User: hpk42
Date: 2015-05-12 23:27:42+00:00
Summary: fix wheel packaging to properly require argparse on py26.
Affected #: 5 files
diff -r 9a701e4a22b55b6dfb193c421381140e30ab2445 -r
2897c9e3a019ee29948cbeda319ffac0e6902053 CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+2.0.1
+-----------
+
+- fix wheel packaging to properly require argparse on py26.
+
2.0.0
-----------
diff -r 9a701e4a22b55b6dfb193c421381140e30ab2445 -r
2897c9e3a019ee29948cbeda319ffac0e6902053 doc/conf.py
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -49,7 +49,7 @@
#
# The short X.Y version.
release = "2.0"
-version = "2.0.0"
+version = "2.0.1"
# The full version, including alpha/beta/rc tags.
# The language for content autogenerated by Sphinx. Refer to documentation
diff -r 9a701e4a22b55b6dfb193c421381140e30ab2445 -r
2897c9e3a019ee29948cbeda319ffac0e6902053 setup.py
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
import sys
-from setuptools import setup
+import setuptools
from setuptools.command.test import test as TestCommand
@@ -15,18 +15,40 @@
import tox
tox.cmdline(self.test_args)
+def has_environment_marker_support():
+ """
+ Tests that setuptools has support for PEP-426 environment marker support.
+
+ The first known release to support it is 0.7 (and the earliest on PyPI
seems to be 0.7.2
+ so we're using that), see:
http://pythonhosted.org/setuptools/history.html#id142
+
+ References:
+
+ *
https://wheel.readthedocs.org/en/latest/index.html#defining-conditional-dependencies
+ * https://www.python.org/dev/peps/pep-0426/#environment-markers
+ """
+ import pkg_resources
+ try:
+ return pkg_resources.parse_version(setuptools.__version__) >=
pkg_resources.parse_version('0.7.2')
+ except Exception as exc:
+ sys.stderr.write("Could not test setuptool's version: %s\n" % exc)
+ return False
def main():
version = sys.version_info[:2]
install_requires = ['virtualenv>=1.11.2', 'py>=1.4.17',
'pluggy>=0.3.0,<0.4.0']
- if version < (2, 7):
- install_requires += ['argparse']
- setup(
+ extras_require = {}
+ if has_environment_marker_support():
+ extras_require[':python_version=="2.6"'] = ['argparse']
+ else:
+ if version < (2, 7):
+ install_requires += ['argparse']
+ setuptools.setup(
name='tox',
description='virtualenv-based automation of test activities',
long_description=open("README.rst").read(),
url='http://tox.testrun.org/',
- version='2.0.0',
+ version='2.0.1',
license='http://opensource.org/licenses/MIT',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
author='holger krekel',
@@ -38,6 +60,7 @@
tests_require=['tox'],
cmdclass={"test": Tox},
install_requires=install_requires,
+ extras_require=extras_require,
classifiers=[
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
diff -r 9a701e4a22b55b6dfb193c421381140e30ab2445 -r
2897c9e3a019ee29948cbeda319ffac0e6902053 tox.ini
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist=py27,py26,py34,py33,pypy,flakes
+envlist=py27,py26,py34,py33,pypy,flakes,py26-bare
[testenv:X]
commands=echo {posargs}
@@ -10,6 +10,10 @@
deps=pytest>=2.3.5
pytest-timeout
+[testenv:py26-bare]
+deps =
+commands = tox -h
+
[testenv:docs]
basepython=python
changedir=doc
diff -r 9a701e4a22b55b6dfb193c421381140e30ab2445 -r
2897c9e3a019ee29948cbeda319ffac0e6902053 tox/__init__.py
--- a/tox/__init__.py
+++ b/tox/__init__.py
@@ -1,5 +1,5 @@
#
-__version__ = '2.0.0'
+__version__ = '2.0.1'
from .hookspecs import hookspec, hookimpl # noqa
https://bitbucket.org/hpk42/tox/commits/b136e1f17193/
Changeset: b136e1f17193
User: hpk42
Date: 2015-05-12 23:37:50+00:00
Summary: Added tag 2.0.1 for changeset 2897c9e3a019
Affected #: 1 file
diff -r 2897c9e3a019ee29948cbeda319ffac0e6902053 -r
b136e1f17193945ee7f61e2e1884564b18b489ac .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -24,3 +24,4 @@
7ccc0b0bd25e1e01dfd861b890ada69042a32c3a 1.9.1
452288d6c50042ccfc1c944b24f4eb47df8f6823 1.9.2
b7e498efd0ecd543a870431ea8d34f2882d5ace8 2.0.0
+2897c9e3a019ee29948cbeda319ffac0e6902053 2.0.1
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
https://mail.python.org/mailman/listinfo/pytest-commit
