diff --git a/requirements-dev.txt b/requirements-dev.txt index e7df704925485..13e2c95126f0c 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,4 @@ numpy>=1.15 -python==3.7 python-dateutil>=2.6.1 pytz asv diff --git a/scripts/generate_pip_deps_from_conda.py b/scripts/generate_pip_deps_from_conda.py index f1c7c3298fb26..6f809669d917f 100755 --- a/scripts/generate_pip_deps_from_conda.py +++ b/scripts/generate_pip_deps_from_conda.py @@ -19,7 +19,7 @@ import yaml -EXCLUDE = {"python=3"} +EXCLUDE = {"python"} RENAME = {"pytables": "tables", "pyqt": "pyqt5", "dask-core": "dask"} @@ -33,15 +33,15 @@ def conda_package_to_pip(package): - A package requiring a specific version, in conda is defined with a single equal (e.g. ``pandas=1.0``) and in pip with two (e.g. ``pandas==1.0``) """ - if package in EXCLUDE: - return - package = re.sub("(?<=[^<>])=", "==", package).strip() + for compare in ("<=", ">=", "=="): if compare not in package: continue pkg, version = package.split(compare) + if pkg in EXCLUDE: + return if pkg in RENAME: return "".join((RENAME[pkg], compare, version))