Skip to content

Commit 0aa503b

Browse files
mroeschkemroeschke
committed
CI: Bump builds to 3.11, update numpy nightly wheels location (pandas-dev#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? (cherry picked from commit 21a81e9)
1 parent c1247a7 commit 0aa503b

9 files changed

+145
-140
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-38-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-38-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-38-minimum_versions.yaml
3939
pattern: "not slow and not network and not single_cpu"
4040
- name: "Locale: it_IT"
41-
env_file: actions-38.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-38.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-38.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-311-downstream_compat.yaml

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# Non-dependencies that pandas utilizes or has compatibility with pandas objects
2+
name: pandas-dev
3+
channels:
4+
- conda-forge
5+
dependencies:
6+
- python=3.11
7+
8+
# build dependencies
9+
- versioneer[toml]
10+
- cython>=0.29.33
11+
- meson[ninja]=1.0.1
12+
- meson-python=0.13.1
13+
14+
# test dependencies
15+
- pytest>=7.0.0
16+
- pytest-cov
17+
- pytest-xdist>=2.2.0
18+
- pytest-asyncio>=0.17.0
19+
- boto3
20+
21+
# required dependencies
22+
- python-dateutil
23+
- numpy
24+
- pytz
25+
26+
# optional dependencies
27+
- beautifulsoup4>=4.11.1
28+
- blosc>=1.21.0
29+
- bottleneck>=1.3.4
30+
- brotlipy>=0.7.0
31+
- fastparquet>=0.8.1
32+
- fsspec>=2022.05.0
33+
- html5lib>=1.1
34+
- hypothesis>=6.46.1
35+
- gcsfs>=2022.05.0
36+
- jinja2>=3.1.2
37+
- lxml>=4.8.0
38+
- matplotlib>=3.6.1
39+
- numba>=0.55.2
40+
- numexpr>=2.8.0
41+
- odfpy>=1.4.1
42+
- qtpy>=2.2.0
43+
- openpyxl>=3.0.10
44+
- pandas-gbq>=0.17.5
45+
- psycopg2>=2.9.3
46+
- pyarrow>=7.0.0
47+
- pymysql>=1.0.2
48+
- pyreadstat>=1.1.5
49+
- pytables>=3.7.0
50+
- python-snappy>=0.6.1
51+
- pyxlsb>=1.0.9
52+
- s3fs>=2022.05.0
53+
- scipy>=1.8.1
54+
- sqlalchemy>=1.4.36
55+
- tabulate>=0.8.10
56+
- xarray>=2022.03.0
57+
- xlrd>=2.0.1
58+
- xlsxwriter>=3.0.3
59+
- zstandard>=0.17.0
60+
61+
# downstream packages
62+
- botocore
63+
- cftime
64+
- dask
65+
- ipython
66+
- geopandas-base
67+
- seaborn
68+
- scikit-learn
69+
- statsmodels
70+
- coverage
71+
- pandas-datareader
72+
- pyyaml
73+
- py
74+
- pip:
75+
- pyqt5>=5.15.6
76+
- tzdata>=2022.1

‎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]
@@ -21,7 +21,7 @@ dependencies:
2121

2222
- pip:
2323
- "cython"
24-
- "--extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple"
24+
- "--extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"
2525
- "--pre"
2626
- "numpy"
2727
- "scipy"

‎ci/deps/actions-38-downstream_compat.yaml

-73
This file was deleted.

‎ci/deps/circle-310-arm64.yaml

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: pandas-dev
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
- python=3.10
6+
7+
# build dependencies
8+
- versioneer[toml]
9+
- cython>=0.29.33
10+
- meson[ninja]=1.0.1
11+
- meson-python=0.13.1
12+
13+
# test dependencies
14+
- pytest>=7.0.0
15+
- pytest-cov
16+
- pytest-xdist>=2.2.0
17+
- pytest-asyncio>=0.17.0
18+
- boto3
19+
20+
# required dependencies
21+
- python-dateutil
22+
- numpy
23+
- pytz
24+
25+
# optional dependencies
26+
- beautifulsoup4>=4.11.1
27+
- blosc>=1.21.0
28+
- bottleneck>=1.3.4
29+
- brotlipy>=0.7.0
30+
- fastparquet>=0.8.1
31+
- fsspec>=2022.05.0
32+
- html5lib>=1.1
33+
- hypothesis>=6.46.1
34+
- gcsfs>=2022.05.0
35+
- jinja2>=3.1.2
36+
- lxml>=4.8.0
37+
- matplotlib>=3.6.1
38+
# test_numba_vs_cython segfaults with numba 0.57
39+
- numba>=0.55.2, <0.57.0
40+
- numexpr>=2.8.0
41+
- odfpy>=1.4.1
42+
- qtpy>=2.2.0
43+
- openpyxl>=3.0.10
44+
- pandas-gbq>=0.17.5
45+
- psycopg2>=2.9.3
46+
- pyarrow>=7.0.0
47+
- pymysql>=1.0.2
48+
# - pyreadstat>=1.1.5 not available on ARM
49+
- pytables>=3.7.0
50+
- python-snappy>=0.6.1
51+
- pyxlsb>=1.0.9
52+
- s3fs>=2022.05.0
53+
- scipy>=1.8.1
54+
- sqlalchemy>=1.4.36
55+
- tabulate>=0.8.10
56+
- xarray>=2022.03.0
57+
- xlrd>=2.0.1
58+
- xlsxwriter>=3.0.3
59+
- zstandard>=0.17.0

‎ci/deps/circle-38-arm64.yaml

-57
This file was deleted.

‎pandas/core/sorting.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ def lexsort_indexer(
368368

369369
def nargsort(
370370
items,
371-
kind: str = "quicksort",
371+
kind: SortKind = "stable",
372372
ascending: bool = True,
373373
na_position: str = "last",
374374
key: Callable | None = None,

‎pandas/core/window/rolling.py

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

0 commit comments

Comments
 (0)