Skip to content

Commit d89766b

Browse files
committed
Merge branch 'main' into tst-str-2
2 parents beee346 + 0fadaa9 commit d89766b

File tree

216 files changed

+1593
-812
lines changed

Some content is hidden

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

216 files changed

+1593
-812
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
/opt/python/cp311-cp311/bin/python -m venv ~/virtualenvs/pandas-dev
5757
. ~/virtualenvs/pandas-dev/bin/activate
5858
python -m pip install --no-cache-dir -U pip wheel setuptools meson-python==0.13.1 meson[ninja]==1.2.1
59-
python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.3.2 pytest-xdist>=3.4.0 hypothesis>=6.84.0
59+
python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytest>=7.3.2 pytest-xdist>=3.4.0 hypothesis>=6.84.0
6060
python -m pip install --no-cache-dir --no-build-isolation -e . --config-settings=setup-args="--werror"
6161
python -m pip list --no-cache-dir
6262
export PANDAS_CI=1

.devcontainer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// Use 'settings' to set *default* container specific settings.json values on container create.
99
// You can edit these settings after create using File > Preferences > Settings > Remote.
1010
"settings": {
11-
"terminal.integrated.shell.linux": "/bin/bash",
1211
"python.pythonPath": "/usr/local/bin/python",
1312
"python.formatting.provider": "black",
1413
"python.linting.enabled": true,

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,9 @@ runs:
1414
condarc-file: ci/.condarc
1515
cache-environment: true
1616
cache-downloads: true
17+
18+
- name: Uninstall pyarrow
19+
if: ${{ env.REMOVE_PYARROW == '1' }}
20+
run: |
21+
micromamba remove -y pyarrow
22+
shell: bash -el {0}

.github/workflows/unit-tests.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
env_file: [actions-310.yaml, actions-311.yaml, actions-312.yaml]
3030
# Prevent the include jobs from overriding other jobs
3131
pattern: [""]
32+
pandas_future_infer_string: ["0"]
3233
include:
3334
- name: "Downstream Compat"
3435
env_file: actions-311-downstream_compat.yaml
@@ -58,6 +59,9 @@ jobs:
5859
# It will be temporarily activated during tests with locale.setlocale
5960
extra_loc: "zh_CN"
6061
- name: "Future infer strings"
62+
env_file: actions-312.yaml
63+
pandas_future_infer_string: "1"
64+
- name: "Future infer strings (without pyarrow)"
6165
env_file: actions-311.yaml
6266
pandas_future_infer_string: "1"
6367
- name: "Pypy"
@@ -85,9 +89,10 @@ jobs:
8589
NPY_PROMOTION_STATE: ${{ matrix.env_file == 'actions-311-numpydev.yaml' && 'weak' || 'legacy' }}
8690
# Clipboard tests
8791
QT_QPA_PLATFORM: offscreen
92+
REMOVE_PYARROW: ${{ matrix.name == 'Future infer strings (without pyarrow)' && '1' || '0' }}
8893
concurrency:
8994
# https://github.community/t/concurrecy-not-work-for-push/183068/7
90-
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.env_file }}-${{ matrix.pattern }}-${{ matrix.extra_apt || '' }}}
95+
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.env_file }}-${{ matrix.pattern }}-${{ matrix.extra_apt || '' }}-${{ matrix.pandas_future_infer_string }}
9196
cancel-in-progress: true
9297

9398
services:
@@ -231,7 +236,7 @@ jobs:
231236
. ~/virtualenvs/pandas-dev/bin/activate
232237
python -m pip install --no-cache-dir -U pip wheel setuptools meson[ninja]==1.2.1 meson-python==0.13.1
233238
python -m pip install numpy --config-settings=setup-args="-Dallow-noblas=true"
234-
python -m pip install --no-cache-dir versioneer[toml] cython python-dateutil pytz pytest>=7.3.2 pytest-xdist>=3.4.0 hypothesis>=6.84.0
239+
python -m pip install --no-cache-dir versioneer[toml] cython python-dateutil pytest>=7.3.2 pytest-xdist>=3.4.0 hypothesis>=6.84.0
235240
python -m pip install --no-cache-dir --no-build-isolation -e . --config-settings=setup-args="--werror"
236241
python -m pip list --no-cache-dir
237242
export PANDAS_CI=1
@@ -269,7 +274,7 @@ jobs:
269274
/opt/python/cp311-cp311/bin/python -m venv ~/virtualenvs/pandas-dev
270275
. ~/virtualenvs/pandas-dev/bin/activate
271276
python -m pip install --no-cache-dir -U pip wheel setuptools meson-python==0.13.1 meson[ninja]==1.2.1
272-
python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.3.2 pytest-xdist>=3.4.0 hypothesis>=6.84.0
277+
python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytest>=7.3.2 pytest-xdist>=3.4.0 hypothesis>=6.84.0
273278
python -m pip install --no-cache-dir --no-build-isolation -e . --config-settings=setup-args="--werror"
274279
python -m pip list --no-cache-dir
275280
@@ -290,7 +295,7 @@ jobs:
290295
# In general, this will remain frozen(present, but not running) until:
291296
# - The next unreleased Python version has released beta 1
292297
# - This version should be available on GitHub Actions.
293-
# - Our required build/runtime dependencies(numpy, pytz, Cython, python-dateutil)
298+
# - Our required build/runtime dependencies(numpy, Cython, python-dateutil)
294299
# support that unreleased Python version.
295300
# To unfreeze, comment out the ``if: false`` condition, and make sure you update
296301
# the name of the workflow and Python version in actions/setup-python ``python-version:``
@@ -343,7 +348,7 @@ jobs:
343348
python -m pip install --upgrade pip setuptools wheel meson[ninja]==1.2.1 meson-python==0.13.1
344349
python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy
345350
python -m pip install versioneer[toml]
346-
python -m pip install python-dateutil pytz tzdata cython hypothesis>=6.84.0 pytest>=7.3.2 pytest-xdist>=3.4.0 pytest-cov
351+
python -m pip install python-dateutil tzdata cython hypothesis>=6.84.0 pytest>=7.3.2 pytest-xdist>=3.4.0 pytest-cov
347352
python -m pip install -ve . --no-build-isolation --no-index --no-deps --config-settings=setup-args="--werror"
348353
python -m pip list
349354

.gitpod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ tasks:
1414
cp gitpod/settings.json .vscode/settings.json
1515
git fetch --tags
1616
python -m pip install -ve . --no-build-isolation --config-settings editable-verbose=true
17-
pre-commit install
17+
pre-commit install --install-hooks
1818
command: |
1919
python -m pip install -ve . --no-build-isolation --config-settings editable-verbose=true
2020
echo "✨ Pre-build complete! You can close this terminal ✨ "

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM python:3.10.8
22
WORKDIR /home/pandas
33

44
RUN apt-get update && apt-get -y upgrade
5-
RUN apt-get install -y build-essential
5+
RUN apt-get install -y build-essential bash-completion
66

77
# hdf5 needed for pytables installation
88
# libgles2-mesa needed for pytest-qt
@@ -12,4 +12,6 @@ RUN python -m pip install --upgrade pip
1212
COPY requirements-dev.txt /tmp
1313
RUN python -m pip install -r /tmp/requirements-dev.txt
1414
RUN git config --global --add safe.directory /home/pandas
15+
16+
ENV SHELL "/bin/bash"
1517
CMD ["/bin/bash"]

ci/code_checks.sh

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
7070
--format=actions \
7171
-i ES01 `# For now it is ok if docstrings are missing the extended summary` \
7272
-i "pandas.Series.dt PR01" `# Accessors are implemented as classes, but we do not document the Parameters section` \
73-
-i "pandas.MultiIndex.get_loc_level PR07" \
7473
-i "pandas.MultiIndex.names SA01" \
7574
-i "pandas.MultiIndex.reorder_levels RT03,SA01" \
7675
-i "pandas.MultiIndex.sortlevel PR07,SA01" \
@@ -159,28 +158,15 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
159158
-i "pandas.Series.sparse.sp_values SA01" \
160159
-i "pandas.Series.sparse.to_coo PR07,RT03,SA01" \
161160
-i "pandas.Series.std PR01,RT03,SA01" \
162-
-i "pandas.Series.str.capitalize RT03" \
163-
-i "pandas.Series.str.casefold RT03" \
164-
-i "pandas.Series.str.center RT03,SA01" \
165-
-i "pandas.Series.str.decode PR07,RT03,SA01" \
166-
-i "pandas.Series.str.encode PR07,RT03,SA01" \
167-
-i "pandas.Series.str.index RT03" \
168-
-i "pandas.Series.str.ljust RT03,SA01" \
169-
-i "pandas.Series.str.lower RT03" \
170161
-i "pandas.Series.str.lstrip RT03" \
171162
-i "pandas.Series.str.match RT03" \
172163
-i "pandas.Series.str.normalize RT03,SA01" \
173164
-i "pandas.Series.str.partition RT03" \
174165
-i "pandas.Series.str.repeat SA01" \
175166
-i "pandas.Series.str.replace SA01" \
176-
-i "pandas.Series.str.rindex RT03" \
177-
-i "pandas.Series.str.rjust RT03,SA01" \
178167
-i "pandas.Series.str.rpartition RT03" \
179168
-i "pandas.Series.str.rstrip RT03" \
180169
-i "pandas.Series.str.strip RT03" \
181-
-i "pandas.Series.str.swapcase RT03" \
182-
-i "pandas.Series.str.title RT03" \
183-
-i "pandas.Series.str.upper RT03" \
184170
-i "pandas.Series.str.wrap RT03,SA01" \
185171
-i "pandas.Series.str.zfill RT03" \
186172
-i "pandas.Series.struct.dtypes SA01" \
@@ -234,11 +220,8 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
234220
-i "pandas.Timestamp.to_period PR01,SA01" \
235221
-i "pandas.Timestamp.today SA01" \
236222
-i "pandas.Timestamp.toordinal SA01" \
237-
-i "pandas.Timestamp.tz_localize SA01" \
238223
-i "pandas.Timestamp.tzinfo GL08" \
239-
-i "pandas.Timestamp.tzname SA01" \
240224
-i "pandas.Timestamp.unit SA01" \
241-
-i "pandas.Timestamp.utcfromtimestamp PR01,SA01" \
242225
-i "pandas.Timestamp.utcoffset SA01" \
243226
-i "pandas.Timestamp.utctimetuple SA01" \
244227
-i "pandas.Timestamp.value GL08" \
@@ -284,12 +267,9 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
284267
-i "pandas.api.types.is_iterator PR07,SA01" \
285268
-i "pandas.api.types.is_list_like SA01" \
286269
-i "pandas.api.types.is_named_tuple PR07,SA01" \
287-
-i "pandas.api.types.is_numeric_dtype SA01" \
288270
-i "pandas.api.types.is_object_dtype SA01" \
289-
-i "pandas.api.types.is_period_dtype SA01" \
290271
-i "pandas.api.types.is_re PR07,SA01" \
291272
-i "pandas.api.types.is_re_compilable PR07,SA01" \
292-
-i "pandas.api.types.is_timedelta64_ns_dtype SA01" \
293273
-i "pandas.api.types.pandas_dtype PR07,RT03,SA01" \
294274
-i "pandas.arrays.ArrowExtensionArray PR07,SA01" \
295275
-i "pandas.arrays.BooleanArray SA01" \

ci/deps/actions-310-minimum_versions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ dependencies:
2323
# required dependencies
2424
- python-dateutil=2.8.2
2525
- numpy=1.23.5
26-
- pytz=2020.1
2726

2827
# optional dependencies
2928
- beautifulsoup4=4.11.2
@@ -49,6 +48,7 @@ dependencies:
4948
- pyreadstat=1.2.0
5049
- pytables=3.8.0
5150
- python-calamine=0.1.7
51+
- pytz=2023.4
5252
- pyxlsb=1.0.10
5353
- s3fs=2022.11.0
5454
- scipy=1.10.0

ci/deps/actions-310.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ dependencies:
2121
# required dependencies
2222
- python-dateutil
2323
- numpy
24-
- pytz
2524

2625
# optional dependencies
2726
- beautifulsoup4>=4.11.2
@@ -47,6 +46,7 @@ dependencies:
4746
- pyreadstat>=1.2.0
4847
- pytables>=3.8.0
4948
- python-calamine>=0.1.7
49+
- pytz>=2023.4
5050
- pyxlsb>=1.0.10
5151
- s3fs>=2022.11.0
5252
- scipy>=1.10.0

ci/deps/actions-311-downstream_compat.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ dependencies:
2222
# required dependencies
2323
- python-dateutil
2424
- numpy
25-
- pytz
2625

2726
# optional dependencies
2827
- beautifulsoup4>=4.11.2
@@ -48,6 +47,7 @@ dependencies:
4847
- pyreadstat>=1.2.0
4948
- pytables>=3.8.0
5049
- python-calamine>=0.1.7
50+
- pytz>=2023.4
5151
- pyxlsb>=1.0.10
5252
- s3fs>=2022.11.0
5353
- scipy>=1.10.0

0 commit comments

Comments
 (0)