Skip to content

Commit 21a81e9

Browse files
authored
CI: Bump builds to 3.11, update numpy nightly wheels location (#53508)
* CI: Bump builds to 3.11, update numpy nightly wheels location * Move arm to 3.10 instead * Change scipy window api * plural * Use stable sort?
1 parent 9ff8827 commit 21a81e9

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
image: ubuntu-2004:2022.04.1
77
resource_class: arm.large
88
environment:
9-
ENV_FILE: ci/deps/circle-39-arm64.yaml
9+
ENV_FILE: ci/deps/circle-310-arm64.yaml
1010
PYTEST_WORKERS: auto
1111
PATTERN: "not single_cpu and not slow and not network and not clipboard and not arm_slow and not db"
1212
PYTEST_TARGET: "pandas"

.github/workflows/unit-tests.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ jobs:
3131
pattern: [""]
3232
include:
3333
- name: "Downstream Compat"
34-
env_file: actions-39-downstream_compat.yaml
34+
env_file: actions-311-downstream_compat.yaml
3535
pattern: "not slow and not network and not single_cpu"
3636
pytest_target: "pandas/tests/test_downstream.py"
3737
- name: "Minimum Versions"
3838
env_file: actions-39-minimum_versions.yaml
3939
pattern: "not slow and not network and not single_cpu"
4040
- name: "Locale: it_IT"
41-
env_file: actions-310.yaml
41+
env_file: actions-311.yaml
4242
pattern: "not slow and not network and not single_cpu"
4343
extra_apt: "language-pack-it"
4444
# Use the utf8 version as the default, it has no bad side-effect.
@@ -48,7 +48,7 @@ jobs:
4848
# It will be temporarily activated during tests with locale.setlocale
4949
extra_loc: "it_IT"
5050
- name: "Locale: zh_CN"
51-
env_file: actions-310.yaml
51+
env_file: actions-311.yaml
5252
pattern: "not slow and not network and not single_cpu"
5353
extra_apt: "language-pack-zh-hans"
5454
# Use the utf8 version as the default, it has no bad side-effect.
@@ -58,15 +58,15 @@ jobs:
5858
# It will be temporarily activated during tests with locale.setlocale
5959
extra_loc: "zh_CN"
6060
- name: "Copy-on-Write"
61-
env_file: actions-310.yaml
61+
env_file: actions-311.yaml
6262
pattern: "not slow and not network and not single_cpu"
6363
pandas_copy_on_write: "1"
6464
- name: "Pypy"
6565
env_file: actions-pypy-39.yaml
6666
pattern: "not slow and not network and not single_cpu"
6767
test_args: "--max-worker-restart 0"
6868
- name: "Numpy Dev"
69-
env_file: actions-310-numpydev.yaml
69+
env_file: actions-311-numpydev.yaml
7070
pattern: "not slow and not network and not single_cpu"
7171
test_args: "-W error::DeprecationWarning -W error::FutureWarning"
7272
# TODO(cython3): Re-enable once next-beta(after beta 1) comes out

ci/deps/actions-39-downstream_compat.yaml renamed to ci/deps/actions-311-downstream_compat.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: pandas-dev
33
channels:
44
- conda-forge
55
dependencies:
6-
- python=3.9
6+
- python=3.11
77

88
# build dependencies
99
- versioneer[toml]

ci/deps/actions-310-numpydev.yaml renamed to ci/deps/actions-311-numpydev.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: pandas-dev
22
channels:
33
- conda-forge
44
dependencies:
5-
- python=3.10
5+
- python=3.11
66

77
# build dependencies
88
- versioneer[toml]
@@ -26,7 +26,7 @@ dependencies:
2626

2727
- pip:
2828
- "cython"
29-
- "--extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple"
29+
- "--extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"
3030
- "--pre"
3131
- "numpy"
3232
- "scipy"

ci/deps/circle-39-arm64.yaml renamed to ci/deps/circle-310-arm64.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: pandas-dev
22
channels:
33
- conda-forge
44
dependencies:
5-
- python=3.9
5+
- python=3.10
66

77
# build dependencies
88
- versioneer[toml]

pandas/core/sorting.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ def lexsort_indexer(
424424

425425
def nargsort(
426426
items: ArrayLike | Index | Series,
427-
kind: SortKind = "quicksort",
427+
kind: SortKind = "stable",
428428
ascending: bool = True,
429429
na_position: str = "last",
430430
key: Callable | None = None,

pandas/core/window/rolling.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1140,7 +1140,7 @@ def _validate(self):
11401140
if not isinstance(self.win_type, str):
11411141
raise ValueError(f"Invalid win_type {self.win_type}")
11421142
signal = import_optional_dependency(
1143-
"scipy.signal", extra="Scipy is required to generate window weight."
1143+
"scipy.signal.windows", extra="Scipy is required to generate window weight."
11441144
)
11451145
self._scipy_weight_generator = getattr(signal, self.win_type, None)
11461146
if self._scipy_weight_generator is None:

0 commit comments

Comments
 (0)