From ec259e1ea4002490efd493a7debaa6de3f55c475 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Tue, 15 Oct 2019 20:34:59 +0100 Subject: [PATCH 1/3] CI: troubleshoot RemoveError: 'setuptools' is a dependency of conda --- ci/deps/azure-35-compat.yaml | 2 +- ci/deps/azure-36-32bit.yaml | 2 +- ci/deps/azure-36-locale.yaml | 2 +- ci/deps/azure-36-locale_slow.yaml | 2 +- ci/deps/azure-37-locale.yaml | 2 +- ci/deps/azure-37-numpydev.yaml | 2 +- ci/deps/azure-macos-35.yaml | 2 +- ci/deps/travis-36-cov.yaml | 2 +- ci/deps/travis-36-locale.yaml | 2 +- ci/deps/travis-37.yaml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ci/deps/azure-35-compat.yaml b/ci/deps/azure-35-compat.yaml index dd54001984ec7..db616fc6e9421 100644 --- a/ci/deps/azure-35-compat.yaml +++ b/ci/deps/azure-35-compat.yaml @@ -22,7 +22,7 @@ dependencies: - pytest-xdist - pytest-mock - pytest-azurepipelines - - pip + - pip=19.2.3 - pip: # for python 3.5, pytest>=4.0.2, cython>=0.29.13 is not available in conda - cython>=0.29.13 diff --git a/ci/deps/azure-36-32bit.yaml b/ci/deps/azure-36-32bit.yaml index 1e2e6c33e8c15..6540d91569c40 100644 --- a/ci/deps/azure-36-32bit.yaml +++ b/ci/deps/azure-36-32bit.yaml @@ -17,7 +17,7 @@ dependencies: - pytest-mock - pytest-azurepipelines - hypothesis>=3.58.0 - - pip + - pip=19.2.3 - pip: # Anaconda doesn't build a new enough Cython - cython>=0.29.13 diff --git a/ci/deps/azure-36-locale.yaml b/ci/deps/azure-36-locale.yaml index 76868f598f11b..0255a1934d653 100644 --- a/ci/deps/azure-36-locale.yaml +++ b/ci/deps/azure-36-locale.yaml @@ -25,6 +25,6 @@ dependencies: - pytest-mock - pytest-azurepipelines - hypothesis>=3.58.0 - - pip + - pip=19.2.3 - pip: - html5lib==1.0b2 diff --git a/ci/deps/azure-36-locale_slow.yaml b/ci/deps/azure-36-locale_slow.yaml index 21205375204dc..2906a9f71a2fb 100644 --- a/ci/deps/azure-36-locale_slow.yaml +++ b/ci/deps/azure-36-locale_slow.yaml @@ -31,6 +31,6 @@ dependencies: - pytest-mock - pytest-azurepipelines - moto - - pip + - pip=19.2.3 - pip: - hypothesis>=3.58.0 diff --git a/ci/deps/azure-37-locale.yaml b/ci/deps/azure-37-locale.yaml index 24464adb74f5b..1b38ecb4aa59f 100644 --- a/ci/deps/azure-37-locale.yaml +++ b/ci/deps/azure-37-locale.yaml @@ -30,6 +30,6 @@ dependencies: - pytest-xdist>=1.29.0 - pytest-mock - pytest-azurepipelines - - pip + - pip=19.2.3 - pip: - hypothesis>=3.58.0 diff --git a/ci/deps/azure-37-numpydev.yaml b/ci/deps/azure-37-numpydev.yaml index 0fb06fd43724c..891f1561ca861 100644 --- a/ci/deps/azure-37-numpydev.yaml +++ b/ci/deps/azure-37-numpydev.yaml @@ -11,7 +11,7 @@ dependencies: - pytest-xdist - pytest-mock - hypothesis>=3.58.0 - - pip + - pip=19.2.3 - pip: - "git+git://github.com/dateutil/dateutil.git" - "-f https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com" diff --git a/ci/deps/azure-macos-35.yaml b/ci/deps/azure-macos-35.yaml index 4e0f09904b695..96afda3f72981 100644 --- a/ci/deps/azure-macos-35.yaml +++ b/ci/deps/azure-macos-35.yaml @@ -21,7 +21,7 @@ dependencies: - xlrd - xlsxwriter - xlwt - - pip + - pip=19.2.3 - pip: # Anaconda / conda-forge don't build for 3.5 - cython>=0.29.13 diff --git a/ci/deps/travis-36-cov.yaml b/ci/deps/travis-36-cov.yaml index e4e917d13990c..8a2ae2fe7e58f 100644 --- a/ci/deps/travis-36-cov.yaml +++ b/ci/deps/travis-36-cov.yaml @@ -44,7 +44,7 @@ dependencies: - pytest-cov - pytest-mock - hypothesis>=3.58.0 - - pip + - pip=19.2.3 - pip: - brotlipy - coverage diff --git a/ci/deps/travis-36-locale.yaml b/ci/deps/travis-36-locale.yaml index 44795766d7c31..de634fb3f91ff 100644 --- a/ci/deps/travis-36-locale.yaml +++ b/ci/deps/travis-36-locale.yaml @@ -37,6 +37,6 @@ dependencies: - pytest>=5.0.1 - pytest-xdist>=1.29.0 - pytest-mock - - pip + - pip=19.2.3 - pip: - hypothesis>=3.58.0 diff --git a/ci/deps/travis-37.yaml b/ci/deps/travis-37.yaml index 440ca6c480b87..d2378453c3e34 100644 --- a/ci/deps/travis-37.yaml +++ b/ci/deps/travis-37.yaml @@ -18,7 +18,7 @@ dependencies: - pytest-mock - hypothesis>=3.58.0 - s3fs<0.3 - - pip + - pip=19.2.3 - pyreadstat - pip: - moto From 73fea89364b311964b802c5679c2eb572850ef0f Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Tue, 15 Oct 2019 20:41:51 +0100 Subject: [PATCH 2/3] setuptools --- ci/deps/azure-36-locale_slow.yaml | 1 + ci/deps/azure-macos-35.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/ci/deps/azure-36-locale_slow.yaml b/ci/deps/azure-36-locale_slow.yaml index 2906a9f71a2fb..9de2b2d688892 100644 --- a/ci/deps/azure-36-locale_slow.yaml +++ b/ci/deps/azure-36-locale_slow.yaml @@ -32,5 +32,6 @@ dependencies: - pytest-azurepipelines - moto - pip=19.2.3 + - setuptools=41.4.0 - pip: - hypothesis>=3.58.0 diff --git a/ci/deps/azure-macos-35.yaml b/ci/deps/azure-macos-35.yaml index 96afda3f72981..b6a8eb3d80251 100644 --- a/ci/deps/azure-macos-35.yaml +++ b/ci/deps/azure-macos-35.yaml @@ -22,6 +22,7 @@ dependencies: - xlsxwriter - xlwt - pip=19.2.3 + - setuptools=41.4.0 - pip: # Anaconda / conda-forge don't build for 3.5 - cython>=0.29.13 From 19a369e1c48701980e306fe1013e3debc26758c9 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Tue, 15 Oct 2019 20:48:56 +0100 Subject: [PATCH 3/3] setuptools=41.0.1 --- ci/deps/azure-36-locale_slow.yaml | 2 +- ci/deps/azure-macos-35.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/deps/azure-36-locale_slow.yaml b/ci/deps/azure-36-locale_slow.yaml index 9de2b2d688892..498b6b509fafa 100644 --- a/ci/deps/azure-36-locale_slow.yaml +++ b/ci/deps/azure-36-locale_slow.yaml @@ -32,6 +32,6 @@ dependencies: - pytest-azurepipelines - moto - pip=19.2.3 - - setuptools=41.4.0 + - setuptools=41.0.1 - pip: - hypothesis>=3.58.0 diff --git a/ci/deps/azure-macos-35.yaml b/ci/deps/azure-macos-35.yaml index b6a8eb3d80251..623c6a984e296 100644 --- a/ci/deps/azure-macos-35.yaml +++ b/ci/deps/azure-macos-35.yaml @@ -22,7 +22,7 @@ dependencies: - xlsxwriter - xlwt - pip=19.2.3 - - setuptools=41.4.0 + - setuptools=41.0.1 - pip: # Anaconda / conda-forge don't build for 3.5 - cython>=0.29.13