From 27dd02e85cf66b7223b05c93b629c66b298d8f8f Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 7 Feb 2018 08:29:16 -0600 Subject: [PATCH 1/8] CI: Fixed NumPy pinning in conda-build --- conda.recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index 87a79f7e5a987..d2a0ce4deb23a 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -14,14 +14,14 @@ requirements: build: - python - cython - - {{ pin_compatible('numpy', upper_bound='1.14') }} + - {{ pin_compatible('numpy', max_pin='1.14') }} - setuptools >=3.3 - python-dateutil >=2.5.0 - pytz run: - python - - {{ pin_compatible('numpy', upper_bound='1.14') }} + - {{ pin_compatible('numpy', max_pin='1.14') }} - python-dateutil >=2.5.0 - pytz From 4de1e1ed9b8d66f4e8fcf387d4bced6ce1701ba2 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 7 Feb 2018 10:17:01 -0600 Subject: [PATCH 2/8] Unpin NumPy Quite install --- ci/install_travis.sh | 6 +++--- ci/requirements-3.6.build | 2 +- conda.recipe/meta.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/install_travis.sh b/ci/install_travis.sh index 4ec5b0a9d8820..6e270519e60c3 100755 --- a/ci/install_travis.sh +++ b/ci/install_travis.sh @@ -110,7 +110,7 @@ if [ -e ${REQ} ]; then fi time conda install -n pandas pytest>=3.1.0 -time pip install pytest-xdist moto +time pip install -q pytest-xdist moto if [ "$LINT" ]; then conda install flake8=3.4.1 @@ -181,10 +181,10 @@ elif [ "$CONDA_BUILD_TEST" ]; then # build & install testing echo "[building conda recipe]" - time conda build ./conda.recipe --numpy 1.13 --python 3.5 -q --no-test + time conda build ./conda.recipe --python 3.5 -q --no-test || exit 1 echo "[installing]" - conda install pandas --use-local + conda install pandas --use-local || exit 1 else diff --git a/ci/requirements-3.6.build b/ci/requirements-3.6.build index 94e1152450d87..1c4b46aea3865 100644 --- a/ci/requirements-3.6.build +++ b/ci/requirements-3.6.build @@ -2,5 +2,5 @@ python=3.6* python-dateutil pytz nomkl -numpy=1.13.* +numpy cython diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index d2a0ce4deb23a..4391b33f9a30f 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -14,14 +14,14 @@ requirements: build: - python - cython - - {{ pin_compatible('numpy', max_pin='1.14') }} + - numpy - setuptools >=3.3 - python-dateutil >=2.5.0 - pytz run: - python - - {{ pin_compatible('numpy', max_pin='1.14') }} + - numpy - python-dateutil >=2.5.0 - pytz From 34d8d701a668f29196ff8b789c3130325dcc3246 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 7 Feb 2018 20:41:03 -0600 Subject: [PATCH 3/8] Pin numpy --- conda.recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index 4391b33f9a30f..fd4bfad3d0bb8 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -14,14 +14,14 @@ requirements: build: - python - cython - - numpy + - {{ pin_compatible('numpy', min_pin='1.14') }} - setuptools >=3.3 - python-dateutil >=2.5.0 - pytz run: - python - - numpy + - {{ pin_compatible('numpy', min_pin='1.14') }} - python-dateutil >=2.5.0 - pytz From d7fc473ea2f5a5b4b3e6926878c9e3b4f963e1c6 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 7 Feb 2018 20:43:07 -0600 Subject: [PATCH 4/8] Unpin everywhere else --- ci/requirements-3.5_CONDA_BUILD_TEST.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements-3.5_CONDA_BUILD_TEST.build b/ci/requirements-3.5_CONDA_BUILD_TEST.build index 6648e3778777c..f7befe3b31865 100644 --- a/ci/requirements-3.5_CONDA_BUILD_TEST.build +++ b/ci/requirements-3.5_CONDA_BUILD_TEST.build @@ -2,5 +2,5 @@ python=3.5* python-dateutil pytz nomkl -numpy=1.13* +numpy cython From 562a82780fc2d247f76b53c7e12043f01da3aaef Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 7 Feb 2018 20:45:27 -0600 Subject: [PATCH 5/8] Build vs. 1.11 --- conda.recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index fd4bfad3d0bb8..86bed996c8aab 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -14,14 +14,14 @@ requirements: build: - python - cython - - {{ pin_compatible('numpy', min_pin='1.14') }} + - numpy 1.11.* - setuptools >=3.3 - python-dateutil >=2.5.0 - pytz run: - python - - {{ pin_compatible('numpy', min_pin='1.14') }} + - numpy >=1.11.* - python-dateutil >=2.5.0 - pytz From a576f349b68db9104b6e5eb60bb1add98583a8c7 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 8 Feb 2018 06:15:37 -0600 Subject: [PATCH 6/8] remove one more pin --- ci/requirements-3.5_CONDA_BUILD_TEST.run | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/requirements-3.5_CONDA_BUILD_TEST.run b/ci/requirements-3.5_CONDA_BUILD_TEST.run index 19d9a91e86585..32e6f8687a584 100644 --- a/ci/requirements-3.5_CONDA_BUILD_TEST.run +++ b/ci/requirements-3.5_CONDA_BUILD_TEST.run @@ -1,5 +1,4 @@ pytz -numpy=1.13* openpyxl xlsxwriter xlrd From 167abdb2a84f7f0d77c6a64675a0d61b83cb7c1c Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 8 Feb 2018 06:17:44 -0600 Subject: [PATCH 7/8] Remove one more pin --- ci/requirements-3.5_CONDA_BUILD_TEST.run | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/requirements-3.5_CONDA_BUILD_TEST.run b/ci/requirements-3.5_CONDA_BUILD_TEST.run index 32e6f8687a584..669cf437f2164 100644 --- a/ci/requirements-3.5_CONDA_BUILD_TEST.run +++ b/ci/requirements-3.5_CONDA_BUILD_TEST.run @@ -1,4 +1,5 @@ pytz +numpy openpyxl xlsxwriter xlrd From 6f5f87ac916b98336aabfa4c2ca833bcc28b6888 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 9 Feb 2018 06:56:42 -0600 Subject: [PATCH 8/8] bump pyarrow --- ci/requirements-3.5_CONDA_BUILD_TEST.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements-3.5_CONDA_BUILD_TEST.sh b/ci/requirements-3.5_CONDA_BUILD_TEST.sh index 09d6775cfc894..093fdbcf21d78 100644 --- a/ci/requirements-3.5_CONDA_BUILD_TEST.sh +++ b/ci/requirements-3.5_CONDA_BUILD_TEST.sh @@ -8,4 +8,4 @@ echo "install 35 CONDA_BUILD_TEST" conda remove -n pandas python-dateutil --force pip install python-dateutil -conda install -n pandas -c conda-forge feather-format pyarrow=0.5.0 +conda install -n pandas -c conda-forge feather-format pyarrow=0.7.1