From 691c39d255b284544c15b7f35f39370e2d79736b Mon Sep 17 00:00:00 2001 From: phofl Date: Mon, 20 Dec 2021 21:32:48 +0100 Subject: [PATCH 1/5] CI: Pin setuptools for python dev --- .github/workflows/python-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml index 8b3a5a23d7a97..8d14a65595abc 100644 --- a/.github/workflows/python-dev.yml +++ b/.github/workflows/python-dev.yml @@ -48,7 +48,7 @@ jobs: - name: Install dependencies shell: bash run: | - python -m pip install --upgrade pip setuptools wheel + python -m pip install --upgrade pip setuptools<60.0.0 wheel pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy pip install git+https://github.com/nedbat/coveragepy.git pip install cython python-dateutil pytz hypothesis pytest>=6.2.5 pytest-xdist pytest-cov From aef03c923bb1236a2d4c49cee04112bcc160447e Mon Sep 17 00:00:00 2001 From: phofl Date: Mon, 20 Dec 2021 21:50:10 +0100 Subject: [PATCH 2/5] Fix broken statement --- .github/workflows/python-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml index 8d14a65595abc..0923888bf8e4e 100644 --- a/.github/workflows/python-dev.yml +++ b/.github/workflows/python-dev.yml @@ -48,7 +48,7 @@ jobs: - name: Install dependencies shell: bash run: | - python -m pip install --upgrade pip setuptools<60.0.0 wheel + python -m pip install --upgrade pip "setuptools<60.0.0" wheel pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy pip install git+https://github.com/nedbat/coveragepy.git pip install cython python-dateutil pytz hypothesis pytest>=6.2.5 pytest-xdist pytest-cov From bc0d5ed6c25bca84e0cf29b2137c177bec585841 Mon Sep 17 00:00:00 2001 From: phofl Date: Mon, 20 Dec 2021 22:19:37 +0100 Subject: [PATCH 3/5] Pin in azure Pin additional --- azure-pipelines.yml | 2 +- ci/setup_env.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6c685d09ab55a..5f774933ba71c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -42,7 +42,7 @@ jobs: /bin/bash -xc "cd pandas && \ /opt/python/cp38-cp38/bin/python -m venv ~/virtualenvs/pandas-dev && \ . ~/virtualenvs/pandas-dev/bin/activate && \ - python -m pip install --no-deps -U pip wheel setuptools && \ + python -m pip install --no-deps -U pip wheel "setuptools<60.0.0" && \ pip install cython numpy python-dateutil pytz pytest pytest-xdist hypothesis pytest-azurepipelines && \ python setup.py build_ext -q -j2 && \ python -m pip install --no-build-isolation -e . && \ diff --git a/ci/setup_env.sh b/ci/setup_env.sh index 2e16bc6545161..c6ffd27ce3274 100755 --- a/ci/setup_env.sh +++ b/ci/setup_env.sh @@ -106,7 +106,7 @@ echo "[Build extensions]" python setup.py build_ext -q -j2 echo "[Updating pip]" -python -m pip install --no-deps -U pip wheel setuptools +python -m pip install --no-deps -U pip wheel "setuptools<60.0.0" echo "[Install pandas]" python -m pip install --no-build-isolation -e . From 90874703c0919ba7c233f907675ad95606527c3b Mon Sep 17 00:00:00 2001 From: phofl Date: Tue, 21 Dec 2021 00:41:46 +0100 Subject: [PATCH 4/5] Change ticks --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5f774933ba71c..8f693988c380e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -42,7 +42,7 @@ jobs: /bin/bash -xc "cd pandas && \ /opt/python/cp38-cp38/bin/python -m venv ~/virtualenvs/pandas-dev && \ . ~/virtualenvs/pandas-dev/bin/activate && \ - python -m pip install --no-deps -U pip wheel "setuptools<60.0.0" && \ + python -m pip install --no-deps -U pip wheel 'setuptools<60.0.0' && \ pip install cython numpy python-dateutil pytz pytest pytest-xdist hypothesis pytest-azurepipelines && \ python setup.py build_ext -q -j2 && \ python -m pip install --no-build-isolation -e . && \ From a697ef485d1bf2541b1c7ca5e1d0ac8033ffda35 Mon Sep 17 00:00:00 2001 From: phofl Date: Tue, 21 Dec 2021 01:17:36 +0100 Subject: [PATCH 5/5] Add todos --- .github/workflows/python-dev.yml | 1 + azure-pipelines.yml | 1 + ci/setup_env.sh | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml index 0923888bf8e4e..a7c7f3b739f65 100644 --- a/.github/workflows/python-dev.yml +++ b/.github/workflows/python-dev.yml @@ -45,6 +45,7 @@ jobs: with: python-version: '3.10-dev' + # TODO: GH#44980 https://github.com/pypa/setuptools/issues/2941 - name: Install dependencies shell: bash run: | diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8f693988c380e..ac91dcac4d2d8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -36,6 +36,7 @@ jobs: vmImage: ubuntu-18.04 steps: + # TODO: GH#44980 https://github.com/pypa/setuptools/issues/2941 - script: | docker pull quay.io/pypa/manylinux2014_i686 docker run -v $(pwd):/pandas quay.io/pypa/manylinux2014_i686 \ diff --git a/ci/setup_env.sh b/ci/setup_env.sh index c6ffd27ce3274..4a3e103ea0310 100755 --- a/ci/setup_env.sh +++ b/ci/setup_env.sh @@ -106,6 +106,7 @@ echo "[Build extensions]" python setup.py build_ext -q -j2 echo "[Updating pip]" +# TODO: GH#44980 https://github.com/pypa/setuptools/issues/2941 python -m pip install --no-deps -U pip wheel "setuptools<60.0.0" echo "[Install pandas]"