From cad9f29edefeec4c5e7d03c1670a3be61ae6380f Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 13 Aug 2019 16:22:07 -0500 Subject: [PATCH 1/4] Revert "CI: Pin Python to 3.7.3 (#27868)" This reverts commit 2ebab98cf1f36a678256436e7a4f5149536436c9. --- ci/deps/azure-37-locale.yaml | 2 +- ci/deps/azure-37-numpydev.yaml | 2 +- ci/deps/travis-37.yaml | 2 +- environment.yml | 2 +- requirements-dev.txt | 1 - 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ci/deps/azure-37-locale.yaml b/ci/deps/azure-37-locale.yaml index 437fbc24b9411..26dcd213bbfa0 100644 --- a/ci/deps/azure-37-locale.yaml +++ b/ci/deps/azure-37-locale.yaml @@ -17,7 +17,7 @@ dependencies: - openpyxl - pytables - python-dateutil - - python=3.7.3 + - python=3.7.* - pytz - s3fs - scipy diff --git a/ci/deps/azure-37-numpydev.yaml b/ci/deps/azure-37-numpydev.yaml index e1acda7ecf3c7..65c92ec1dcf0d 100644 --- a/ci/deps/azure-37-numpydev.yaml +++ b/ci/deps/azure-37-numpydev.yaml @@ -2,7 +2,7 @@ name: pandas-dev channels: - defaults dependencies: - - python=3.7.3 + - python=3.7.* - pytz - Cython>=0.28.2 # universal diff --git a/ci/deps/travis-37.yaml b/ci/deps/travis-37.yaml index d7bed9e3f03f2..9e08c41a3d9c0 100644 --- a/ci/deps/travis-37.yaml +++ b/ci/deps/travis-37.yaml @@ -4,7 +4,7 @@ channels: - conda-forge - c3i_test dependencies: - - python=3.7.3 + - python=3.7.* - botocore>=1.11 - cython>=0.28.2 - numpy diff --git a/environment.yml b/environment.yml index 0cbd500209b6c..6d2cd701c3854 100644 --- a/environment.yml +++ b/environment.yml @@ -5,7 +5,7 @@ channels: dependencies: # required - numpy>=1.15 - - python=3.7.3 + - python=3 - python-dateutil>=2.6.1 - pytz diff --git a/requirements-dev.txt b/requirements-dev.txt index f866f1436edc6..cf11a3ee28258 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,4 @@ numpy>=1.15 -python==3.7.3 python-dateutil>=2.6.1 pytz asv From 530149f873dc9c009e1ee9ffc535f22dc64ca139 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 13 Aug 2019 16:23:28 -0500 Subject: [PATCH 2/4] try fixed packages --- ci/deps/azure-37-locale.yaml | 1 + ci/deps/azure-37-numpydev.yaml | 1 + ci/deps/travis-37.yaml | 1 + environment.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/ci/deps/azure-37-locale.yaml b/ci/deps/azure-37-locale.yaml index 26dcd213bbfa0..4cebadf1ccb19 100644 --- a/ci/deps/azure-37-locale.yaml +++ b/ci/deps/azure-37-locale.yaml @@ -1,5 +1,6 @@ name: pandas-dev channels: + - jjhelmus/label/py374 - defaults - conda-forge dependencies: diff --git a/ci/deps/azure-37-numpydev.yaml b/ci/deps/azure-37-numpydev.yaml index 65c92ec1dcf0d..5760f8a980ef6 100644 --- a/ci/deps/azure-37-numpydev.yaml +++ b/ci/deps/azure-37-numpydev.yaml @@ -1,5 +1,6 @@ name: pandas-dev channels: + - jjhelmus/label/py374 - defaults dependencies: - python=3.7.* diff --git a/ci/deps/travis-37.yaml b/ci/deps/travis-37.yaml index 9e08c41a3d9c0..0a0035075bec0 100644 --- a/ci/deps/travis-37.yaml +++ b/ci/deps/travis-37.yaml @@ -1,5 +1,6 @@ name: pandas-dev channels: + - jjhelmus/label/py374 - defaults - conda-forge - c3i_test diff --git a/environment.yml b/environment.yml index 6d2cd701c3854..ce66992a2d397 100644 --- a/environment.yml +++ b/environment.yml @@ -1,5 +1,6 @@ name: pandas-dev channels: + - jjhelmus/label/py374 - defaults - conda-forge dependencies: From d6901a6c03fecad3ce740f71ddf9ebe7df15bbb4 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 13 Aug 2019 17:02:18 -0500 Subject: [PATCH 3/4] Revert "try fixed packages" This reverts commit 530149f873dc9c009e1ee9ffc535f22dc64ca139. --- ci/deps/azure-37-locale.yaml | 1 - ci/deps/azure-37-numpydev.yaml | 1 - ci/deps/travis-37.yaml | 1 - environment.yml | 1 - 4 files changed, 4 deletions(-) diff --git a/ci/deps/azure-37-locale.yaml b/ci/deps/azure-37-locale.yaml index 4cebadf1ccb19..26dcd213bbfa0 100644 --- a/ci/deps/azure-37-locale.yaml +++ b/ci/deps/azure-37-locale.yaml @@ -1,6 +1,5 @@ name: pandas-dev channels: - - jjhelmus/label/py374 - defaults - conda-forge dependencies: diff --git a/ci/deps/azure-37-numpydev.yaml b/ci/deps/azure-37-numpydev.yaml index 5760f8a980ef6..65c92ec1dcf0d 100644 --- a/ci/deps/azure-37-numpydev.yaml +++ b/ci/deps/azure-37-numpydev.yaml @@ -1,6 +1,5 @@ name: pandas-dev channels: - - jjhelmus/label/py374 - defaults dependencies: - python=3.7.* diff --git a/ci/deps/travis-37.yaml b/ci/deps/travis-37.yaml index 0a0035075bec0..9e08c41a3d9c0 100644 --- a/ci/deps/travis-37.yaml +++ b/ci/deps/travis-37.yaml @@ -1,6 +1,5 @@ name: pandas-dev channels: - - jjhelmus/label/py374 - defaults - conda-forge - c3i_test diff --git a/environment.yml b/environment.yml index ce66992a2d397..6d2cd701c3854 100644 --- a/environment.yml +++ b/environment.yml @@ -1,6 +1,5 @@ name: pandas-dev channels: - - jjhelmus/label/py374 - defaults - conda-forge dependencies: From 216f472aa35d2725699849a4746a3e84d42741a2 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 14 Aug 2019 08:24:10 -0500 Subject: [PATCH 4/4] CI