Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use environment markers for Python 2 dependency pins (#3618)

Browse Source 
PyPI does not run setup.py separately for each Python version to
resolve requirements, so these conditional requirements need to be
properly specified in the metadata, not in code.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg 2021-01-28 06:16:20 -08:00 committed by GitHub
parent 199da2220b
commit 6ecf050228
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
setup.py
View File

@ -8,8 +8,6 @@ import setuptools
from setuptools import setup, find_packages from setuptools import setup, find_packages
import sys import sys
PY2 = sys.version_info[0] == 2
# Borrowed from pip at https://github.com/pypa/pip/blob/62c27dee45625e1b63d1e023b0656310f276e050/setup.py#L11-L15 # Borrowed from pip at https://github.com/pypa/pip/blob/62c27dee45625e1b63d1e023b0656310f276e050/setup.py#L11-L15
here = os.path.abspath(os.path.dirname(__file__)) here = os.path.abspath(os.path.dirname(__file__))
@ -52,29 +50,25 @@ install_requires = [
# #
# https://github.com/mpenkov/moto/commit/00134d2df37bb4dcd5f447ef951d383bfec0903c # https://github.com/mpenkov/moto/commit/00134d2df37bb4dcd5f447ef951d383bfec0903c
# #
if PY2: install_requires += [
install_requires += [ #
# # This is an indirect dependency. Version 5.0.0 claims to be for
# This is an indirect dependency. Version 5.0.0 claims to be for # Py2.6+, but it really isn't.
# Py2.6+, but it really isn't. #
# # https://github.com/jaraco/configparser/issues/51
# https://github.com/jaraco/configparser/issues/51 #
# "configparser<5.0; python_version < '3'",
"configparser<5.0", "Jinja2>=2.10.1",
"Jinja2<3.0.0,>=2.10.1", "Jinja2<3.0.0; python_version < '3'",
"mock<=3.0.5", "mock<=4.0.2",
"more-itertools==5.0.0", "mock<=3.0.5; python_version < '3'",
"setuptools==44.0.0", "more-itertools",
"zipp==0.6.0", "more-itertools==5.0.0; python_version < '3'",
] "setuptools",
else: "setuptools==44.0.0; python_version < '3'",
install_requires += [ "zipp",
"Jinja2>=2.10.1", "zipp==0.6.0; python_version < '3'",
"mock<=4.0.2", ]
"more-itertools",
"setuptools",
"zipp",
]
_dep_PyYAML = "PyYAML>=5.1" _dep_PyYAML = "PyYAML>=5.1"
_dep_python_jose = "python-jose[cryptography]>=3.1.0,<4.0.0" _dep_python_jose = "python-jose[cryptography]>=3.1.0,<4.0.0"