Merge pull request #2265 from bagerard/fix_ci_lib_drop_python2_support
fix indirect library version (zipp) that dropped python2 support recently
This commit is contained in:
commit
235b1a3679
7
setup.py
7
setup.py
@ -108,6 +108,10 @@ CLASSIFIERS = [
|
|||||||
"Topic :: Software Development :: Libraries :: Python Modules",
|
"Topic :: Software Development :: Libraries :: Python Modules",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
PYTHON_VERSION = sys.version_info[0]
|
||||||
|
PY3 = PYTHON_VERSION == 3
|
||||||
|
PY2 = PYTHON_VERSION == 2
|
||||||
|
|
||||||
extra_opts = {
|
extra_opts = {
|
||||||
"packages": find_packages(exclude=["tests", "tests.*"]),
|
"packages": find_packages(exclude=["tests", "tests.*"]),
|
||||||
"tests_require": [
|
"tests_require": [
|
||||||
@ -116,9 +120,10 @@ extra_opts = {
|
|||||||
"coverage<5.0", # recent coverage switched to sqlite format for the .coverage file which isn't handled properly by coveralls
|
"coverage<5.0", # recent coverage switched to sqlite format for the .coverage file which isn't handled properly by coveralls
|
||||||
"blinker",
|
"blinker",
|
||||||
"Pillow>=2.0.0, <7.0.0", # 7.0.0 dropped Python2 support
|
"Pillow>=2.0.0, <7.0.0", # 7.0.0 dropped Python2 support
|
||||||
|
"zipp<2.0.0", # (dependency of pytest) dropped python2 support
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
if sys.version_info[0] == 3:
|
if PY3:
|
||||||
extra_opts["use_2to3"] = True
|
extra_opts["use_2to3"] = True
|
||||||
if "test" in sys.argv:
|
if "test" in sys.argv:
|
||||||
extra_opts["packages"] = find_packages()
|
extra_opts["packages"] = find_packages()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user