Skip to content

Commit d2da38c

Browse files
committed
Test vs. pandas 3.0.0rc0
1 parent 3f47bad commit d2da38c

File tree

7 files changed

+2672
-2832
lines changed

7 files changed

+2672
-2832
lines changed

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
- uses: prefix-dev/setup-pixi@v0
2121
with:
22-
pixi-version: v0.59.0
22+
pixi-version: v0.60.0
2323
cache: true
2424
environments: docs
2525

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v6
1414
- uses: prefix-dev/setup-pixi@v0
1515
with:
16-
pixi-version: v0.59.0
16+
pixi-version: v0.60.0
1717
cache: true
1818
environments: lint
1919
- name: Run linters

.github/workflows/pytest.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,27 +48,27 @@ jobs:
4848
uses: actions/checkout@v6
4949

5050
- name: Disregard pixi.lock (upstream only)
51-
if: matrix.environment == 'upstream' || matrix.environment == 'nogil'
51+
if: matrix.environment == 'upstream'
5252
run: rm pixi.lock
5353

5454
- uses: prefix-dev/setup-pixi@v0
5555
with:
56-
pixi-version: v0.59.0
56+
pixi-version: v0.60.0
5757
environments: ${{ matrix.environment }}
58-
cache: ${{ matrix.environment != 'upstream' && matrix.environment != 'nogil' }}
59-
locked: ${{ matrix.environment != 'upstream' && matrix.environment != 'nogil' }}
58+
cache: ${{ matrix.environment != 'upstream' }}
59+
locked: ${{ matrix.environment != 'upstream' }}
6060

6161
- name: Smoke test
6262
run: pixi run -e ${{ matrix.environment }} smoke-test
6363

6464
- name: pytest with coverage
65-
if: matrix.environment != 'nogil' && matrix.environment != 'smoke'
65+
if: matrix.environment != 'smoke'
6666
run: pixi run -e ${{ matrix.environment }} coverage
6767

6868
- name: Free-threading stress test
6969
if: matrix.environment == 'nogil'
7070
run: pixi run -e nogil tests --parallel-threads=4
7171

7272
- name: codecov.io
73-
if: matrix.environment != 'nogil' && matrix.environment != 'smoke'
73+
if: matrix.environment != 'smoke'
7474
uses: codecov/codecov-action@v5

.github/workflows/wheels.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ jobs:
2222

2323
- uses: prefix-dev/setup-pixi@v0
2424
with:
25-
pixi-version: v0.59.0
25+
pixi-version: v0.60.0
2626
cache: true
2727
environments: dist
2828

2929
- name: Build sdist and wheels
3030
run: pixi run dist
3131

3232
- name: Set up Python
33-
uses: actions/setup-python@v5
33+
uses: actions/setup-python@v6
3434
with:
3535
python-version: "3.14"
3636

doc/requirements.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
name: docs
33
channels:
44
- https://prefix.dev/conda-forge
5+
- conda-forge/label/pandas_rc
56
- nodefaults
67
dependencies:
78
- python 3.14.*

pixi.lock

Lines changed: 2658 additions & 2812 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ module = ["*.tests.*"]
133133
disallow_untyped_defs = false
134134

135135
[tool.pixi.workspace]
136-
channels = ["https://prefix.dev/conda-forge"]
136+
channels = ["https://prefix.dev/conda-forge", "conda-forge/label/pandas_rc"]
137137
platforms = ["linux-64", "linux-aarch64", "osx-64", "osx-arm64", "win-64"]
138138

139139
[tool.pixi.dependencies]
@@ -206,16 +206,9 @@ python = "=3.14"
206206

207207
[tool.pixi.feature.nogil.dependencies]
208208
python-freethreading = "=3.14"
209+
pandas = { version = ">=3.0.0rc0", channel = "conda-forge/label/pandas_rc" }
209210
pytest-run-parallel = "*"
210211

211-
[tool.pixi.feature.nogil.pypi-dependencies]
212-
# FIXME Need pandas 3
213-
# https://github.com/pandas-dev/pandas/issues/61844
214-
# TODO after reverting to published versions, update .github/workflows/pytest.yml
215-
# to stop disregarding pixi.lock
216-
pandas = { index = "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple" }
217-
xarray = "*"
218-
219212
[tool.pixi.feature.mindeps.dependencies]
220213
python = "=3.9"
221214
numpy = "=1.23"
@@ -257,6 +250,6 @@ py39 = { features = ["py39", "optional", "smoke", "tests"] }
257250
py311 = { features = ["py311", "optional", "smoke", "tests"] }
258251
py314 = { features = ["py314", "optional", "smoke", "tests"], solve-group = "py314" }
259252
no-optional = { features = ["py314", "smoke", "tests"], solve-group = "py314" }
260-
nogil = { features = ["nogil", "smoke", "tests"], no-default-feature = true }
253+
nogil = { features = ["nogil", "smoke", "tests"] }
261254
upstream = { features = ["upstream", "smoke", "tests"], no-default-feature = true }
262255
smoke = { features = ["smoke"] }

0 commit comments

Comments
 (0)