Skip to content

Commit 0a5c799

Browse files
jonashaagjonashaag
committed
Fixes
1 parent 896b7b6 commit 0a5c799

File tree

5 files changed

+64
-65
lines changed

5 files changed

+64
-65
lines changed

‎.github/actions/build-pandas/action.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# TODO: merge setup-ccache, setup-conda, build-pandas into a single action?
12
name: Build pandas
23
description: Rebuilds the C extensions and installs pandas
34
runs:
@@ -9,13 +10,13 @@ runs:
910
- name: Build Pandas
1011
if : ${{ runner.os != 'Windows' }}
1112
run: |
12-
python -m pip install . --no-build-isolation -v
13+
python -m pip install -ve . --no-build-isolation
1314
shell: bash -el {0}
1415

1516
- name: Build Pandas (Windows)
1617
if: ${{ runner.os == 'Windows' }}
1718
run: |
1819
call micromamba activate test
1920
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
20-
python -m pip install . --no-build-isolation -v
21+
python -m pip install -ve . --no-build-isolation
2122
shell: cmd /C call {0}

‎.github/actions/setup-conda/action.yml

+1-8
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@ inputs:
33
environment-file:
44
description: Conda environment file to use.
55
default: environment.yml
6-
environment-name:
7-
description: Name to use for the Conda environment
8-
default: test
9-
extra-specs:
10-
description: Extra packages to install
11-
required: false
126
pyarrow-version:
137
description: If set, overrides the PyArrow version in the Conda environment to the given string.
148
required: false
@@ -29,8 +23,7 @@ runs:
2923
uses: mamba-org/provision-with-micromamba@v12
3024
with:
3125
environment-file: ${{ inputs.environment-file }}
32-
environment-name: ${{ inputs.environment-name }}
33-
extra-specs: ${{ inputs.extra-specs }}
26+
environment-name: test
3427
channels: conda-forge
3528
channel-priority: ${{ runner.os == 'macOS' && 'flexible' || 'strict' }}
3629
condarc-file: ci/condarc.yml

‎.github/workflows/sdist.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,15 @@ jobs:
6060
name: ${{matrix.python-version}}-sdist.gz
6161
path: dist/*.gz
6262

63-
- name: Set up Conda
64-
uses: ./.github/actions/setup-conda
63+
- name: Set up empty Conda environment
64+
uses: mamba-org/provision-with-micromamba@v12
6565
with:
6666
environment-file: false
67-
environment-name: pandas-sdist
67+
environment-name: sdist
6868
extra-specs: |
6969
python =${{ matrix.python-version }}
70+
channels: conda-forge
71+
condarc-file: ci/condarc.yml
7072

7173
- name: Install pandas from sdist
7274
run: |

‎.github/workflows/ubuntu.yml

+53-51
Original file line numberDiff line numberDiff line change
@@ -27,58 +27,60 @@ jobs:
2727
timeout-minutes: 180
2828
strategy:
2929
matrix:
30-
env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml]
30+
#env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml]
31+
env_file: [actions-38.yaml]
3132
pattern: ["not single_cpu", "single_cpu"]
32-
pyarrow_version: ["7", "8", "9", "10"]
33-
include:
34-
- name: "Downstream Compat"
35-
env_file: actions-38-downstream_compat.yaml
36-
pattern: "not slow and not network and not single_cpu"
37-
pytest_target: "pandas/tests/test_downstream.py"
38-
- name: "Minimum Versions"
39-
env_file: actions-38-minimum_versions.yaml
40-
pattern: "not slow and not network and not single_cpu"
41-
error_on_warnings: "0"
42-
- name: "Locale: it_IT"
43-
env_file: actions-38.yaml
44-
pattern: "not slow and not network and not single_cpu"
45-
extra_apt: "language-pack-it"
46-
# Use the utf8 version as the default, it has no bad side-effect.
47-
lang: "it_IT.utf8"
48-
lc_all: "it_IT.utf8"
49-
# Also install it_IT (its encoding is ISO8859-1) but do not activate it.
50-
# It will be temporarily activated during tests with locale.setlocale
51-
extra_loc: "it_IT"
52-
- name: "Locale: zh_CN"
53-
env_file: actions-38.yaml
54-
pattern: "not slow and not network and not single_cpu"
55-
extra_apt: "language-pack-zh-hans"
56-
# Use the utf8 version as the default, it has no bad side-effect.
57-
lang: "zh_CN.utf8"
58-
lc_all: "zh_CN.utf8"
59-
# Also install zh_CN (its encoding is gb2312) but do not activate it.
60-
# It will be temporarily activated during tests with locale.setlocale
61-
extra_loc: "zh_CN"
62-
- name: "Copy-on-Write"
63-
env_file: actions-310.yaml
64-
pattern: "not slow and not network and not single_cpu"
65-
pandas_copy_on_write: "1"
66-
error_on_warnings: "0"
67-
- name: "Data Manager"
68-
env_file: actions-38.yaml
69-
pattern: "not slow and not network and not single_cpu"
70-
pandas_data_manager: "array"
71-
error_on_warnings: "0"
72-
- name: "Pypy"
73-
env_file: actions-pypy-38.yaml
74-
pattern: "not slow and not network and not single_cpu"
75-
test_args: "--max-worker-restart 0"
76-
error_on_warnings: "0"
77-
- name: "Numpy Dev"
78-
env_file: actions-310-numpydev.yaml
79-
pattern: "not slow and not network and not single_cpu"
80-
test_args: "-W error::DeprecationWarning:numpy -W error::FutureWarning:numpy"
81-
error_on_warnings: "0"
33+
#pyarrow_version: ["7", "8", "9", "10"]
34+
pyarrow_version: ["10"]
35+
#include:
36+
# - name: "Downstream Compat"
37+
# env_file: actions-38-downstream_compat.yaml
38+
# pattern: "not slow and not network and not single_cpu"
39+
# pytest_target: "pandas/tests/test_downstream.py"
40+
# - name: "Minimum Versions"
41+
# env_file: actions-38-minimum_versions.yaml
42+
# pattern: "not slow and not network and not single_cpu"
43+
# error_on_warnings: "0"
44+
# - name: "Locale: it_IT"
45+
# env_file: actions-38.yaml
46+
# pattern: "not slow and not network and not single_cpu"
47+
# extra_apt: "language-pack-it"
48+
# # Use the utf8 version as the default, it has no bad side-effect.
49+
# lang: "it_IT.utf8"
50+
# lc_all: "it_IT.utf8"
51+
# # Also install it_IT (its encoding is ISO8859-1) but do not activate it.
52+
# # It will be temporarily activated during tests with locale.setlocale
53+
# extra_loc: "it_IT"
54+
# - name: "Locale: zh_CN"
55+
# env_file: actions-38.yaml
56+
# pattern: "not slow and not network and not single_cpu"
57+
# extra_apt: "language-pack-zh-hans"
58+
# # Use the utf8 version as the default, it has no bad side-effect.
59+
# lang: "zh_CN.utf8"
60+
# lc_all: "zh_CN.utf8"
61+
# # Also install zh_CN (its encoding is gb2312) but do not activate it.
62+
# # It will be temporarily activated during tests with locale.setlocale
63+
# extra_loc: "zh_CN"
64+
# - name: "Copy-on-Write"
65+
# env_file: actions-310.yaml
66+
# pattern: "not slow and not network and not single_cpu"
67+
# pandas_copy_on_write: "1"
68+
# error_on_warnings: "0"
69+
# - name: "Data Manager"
70+
# env_file: actions-38.yaml
71+
# pattern: "not slow and not network and not single_cpu"
72+
# pandas_data_manager: "array"
73+
# error_on_warnings: "0"
74+
# - name: "Pypy"
75+
# env_file: actions-pypy-38.yaml
76+
# pattern: "not slow and not network and not single_cpu"
77+
# test_args: "--max-worker-restart 0"
78+
# error_on_warnings: "0"
79+
# - name: "Numpy Dev"
80+
# env_file: actions-310-numpydev.yaml
81+
# pattern: "not slow and not network and not single_cpu"
82+
# test_args: "-W error::DeprecationWarning:numpy -W error::FutureWarning:numpy"
83+
# error_on_warnings: "0"
8284
exclude:
8385
- env_file: actions-38.yaml
8486
pyarrow_version: "7"

‎ci/run_tests.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ if [[ "$ERROR_ON_WARNINGS" == "1" ]]; then
3838
fi
3939

4040
echo $PYTEST_CMD
41-
sh -c "$PYTEST_CMD"
41+
sh -c "$PYTEST_CMD -k test_oo"
42+
exit 0
4243

4344
if [[ "$PANDAS_DATA_MANAGER" != "array" && "$PYTEST_TARGET" == "pandas" ]]; then
4445
# The ArrayManager tests should have already been run by PYTEST_CMD if PANDAS_DATA_MANAGER was already set to array

0 commit comments

Comments
 (0)