From 974ef8455a498704f9f0c158f8247482193fce88 Mon Sep 17 00:00:00 2001 From: Ming Li Date: Sat, 29 Sep 2018 19:23:44 +0100 Subject: [PATCH 1/4] change = to == --- ci/requirements-optional-pip.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements-optional-pip.txt b/ci/requirements-optional-pip.txt index 2e1bf0ca22bcf..ad0eba32684a8 100644 --- a/ci/requirements-optional-pip.txt +++ b/ci/requirements-optional-pip.txt @@ -14,7 +14,7 @@ lxml matplotlib nbsphinx numexpr -openpyxl=2.5.5 +openpyxl==2.5.5 pyarrow pymysql tables From e2d1a88a45e95af5a33adaea7c7576d7597d5bba Mon Sep 17 00:00:00 2001 From: Ming Li Date: Sat, 29 Sep 2018 19:39:07 +0100 Subject: [PATCH 2/4] change = to == --- ci/requirements-optional-conda.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements-optional-conda.txt b/ci/requirements-optional-conda.txt index 376fdb1e14e3a..7860000b610c9 100644 --- a/ci/requirements-optional-conda.txt +++ b/ci/requirements-optional-conda.txt @@ -12,7 +12,7 @@ lxml matplotlib nbsphinx numexpr -openpyxl=2.5.5 +openpyxl==2.5.5 pyarrow pymysql pytables From 857d484bcf6979a17f4d28b6d8a32ff36c3c88f9 Mon Sep 17 00:00:00 2001 From: Ming Li Date: Sat, 29 Sep 2018 20:18:51 +0100 Subject: [PATCH 3/4] update requirements-optional-pip --- ci/requirements-optional-pip.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements-optional-pip.txt b/ci/requirements-optional-pip.txt index ad0eba32684a8..09ce8e59a3b46 100644 --- a/ci/requirements-optional-pip.txt +++ b/ci/requirements-optional-pip.txt @@ -28,4 +28,4 @@ statsmodels xarray xlrd xlsxwriter -xlwt +xlwt \ No newline at end of file From 57ec32744640682765ba59885183a381940b09a5 Mon Sep 17 00:00:00 2001 From: Ming Li Date: Sat, 29 Sep 2018 21:55:04 +0100 Subject: [PATCH 4/4] diff conda requirement from pip with correct version fix --- ci/requirements-optional-conda.txt | 2 +- scripts/convert_deps.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/requirements-optional-conda.txt b/ci/requirements-optional-conda.txt index 7860000b610c9..376fdb1e14e3a 100644 --- a/ci/requirements-optional-conda.txt +++ b/ci/requirements-optional-conda.txt @@ -12,7 +12,7 @@ lxml matplotlib nbsphinx numexpr -openpyxl==2.5.5 +openpyxl=2.5.5 pyarrow pymysql pytables diff --git a/scripts/convert_deps.py b/scripts/convert_deps.py index aabeb24a0c3c8..3ff157e0a0d7b 100755 --- a/scripts/convert_deps.py +++ b/scripts/convert_deps.py @@ -1,6 +1,7 @@ """ Convert the conda environment.yaml to a pip requirements.txt """ +import re import yaml exclude = {'python=3'} @@ -15,6 +16,7 @@ required = dev['dependencies'] required = [rename.get(dep, dep) for dep in required if dep not in exclude] optional = [rename.get(dep, dep) for dep in optional if dep not in exclude] +optional = [re.sub("(?<=[^<>])=", '==', dep) for dep in optional] with open("ci/requirements_dev.txt", 'wt') as f: