Commit 0f7d2a83 authored by Marius Gedminas's avatar Marius Gedminas

Merge pull request #37 from zopefoundation/env-markers

Use PEP-426 environment markers
parents a1df3d04 add078bd
...@@ -23,7 +23,6 @@ interface, rich transaction support, and undo. ...@@ -23,7 +23,6 @@ interface, rich transaction support, and undo.
VERSION = "4.2.0.dev0" VERSION = "4.2.0.dev0"
import os import os
import platform
import sys import sys
from setuptools import setup, find_packages from setuptools import setup, find_packages
...@@ -35,11 +34,6 @@ if (3,) < sys.version_info < (3, 2): ...@@ -35,11 +34,6 @@ if (3,) < sys.version_info < (3, 2):
print("This version of ZODB requires Python 3.2 or higher") print("This version of ZODB requires Python 3.2 or higher")
sys.exit(0) sys.exit(0)
PY3 = sys.version_info >= (3,)
PY27 = sys.version_info >= (2,7)
py_impl = getattr(platform, 'python_implementation', lambda: None)
PYPY = py_impl() == 'PyPy'
# The (non-obvious!) choices for the Trove Development Status line: # The (non-obvious!) choices for the Trove Development Status line:
# Development Status :: 5 - Production/Stable # Development Status :: 5 - Production/Stable
...@@ -157,7 +151,10 @@ setup(name="ZODB", ...@@ -157,7 +151,10 @@ setup(name="ZODB",
long_description = long_description, long_description = long_description,
test_suite="__main__.alltests", # to support "setup.py test" test_suite="__main__.alltests", # to support "setup.py test"
tests_require = tests_require, tests_require = tests_require,
extras_require = dict(test=tests_require), extras_require = {
'test': tests_require,
':python_version != "2.6"': 'zodbpickle >= 0.6.0',
},
install_requires = [ install_requires = [
'persistent >= 4.1.0', 'persistent >= 4.1.0',
'BTrees >= 4.1.3', 'BTrees >= 4.1.3',
...@@ -167,7 +164,7 @@ setup(name="ZODB", ...@@ -167,7 +164,7 @@ setup(name="ZODB",
'zc.lockfile', 'zc.lockfile',
'zdaemon >= 4.0.0a1', 'zdaemon >= 4.0.0a1',
'zope.interface', 'zope.interface',
] + (['zodbpickle >= 0.6.0'] if (PY3 or PY27 or PYPY) else []), ],
zip_safe = False, zip_safe = False,
entry_points = """ entry_points = """
[console_scripts] [console_scripts]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment