10BC0 Merge branch 'main' into 50040-add-math-mode-formatter-escape=latex-p… · pandas-dev/pandas@2e283a7 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2e283a7

Browse files
natmokvalnatmokval
committed
Merge branch 'main' into 50040-add-math-mode-formatter-escape=latex-part2
2 parents c20e795 + f08871d commit 2e283a7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+551
-564
lines changed

‎.github/actions/build_pandas/action.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,7 @@ runs:
1616
python -m pip install -e . --no-build-isolation --no-use-pep517 --no-index
1717
shell: bash -el {0}
1818
env:
19-
# https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources
20-
N_JOBS: ${{ runner.os == 'macOS' && 3 || 2 }}
19+
# Cannot use parallel compilation on Windows, see https://github.com/pandas-dev/pandas/issues/30873
20+
# GH 47305: Parallel build causes flaky ImportError: /home/runner/work/pandas/pandas/pandas/_libs/tslibs/timestamps.cpython-38-x86_64-linux-gnu.so: undefined symbol: pandas_datetime_to_datetimestruct
21+
N_JOBS: 1
22+
#N_JOBS: ${{ runner.os == 'Windows' && 1 || 2 }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ runs:
3030
environment-name: ${{ inputs.environment-name }}
3131
extra-specs: ${{ inputs.extra-specs }}
3232
channels: conda-forge
33-
channel-priority: 'strict'
33+
channel-priority: ${{ runner.os == 'macOS' && 'flexible' || 'strict' }}
3434
condarc-file: ci/condarc.yml
3535
cache-env: true
3636
cache-downloads: true

‎.github/workflows/package-checks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-22.04
2121
strategy:
2222
matrix:
23-
extra: ["test", "performance", "timezone", "computation", "fss", "aws", "gcp", "excel", "parquet", "feather", "hdf5", "spss", "postgresql", "mysql", "sql-other", "html", "xml", "plot", "output_formatting", "clipboard", "compression", "all"]
23+
extra: ["test", "performance", "computation", "fss", "aws", "gcp", "excel", "parquet", "feather", "hdf5", "spss", "postgresql", "mysql", "sql-other", "html", "xml", "plot", "output_formatting", "clipboard", "compression", "all"]
2424
fail-fast: false
2525
name: Install Extras - ${{ matrix.extra }}
2626
concurrency:

‎ci/deps/actions-310-numpydev.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ dependencies:
1818
- python-dateutil
1919
- pytz
2020
- pip
21+
2122
- pip:
2223
- "cython"
2324
- "--extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple"
2425
- "--pre"
2526
- "numpy"
2627
- "scipy"
28+
- "tzdata>=2022.1"

‎ci/deps/actions-310.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,10 @@ dependencies:
4949
- scipy>=1.7.1
5050
- sqlalchemy>=1.4.16
5151
- tabulate>=0.8.9
52-
- tzdata>=2022a
5352
- xarray>=0.21.0
5453
- xlrd>=2.0.1
5554
- xlsxwriter>=1.4.3
5655
- zstandard>=0.15.2
56+
57+
- pip:
58+
- tzdata>=2022.1

‎ci/deps/actions-311.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,10 @@ dependencies:
4949
- scipy>=1.7.1
5050
- sqlalchemy>=1.4.16
5151
- tabulate>=0.8.9
52-
- tzdata>=2022a
5352
- xarray>=0.21.0
5453
- xlrd>=2.0.1
5554
- xlsxwriter>=1.4.3
5655
- zstandard>=0.15.2
56+
57+
- pip:
58+
- tzdata>=2022.1

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,6 @@ dependencies:
6868
- pandas-gbq>=0.15.0
6969
- pyyaml
7070
- py
71+
72+
- pip:
73+
- tzdata>=2022.1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ dependencies:
5252
- scipy=1.7.1
5353
- sqlalchemy=1.4.16
5454
- tabulate=0.8.9
55-
- tzdata=2022a
5655
- xarray=0.21.0
5756
- xlrd=2.0.1
5857
- xlsxwriter=1.4.3
5958
- zstandard=0.15.2
6059

6160
- pip:
6261
- pyqt5==5.15.1
62+
- tzdata==2022.1

‎ci/deps/actions-38.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,6 @@ dependencies:
5353
- xlrd>=2.0.1
5454
- xlsxwriter>=1.4.3
5555
- zstandard>=0.15.2
56+
57+
- pip:
58+
- tzdata>=2022.1

‎ci/deps/actions-39.yaml‎

-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,10 @@ dependencies:
4949
- scipy>=1.7.1
5050
- sqlalchemy>=1.4.16
5151
- tabulate>=0.8.9
52-
- tzdata>=2022a
5352
- xarray>=0.21.0
5453
- xlrd>=2.0.1
5554
- xlsxwriter>=1.4.3
5655
- zstandard>=0.15.2
56+
57+
- pip:
58+
- tzdata>=2022.1

0 commit comments

Comments
 (0)
0