From 75f463d4bf39728c4b1212ca314d5cae2feb75e3 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 7 Dec 2021 16:30:19 -0800 Subject: [PATCH 1/9] Create actions-pypy-38.yaml --- ci/deps/actions-pypy-38.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 ci/deps/actions-pypy-38.yaml diff --git a/ci/deps/actions-pypy-38.yaml b/ci/deps/actions-pypy-38.yaml new file mode 100644 index 0000000000000..75588b7facc00 --- /dev/null +++ b/ci/deps/actions-pypy-38.yaml @@ -0,0 +1,8 @@ +name: pandas-dev +channels: + - conda-forge +dependencies: + # TODO: Add the rest of the dependencies in here + # once the other plentiful failures/segfaults + # with base pandas has been dealt with + - python=3.8 From b1bdce03d1ab642121669239abe8fa38ab9de275 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 7 Dec 2021 16:34:59 -0800 Subject: [PATCH 2/9] Update posix.yml --- .github/workflows/posix.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 19b96c866923f..f5699cf5df150 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -31,6 +31,7 @@ jobs: [actions-38-slow.yaml, "slow", "", "", "", "", ""], [actions-38-locale.yaml, "not slow and not network", "language-pack-zh-hans xsel", "zh_CN.utf8", "zh_CN.utf8", "", ""], [actions-39-slow.yaml, "slow", "", "", "", "", ""], + [actions-pypy-38.yaml, "not slow and not clipboard", "", "", "", "", ""] [actions-39-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"], [actions-39.yaml, "not slow and not clipboard", "", "", "", "", ""] ] @@ -89,6 +90,8 @@ jobs: - name: Test run: ci/run_tests.sh if: always() + # TODO: Don't continue on error for PyPy + continue-on-failure: ${{ contains(matrix.settings[0], 'pypy') }} - name: Build Version run: pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd From 11917fa17b905a435238034048399177795ee83a Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 7 Dec 2021 16:39:08 -0800 Subject: [PATCH 3/9] typo --- .github/workflows/posix.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index f5699cf5df150..bfeb25ab86bdf 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -22,6 +22,8 @@ jobs: defaults: run: shell: bash -l {0} + # TODO: Don't continue on error for PyPy + continue-on-failure: ${{ contains(matrix.settings[0], 'pypy') }} strategy: matrix: settings: [ @@ -90,8 +92,6 @@ jobs: - name: Test run: ci/run_tests.sh if: always() - # TODO: Don't continue on error for PyPy - continue-on-failure: ${{ contains(matrix.settings[0], 'pypy') }} - name: Build Version run: pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd From 8bd2f0e619a313e2c6e259fe981be76f4d7ef309 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 7 Dec 2021 16:51:46 -0800 Subject: [PATCH 4/9] typo --- .github/workflows/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index bfeb25ab86bdf..38ef47d6bc383 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -33,7 +33,7 @@ jobs: [actions-38-slow.yaml, "slow", "", "", "", "", ""], [actions-38-locale.yaml, "not slow and not network", "language-pack-zh-hans xsel", "zh_CN.utf8", "zh_CN.utf8", "", ""], [actions-39-slow.yaml, "slow", "", "", "", "", ""], - [actions-pypy-38.yaml, "not slow and not clipboard", "", "", "", "", ""] + [actions-pypy-38.yaml, "not slow and not clipboard", "", "", "", "", ""], [actions-39-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"], [actions-39.yaml, "not slow and not clipboard", "", "", "", "", ""] ] From 01937f0e75c6fa25be2611e98cb2ab39cb4240b5 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 7 Dec 2021 16:54:53 -0800 Subject: [PATCH 5/9] another one --- .github/workflows/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 38ef47d6bc383..8affb11b5c826 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -23,7 +23,7 @@ jobs: run: shell: bash -l {0} # TODO: Don't continue on error for PyPy - continue-on-failure: ${{ contains(matrix.settings[0], 'pypy') }} + continue-on-error: ${{ contains(matrix.settings[0], 'pypy') }} strategy: matrix: settings: [ From 79d7920275cc0c8a19ec3e5ed9b20fdd261603ab Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 7 Dec 2021 17:19:54 -0800 Subject: [PATCH 6/9] add missing deps --- ci/deps/actions-pypy-38.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ci/deps/actions-pypy-38.yaml b/ci/deps/actions-pypy-38.yaml index 75588b7facc00..c52f003a5c7fd 100644 --- a/ci/deps/actions-pypy-38.yaml +++ b/ci/deps/actions-pypy-38.yaml @@ -6,3 +6,15 @@ dependencies: # once the other plentiful failures/segfaults # with base pandas has been dealt with - python=3.8 + + # tools + - cython>=0.29.24 + - pytest>=6.0 + - pytest-cov + - pytest-xdist>=1.31 + - hypothesis>=5.5.3 + + # required + - numpy<1.20 # GH#39541 compat for pyarrow<3 + - python-dateutil + - pytz From 922a3422001de30692bb6fca944e104a6a3e8f98 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 7 Dec 2021 18:26:44 -0800 Subject: [PATCH 7/9] Update posix.yml --- .github/workflows/posix.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 8affb11b5c826..a49d032d5e48f 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -22,8 +22,6 @@ jobs: defaults: run: shell: bash -l {0} - # TODO: Don't continue on error for PyPy - continue-on-error: ${{ contains(matrix.settings[0], 'pypy') }} strategy: matrix: settings: [ @@ -91,6 +89,8 @@ jobs: - name: Test run: ci/run_tests.sh + # TODO: Don't continue on error for PyPy + continue-on-error: ${{ contains(matrix.settings[0], 'pypy') }} if: always() - name: Build Version From 715cbd9be0b4ce40b7d3e010712930998aacf261 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 7 Dec 2021 20:04:26 -0800 Subject: [PATCH 8/9] fix mistake from copy pasting --- ci/deps/actions-pypy-38.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deps/actions-pypy-38.yaml b/ci/deps/actions-pypy-38.yaml index c52f003a5c7fd..b44cfe5ad5a0d 100644 --- a/ci/deps/actions-pypy-38.yaml +++ b/ci/deps/actions-pypy-38.yaml @@ -15,6 +15,6 @@ dependencies: - hypothesis>=5.5.3 # required - - numpy<1.20 # GH#39541 compat for pyarrow<3 + - numpy - python-dateutil - pytz From c422ffb6094688694be1c5707c492417b92ed1f8 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 14 Dec 2021 07:07:11 -0800 Subject: [PATCH 9/9] remove continue-on-error --- .github/workflows/posix.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index a49d032d5e48f..53c38b5d47b24 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -89,8 +89,6 @@ jobs: - name: Test run: ci/run_tests.sh - # TODO: Don't continue on error for PyPy - continue-on-error: ${{ contains(matrix.settings[0], 'pypy') }} if: always() - name: Build Version