Skip to content

Commit 94a0730

Browse files
authored
Merge branch 'main' into BUG#GH56566
2 parents 0cee4b8 + 9b49a0a commit 94a0730

File tree

6 files changed

+48
-6
lines changed

6 files changed

+48
-6
lines changed

.circleci/config.yml

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,29 @@ jobs:
1818
PATH=$HOME/miniconda3/envs/pandas-dev/bin:$HOME/miniconda3/condabin:$PATH
1919
LD_PRELOAD=$HOME/miniconda3/envs/pandas-dev/lib/libgomp.so.1:$LD_PRELOAD
2020
ci/run_tests.sh
21+
linux-musl:
22+
docker:
23+
- image: quay.io/pypa/musllinux_1_1_aarch64
24+
resource_class: arm.large
25+
steps:
26+
# Install pkgs first to have git in the image
27+
# (needed for checkout)
28+
- run: |
29+
apk update
30+
apk add git
31+
apk add musl-locales
32+
- checkout
33+
- run: |
34+
/opt/python/cp311-cp311/bin/python -m venv ~/virtualenvs/pandas-dev
35+
. ~/virtualenvs/pandas-dev/bin/activate
36+
python -m pip install --no-cache-dir -U pip wheel setuptools meson-python==0.13.1 meson[ninja]==1.2.1
37+
python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.3.2 pytest-xdist>=2.2.0 hypothesis>=6.46.1
38+
python -m pip install --no-cache-dir --no-build-isolation -e . --config-settings=setup-args="--werror"
39+
python -m pip list --no-cache-dir
40+
- run: |
41+
. ~/virtualenvs/pandas-dev/bin/activate
42+
export PANDAS_CI=1
43+
python -m pytest -m 'not slow and not network and not clipboard and not single_cpu' pandas --junitxml=test-data.xml
2144
build-aarch64:
2245
parameters:
2346
cibw-build:
@@ -89,6 +112,13 @@ workflows:
89112
equal: [ scheduled_pipeline, << pipeline.trigger_source >> ]
90113
jobs:
91114
- test-arm
115+
test-musl:
116+
# Don't run trigger this one when scheduled pipeline runs
117+
when:
118+
not:
119+
equal: [ scheduled_pipeline, << pipeline.trigger_source >> ]
120+
jobs:
121+
- linux-musl
92122
build-wheels:
93123
jobs:
94124
- build-aarch64:
@@ -97,4 +127,11 @@ workflows:
97127
only: /^v.*/
98128
matrix:
99129
parameters:
100-
cibw-build: ["cp39-manylinux_aarch64", "cp310-manylinux_aarch64", "cp311-manylinux_aarch64", "cp312-manylinux_aarch64"]
130+
cibw-build: ["cp39-manylinux_aarch64",
131+
"cp310-manylinux_aarch64",
132+
"cp311-manylinux_aarch64",
133+
"cp312-manylinux_aarch64",
134+
"cp39-musllinux_aarch64",
135+
"cp310-musllinux_aarch64",
136+
"cp311-musllinux_aarch64",
137+
"cp312-musllinux_aarch64",]

doc/source/conf.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,11 +230,13 @@
230230
# further. For a list of options available for each theme, see the
231231
# documentation.
232232

233-
switcher_version = version
234233
if ".dev" in version:
235234
switcher_version = "dev"
236235
elif "rc" in version:
237236
switcher_version = version.split("rc", maxsplit=1)[0] + " (rc)"
237+
else:
238+
# only keep major.minor version number to match versions.json
239+
switcher_version = ".".join(version.split(".")[:2])
238240

239241
html_theme_options = {
240242
"external_links": [],
@@ -246,11 +248,13 @@
246248
"plausible_analytics_url": "https://views.scientific-python.org/js/script.js",
247249
},
248250
"logo": {"image_dark": "https://pandas.pydata.org/static/img/pandas_white.svg"},
251+
"navbar_align": "left",
249252
"navbar_end": ["version-switcher", "theme-switcher", "navbar-icon-links"],
250253
"switcher": {
251254
"json_url": "https://pandas.pydata.org/versions.json",
252255
"version_match": switcher_version,
253256
},
257+
"show_version_warning_banner": True,
254258
"icon_links": [
255259
{
256260
"name": "Mastodon",

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ dependencies:
8686
- google-auth
8787
- natsort # DataFrame.sort_values doctest
8888
- numpydoc
89-
- pydata-sphinx-theme=0.13
89+
- pydata-sphinx-theme=0.14
9090
- pytest-cython # doctest
9191
- sphinx
9292
- sphinx-design

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ parentdir_prefix = "pandas-"
152152
setup = ['--vsenv'] # For Windows
153153

154154
[tool.cibuildwheel]
155-
skip = "cp36-* cp37-* cp38-* pp* *_i686 *_ppc64le *_s390x *-musllinux_aarch64"
155+
skip = "cp36-* cp37-* cp38-* pp* *_i686 *_ppc64le *_s390x"
156156
build-verbosity = "3"
157157
environment = {LDFLAGS="-Wl,--strip-all"}
158158
test-requires = "hypothesis>=6.46.1 pytest>=7.3.2 pytest-xdist>=2.2.0"

requirements-dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ gitdb
6161
google-auth
6262
natsort
6363
numpydoc
64-
pydata-sphinx-theme==0.13
64+
pydata-sphinx-theme==0.14
6565
pytest-cython
6666
sphinx
6767
sphinx-design

web/pandas/versions.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
{
88
"name": "2.1 (stable)",
99
"version": "2.1",
10-
"url": "https://pandas.pydata.org/docs/"
10+
"url": "https://pandas.pydata.org/docs/",
11+
"preferred": true
1112
},
1213
{
1314
"name": "2.0",

0 commit comments

Comments
 (0)