From 2fe4e021a5373c4ccd6a8ef76f1ec6ecc8e571d4 Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Tue, 20 Dec 2022 08:43:50 +0000 Subject: [PATCH 1/8] add ci/deps/actions-311-dev.txt --- .github/workflows/python-dev.yml | 3 +-- ci/deps/actions-311-dev.txt | 8 ++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 ci/deps/actions-311-dev.txt diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml index 220c1e464742e..49adccadeba9e 100644 --- a/.github/workflows/python-dev.yml +++ b/.github/workflows/python-dev.yml @@ -75,8 +75,7 @@ jobs: python -m pip install --upgrade pip setuptools wheel python -m pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy python -m pip install git+https://github.com/nedbat/coveragepy.git - python -m pip install versioneer[toml] - python -m pip install python-dateutil pytz cython hypothesis==6.52.1 pytest>=6.2.5 pytest-xdist pytest-cov pytest-asyncio>=0.17 + python -m pip install -r ci/deps/actions-311-dev.txt pytest-cov pytest-xdist python -m pip list # GH 47305: Parallel build can cause flaky ImportError from pandas/_libs/tslibs diff --git a/ci/deps/actions-311-dev.txt b/ci/deps/actions-311-dev.txt new file mode 100644 index 0000000000000..caf49166cdf58 --- /dev/null +++ b/ci/deps/actions-311-dev.txt @@ -0,0 +1,8 @@ +cython +hypothesis==6.52.1 +numpy +pytest>=6.2.5 +pytest-asyncio>=0.17 +python-dateutil +pytz +versioneer[toml] From a0313a22c8adb2648299a257548ecdfe6f3e39db Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Tue, 20 Dec 2022 13:35:09 +0000 Subject: [PATCH 2/8] :truck: rename --- .github/workflows/python-dev.yml | 2 +- ci/deps/{actions-311-dev.txt => requirements-minimal.txt} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename ci/deps/{actions-311-dev.txt => requirements-minimal.txt} (100%) diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml index 49adccadeba9e..d2e96a53a1519 100644 --- a/.github/workflows/python-dev.yml +++ b/.github/workflows/python-dev.yml @@ -75,7 +75,7 @@ jobs: python -m pip install --upgrade pip setuptools wheel python -m pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy python -m pip install git+https://github.com/nedbat/coveragepy.git - python -m pip install -r ci/deps/actions-311-dev.txt pytest-cov pytest-xdist + python -m pip install -r ci/deps/requirements-minimal.txt pytest-cov pytest-xdist python -m pip list # GH 47305: Parallel build can cause flaky ImportError from pandas/_libs/tslibs diff --git a/ci/deps/actions-311-dev.txt b/ci/deps/requirements-minimal.txt similarity index 100% rename from ci/deps/actions-311-dev.txt rename to ci/deps/requirements-minimal.txt From fdef741b63b1c5c4433556ee20863a04561a1c1b Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Wed, 4 Jan 2023 16:47:53 +0000 Subject: [PATCH 3/8] move pytest-xdist to requirements-minimal.txt --- .github/workflows/python-dev.yml | 2 +- ci/deps/requirements-minimal.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml index d2e96a53a1519..804bf5a680a0b 100644 --- a/.github/workflows/python-dev.yml +++ b/.github/workflows/python-dev.yml @@ -75,7 +75,7 @@ jobs: python -m pip install --upgrade pip setuptools wheel python -m pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy python -m pip install git+https://github.com/nedbat/coveragepy.git - python -m pip install -r ci/deps/requirements-minimal.txt pytest-cov pytest-xdist + python -m pip install -r ci/deps/requirements-minimal.txt pytest-cov python -m pip list # GH 47305: Parallel build can cause flaky ImportError from pandas/_libs/tslibs diff --git a/ci/deps/requirements-minimal.txt b/ci/deps/requirements-minimal.txt index caf49166cdf58..02977f2da2eea 100644 --- a/ci/deps/requirements-minimal.txt +++ b/ci/deps/requirements-minimal.txt @@ -3,6 +3,7 @@ hypothesis==6.52.1 numpy pytest>=6.2.5 pytest-asyncio>=0.17 +pytest-xdist python-dateutil pytz versioneer[toml] From 81d7386188fd07e900afd6abf2d3a98ee7e94e8a Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Tue, 20 Dec 2022 08:43:50 +0000 Subject: [PATCH 4/8] add ci/deps/actions-311-dev.txt --- .github/workflows/python-dev.yml | 3 +-- ci/deps/actions-311-dev.txt | 8 ++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 ci/deps/actions-311-dev.txt diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml index 220c1e464742e..49adccadeba9e 100644 --- a/.github/workflows/python-dev.yml +++ b/.github/workflows/python-dev.yml @@ -75,8 +75,7 @@ jobs: python -m pip install --upgrade pip setuptools wheel python -m pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy python -m pip install git+https://github.com/nedbat/coveragepy.git - python -m pip install versioneer[toml] - python -m pip install python-dateutil pytz cython hypothesis==6.52.1 pytest>=6.2.5 pytest-xdist pytest-cov pytest-asyncio>=0.17 + python -m pip install -r ci/deps/actions-311-dev.txt pytest-cov pytest-xdist python -m pip list # GH 47305: Parallel build can cause flaky ImportError from pandas/_libs/tslibs diff --git a/ci/deps/actions-311-dev.txt b/ci/deps/actions-311-dev.txt new file mode 100644 index 0000000000000..caf49166cdf58 --- /dev/null +++ b/ci/deps/actions-311-dev.txt @@ -0,0 +1,8 @@ +cython +hypothesis==6.52.1 +numpy +pytest>=6.2.5 +pytest-asyncio>=0.17 +python-dateutil +pytz +versioneer[toml] From 102dfa98d18ac85c5b8cf3964ac4f5f30e6acb1a Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Tue, 20 Dec 2022 13:35:09 +0000 Subject: [PATCH 5/8] :truck: rename --- .github/workflows/python-dev.yml | 2 +- ci/deps/{actions-311-dev.txt => requirements-minimal.txt} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename ci/deps/{actions-311-dev.txt => requirements-minimal.txt} (100%) diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml index 49adccadeba9e..d2e96a53a1519 100644 --- a/.github/workflows/python-dev.yml +++ b/.github/workflows/python-dev.yml @@ -75,7 +75,7 @@ jobs: python -m pip install --upgrade pip setuptools wheel python -m pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy python -m pip install git+https://github.com/nedbat/coveragepy.git - python -m pip install -r ci/deps/actions-311-dev.txt pytest-cov pytest-xdist + python -m pip install -r ci/deps/requirements-minimal.txt pytest-cov pytest-xdist python -m pip list # GH 47305: Parallel build can cause flaky ImportError from pandas/_libs/tslibs diff --git a/ci/deps/actions-311-dev.txt b/ci/deps/requirements-minimal.txt similarity index 100% rename from ci/deps/actions-311-dev.txt rename to ci/deps/requirements-minimal.txt From 1d469286398de56b02ef4b6543957a001c855e21 Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Wed, 4 Jan 2023 16:47:53 +0000 Subject: [PATCH 6/8] move pytest-xdist to requirements-minimal.txt --- .github/workflows/python-dev.yml | 2 +- ci/deps/requirements-minimal.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml index d2e96a53a1519..804bf5a680a0b 100644 --- a/.github/workflows/python-dev.yml +++ b/.github/workflows/python-dev.yml @@ -75,7 +75,7 @@ jobs: python -m pip install --upgrade pip setuptools wheel python -m pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy python -m pip install git+https://github.com/nedbat/coveragepy.git - python -m pip install -r ci/deps/requirements-minimal.txt pytest-cov pytest-xdist + python -m pip install -r ci/deps/requirements-minimal.txt pytest-cov python -m pip list # GH 47305: Parallel build can cause flaky ImportError from pandas/_libs/tslibs diff --git a/ci/deps/requirements-minimal.txt b/ci/deps/requirements-minimal.txt index caf49166cdf58..02977f2da2eea 100644 --- a/ci/deps/requirements-minimal.txt +++ b/ci/deps/requirements-minimal.txt @@ -3,6 +3,7 @@ hypothesis==6.52.1 numpy pytest>=6.2.5 pytest-asyncio>=0.17 +pytest-xdist python-dateutil pytz versioneer[toml] From b6f277cbaaef0b68a30a2140ee8017828220964d Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Wed, 8 Feb 2023 16:08:32 +0000 Subject: [PATCH 7/8] uncomment branches --- .github/workflows/python-dev.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml index 7407e0c14a5e5..393acafb3882a 100644 --- a/.github/workflows/python-dev.yml +++ b/.github/workflows/python-dev.yml @@ -23,14 +23,12 @@ name: Python Dev on: push: branches: -# - main -# - 1.5.x - - None + - main + - 1.5.x pull_request: branches: -# - main -# - 1.5.x - - None + - main + - 1.5.x paths-ignore: - "doc/**" From cb3cc7054ccb9dbe364d71007d3699d342240f17 Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Wed, 8 Feb 2023 16:15:02 +0000 Subject: [PATCH 8/8] Revert "uncomment branches" This reverts commit b6f277cbaaef0b68a30a2140ee8017828220964d. --- .github/workflows/python-dev.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml index 393acafb3882a..7407e0c14a5e5 100644 --- a/.github/workflows/python-dev.yml +++ b/.github/workflows/python-dev.yml @@ -23,12 +23,14 @@ name: Python Dev on: push: branches: - - main - - 1.5.x +# - main +# - 1.5.x + - None pull_request: branches: - - main - - 1.5.x +# - main +# - 1.5.x + - None paths-ignore: - "doc/**"