From c240a8c2475efcbf124e0a13095e8253bf8d6190 Mon Sep 17 00:00:00 2001 From: Fabian Haase Date: Fri, 16 Nov 2018 14:22:36 +0100 Subject: [PATCH] fix renaming of packages Signed-off-by: Fabian Haase --- requirements-dev.txt | 2 +- scripts/generate_pip_deps_from_conda.py | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 93145d948c218..0c6350eb40c95 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -28,7 +28,7 @@ numexpr>=2.6.1 openpyxl pyarrow>=0.7.0 pymysql -pytables>=3.4.2 +tables>=3.4.2 pytest-cov pytest-xdist s3fs diff --git a/scripts/generate_pip_deps_from_conda.py b/scripts/generate_pip_deps_from_conda.py index 2474214a4a53b..1f79b23a259dc 100755 --- a/scripts/generate_pip_deps_from_conda.py +++ b/scripts/generate_pip_deps_from_conda.py @@ -36,10 +36,19 @@ def conda_package_to_pip(package): if package in EXCLUDE: return - if package in RENAME: - return RENAME[package] + package = re.sub('(?<=[^<>])=', '==', package).strip() + for compare in ('<=', '>=', '=='): + if compare not in package: + continue - return re.sub('(?<=[^<>])=', '==', package).strip() + pkg, version = package.split(compare) + + if pkg in RENAME: + return ''.join((RENAME[pkg], compare, version)) + + break + + return package def main(conda_fname, pip_fname, compare=False):