Skip to content

Commit f36e014

Browse files
committed
Merge branch 'add-meson-build-files' of github.com:lithomas1/pandas into add-meson-build-files
2 parents e1f750e + f6422e5 commit f36e014

File tree

149 files changed

+2445
-1207
lines changed

Some content is hidden

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

149 files changed

+2445
-1207
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ runs:
1818
- name: Set Arrow version in ${{ inputs.environment-file }} to ${{ inputs.pyarrow-version }}
1919
run: |
2020
grep -q ' - pyarrow' ${{ inputs.environment-file }}
21-
sed -i"" -e "s/ - pyarrow<10/ - pyarrow=${{ inputs.pyarrow-version }}/" ${{ inputs.environment-file }}
21+
sed -i"" -e "s/ - pyarrow/ - pyarrow=${{ inputs.pyarrow-version }}/" ${{ inputs.environment-file }}
2222
cat ${{ inputs.environment-file }}
2323
shell: bash
2424
if: ${{ inputs.pyarrow-version }}

.github/workflows/docbuild-and-upload.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ on:
1515
env:
1616
ENV_FILE: environment.yml
1717
PANDAS_CI: 1
18+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1819

1920
permissions:
2021
contents: read
@@ -45,6 +46,12 @@ jobs:
4546
- name: Build Pandas
4647
uses: ./.github/actions/build_pandas
4748

49+
- name: Set up maintainers cache
50+
uses: actions/cache@v3
51+
with:
52+
path: maintainers.json
53+
key: maintainers
54+
4855
- name: Build website
4956
run: python web/pandas_web.py web/pandas --target-path=web/build
5057

.github/workflows/macos-windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
PANDAS_CI: 1
1717
PYTEST_TARGET: pandas
1818
PATTERN: "not slow and not db and not network and not single_cpu"
19-
TEST_ARGS: "-W error:::pandas"
19+
ERROR_ON_WARNINGS: "1"
2020

2121

2222
permissions:
@@ -53,7 +53,7 @@ jobs:
5353
uses: ./.github/actions/setup-conda
5454
with:
5555
environment-file: ci/deps/${{ matrix.env_file }}
56-
pyarrow-version: ${{ matrix.os == 'macos-latest' && '6' || '' }}
56+
pyarrow-version: ${{ matrix.os == 'macos-latest' && '9' || '' }}
5757

5858
- name: Build Pandas
5959
uses: ./.github/actions/build_pandas

.github/workflows/ubuntu.yml

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
matrix:
3030
env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml]
3131
pattern: ["not single_cpu", "single_cpu"]
32-
pyarrow_version: ["7", "8", "9"]
32+
pyarrow_version: ["7", "8", "9", "10"]
3333
include:
3434
- name: "Downstream Compat"
3535
env_file: actions-38-downstream_compat.yaml
@@ -38,7 +38,7 @@ jobs:
3838
- name: "Minimum Versions"
3939
env_file: actions-38-minimum_versions.yaml
4040
pattern: "not slow and not network and not single_cpu"
41-
test_args: ""
41+
error_on_warnings: "0"
4242
- name: "Locale: it_IT"
4343
env_file: actions-38.yaml
4444
pattern: "not slow and not network and not single_cpu"
@@ -63,40 +63,47 @@ jobs:
6363
env_file: actions-310.yaml
6464
pattern: "not slow and not network and not single_cpu"
6565
pandas_copy_on_write: "1"
66-
test_args: ""
66+
error_on_warnings: "0"
6767
- name: "Data Manager"
6868
env_file: actions-38.yaml
6969
pattern: "not slow and not network and not single_cpu"
7070
pandas_data_manager: "array"
71-
test_args: ""
71+
error_on_warnings: "0"
7272
- name: "Pypy"
7373
env_file: actions-pypy-38.yaml
7474
pattern: "not slow and not network and not single_cpu"
7575
test_args: "--max-worker-restart 0"
76+
error_on_warnings: "0"
7677
- name: "Numpy Dev"
7778
env_file: actions-310-numpydev.yaml
7879
pattern: "not slow and not network and not single_cpu"
7980
test_args: "-W error::DeprecationWarning:numpy -W error::FutureWarning:numpy"
81+
error_on_warnings: "0"
8082
exclude:
81-
- env_file: actions-39.yaml
82-
pyarrow_version: "6"
83-
- env_file: actions-39.yaml
83+
- env_file: actions-38.yaml
8484
pyarrow_version: "7"
85-
- env_file: actions-310.yaml
86-
pyarrow_version: "6"
87-
- env_file: actions-310.yaml
85+
- env_file: actions-38.yaml
86+
pyarrow_version: "8"
87+
- env_file: actions-38.yaml
88+
pyarrow_version: "9"
89+
- env_file: actions-39.yaml
8890
pyarrow_version: "7"
91+
- env_file: actions-39.yaml
92+
pyarrow_version: "8"
93+
- env_file: actions-39.yaml
94+
pyarrow_version: "9"
8995
fail-fast: false
9096
name: ${{ matrix.name || format('{0} pyarrow={1} {2}', matrix.env_file, matrix.pyarrow_version, matrix.pattern) }}
9197
env:
9298
ENV_FILE: ci/deps/${{ matrix.env_file }}
9399
PATTERN: ${{ matrix.pattern }}
94100
EXTRA_APT: ${{ matrix.extra_apt || '' }}
101+
ERROR_ON_WARNINGS: ${{ matrix.error_on_warnings || '1' }}
95102
LANG: ${{ matrix.lang || '' }}
96103
LC_ALL: ${{ matrix.lc_all || '' }}
97104
PANDAS_DATA_MANAGER: ${{ matrix.pandas_data_manager || 'block' }}
98105
PANDAS_COPY_ON_WRITE: ${{ matrix.pandas_copy_on_write || '0' }}
99-
TEST_ARGS: ${{ matrix.test_args || '-W error:::pandas' }}
106+
TEST_ARGS: ${{ matrix.test_args || '' }}
100107
PYTEST_WORKERS: ${{ contains(matrix.pattern, 'not single_cpu') && 'auto' || '1' }}
101108
PYTEST_TARGET: ${{ matrix.pytest_target || 'pandas' }}
102109
IS_PYPY: ${{ contains(matrix.env_file, 'pypy') }}

.pre-commit-config.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,3 +333,12 @@ repos:
333333
additional_dependencies:
334334
- autotyping==22.9.0
335335
- libcst==0.4.7
336+
- id: check-test-naming
337+
name: check that test names start with 'test'
338+
entry: python -m scripts.check_test_naming
339+
types: [python]
340+
files: ^pandas/tests
341+
language: python
342+
exclude: |
343+
(?x)
344+
^pandas/tests/generic/test_generic.py # GH50380

ci/deps/actions-310.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ dependencies:
4242
- psycopg2
4343
- pymysql
4444
- pytables
45-
- pyarrow<10
45+
- pyarrow
4646
- pyreadstat
4747
- python-snappy
4848
- pyxlsb

ci/deps/actions-38-downstream_compat.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ dependencies:
4040
- openpyxl
4141
- odfpy
4242
- psycopg2
43-
- pyarrow<10
43+
- pyarrow
4444
- pymysql
4545
- pyreadstat
4646
- pytables

ci/deps/actions-38.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ dependencies:
4040
- odfpy
4141
- pandas-gbq
4242
- psycopg2
43-
- pyarrow<10
43+
- pyarrow
4444
- pymysql
4545
- pyreadstat
4646
- pytables

ci/deps/actions-39.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ dependencies:
4141
- pandas-gbq
4242
- psycopg2
4343
- pymysql
44-
- pyarrow<10
44+
- pyarrow
4545
- pyreadstat
4646
- pytables
4747
- python-snappy

ci/deps/circle-38-arm64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ dependencies:
4040
- odfpy
4141
- pandas-gbq
4242
- psycopg2
43-
- pyarrow<10
43+
- pyarrow
4444
- pymysql
4545
# Not provided on ARM
4646
#- pyreadstat

ci/run_tests.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ if [[ "$PATTERN" ]]; then
3030
PYTEST_CMD="$PYTEST_CMD -m \"$PATTERN\""
3131
fi
3232

33+
if [[ "$ERROR_ON_WARNINGS" == "1" ]]; then
34+
for pth in $(find pandas -name '*.py' -not -path "pandas/tests/*" | sed -e 's/\.py//g' -e 's/\/__init__//g' -e 's/\//./g');
35+
do
36+
PYTEST_CMD="$PYTEST_CMD -W error:::$pth"
37+
done
38+
fi
39+
3340
echo $PYTEST_CMD
3441
sh -c "$PYTEST_CMD"
3542

doc/source/user_guide/io.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1149,7 +1149,7 @@ To completely override the default values that are recognized as missing, specif
11491149
.. _io.navaluesconst:
11501150

11511151
The default ``NaN`` recognized values are ``['-1.#IND', '1.#QNAN', '1.#IND', '-1.#QNAN', '#N/A N/A', '#N/A', 'N/A',
1152-
'n/a', 'NA', '<NA>', '#NA', 'NULL', 'null', 'NaN', '-NaN', 'nan', '-nan', '']``.
1152+
'n/a', 'NA', '<NA>', '#NA', 'NULL', 'null', 'NaN', '-NaN', 'nan', '-nan', 'None', '']``.
11531153

11541154
Let us consider some examples:
11551155

0 commit comments

Comments
 (0)