bump version to 2.7, depend on py-1.4.29

This commit is contained in:
holger krekel 2015-06-22 23:53:41 +02:00
parent 898b63b665
commit cdd25c9512
3 changed files with 10 additions and 6 deletions

View File

@ -23,6 +23,10 @@
- fix issue718: failed to create representation of sets containing unsortable - fix issue718: failed to create representation of sets containing unsortable
elements in python 2. Thanks Edison Gustavo Muenz elements in python 2. Thanks Edison Gustavo Muenz
- fix issue756, fix issue752 (and similar issues): depend on py-1.4.29
which has a refined algorithm for traceback generation.
2.7.1 (compared to 2.7.0) 2.7.1 (compared to 2.7.0)
----------------------------- -----------------------------

View File

@ -1,2 +1,2 @@
# #
__version__ = '2.7.1' __version__ = '2.7.2'

View File

@ -31,12 +31,12 @@ def get_version():
def has_environment_marker_support(): def has_environment_marker_support():
""" """
Tests that setuptools has support for PEP-426 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 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 so we're using that), see: http://pythonhosted.org/setuptools/history.html#id142
References: References:
* https://wheel.readthedocs.org/en/latest/index.html#defining-conditional-dependencies * https://wheel.readthedocs.org/en/latest/index.html#defining-conditional-dependencies
* https://www.python.org/dev/peps/pep-0426/#environment-markers * https://www.python.org/dev/peps/pep-0426/#environment-markers
""" """
@ -48,7 +48,7 @@ def has_environment_marker_support():
def main(): def main():
install_requires = ['py>=1.4.25'] install_requires = ['py>=1.4.29']
extras_require = {} extras_require = {}
if has_environment_marker_support(): if has_environment_marker_support():
extras_require[':python_version=="2.6" or python_version=="3.0" or python_version=="3.1"'] = ['argparse'] extras_require[':python_version=="2.6" or python_version=="3.0" or python_version=="3.1"'] = ['argparse']