Skip to content

Commit edb3670

Browse files
SiniadeSiniade
committed
Resolve merge conflict by incorporating both suggestions
2 parents 5633f8d + fb6842d commit edb3670

File tree

85 files changed

+695
-414
lines changed

Some content is hidden

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

85 files changed

+695
-414
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

‎.github/workflows/unit-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ jobs:
236236
. ~/virtualenvs/pandas-dev/bin/activate
237237
python -m pip install --no-cache-dir -U pip wheel setuptools meson[ninja]==1.2.1 meson-python==0.13.1
238238
python -m pip install numpy --config-settings=setup-args="-Dallow-noblas=true"
239-
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
240240
python -m pip install --no-cache-dir --no-build-isolation -e . --config-settings=setup-args="--werror"
241241
python -m pip list --no-cache-dir
242242
export PANDAS_CI=1
@@ -274,7 +274,7 @@ jobs:
274274
/opt/python/cp311-cp311/bin/python -m venv ~/virtualenvs/pandas-dev
275275
. ~/virtualenvs/pandas-dev/bin/activate
276276
python -m pip install --no-cache-dir -U pip wheel setuptools meson-python==0.13.1 meson[ninja]==1.2.1
277-
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
278278
python -m pip install --no-cache-dir --no-build-isolation -e . --config-settings=setup-args="--werror"
279279
python -m pip list --no-cache-dir
280280
@@ -295,7 +295,7 @@ jobs:
295295
# In general, this will remain frozen(present, but not running) until:
296296
# - The next unreleased Python version has released beta 1
297297
# - This version should be available on GitHub Actions.
298-
# - Our required build/runtime dependencies(numpy, pytz, Cython, python-dateutil)
298+
# - Our required build/runtime dependencies(numpy, Cython, python-dateutil)
299299
# support that unreleased Python version.
300300
# To unfreeze, comment out the ``if: false`` condition, and make sure you update
301301
# the name of the workflow and Python version in actions/setup-python ``python-version:``
@@ -348,7 +348,7 @@ jobs:
348348
python -m pip install --upgrade pip setuptools wheel meson[ninja]==1.2.1 meson-python==0.13.1
349349
python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy
350350
python -m pip install versioneer[toml]
351-
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
352352
python -m pip install -ve . --no-build-isolation --no-index --no-deps --config-settings=setup-args="--werror"
353353
python -m pip list
354354

‎ci/code_checks.sh

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -158,26 +158,15 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
158158
-i "pandas.Series.sparse.sp_values SA01" \
159159
-i "pandas.Series.sparse.to_coo PR07,RT03,SA01" \
160160
-i "pandas.Series.std PR01,RT03,SA01" \
161-
-i "pandas.Series.str.capitalize RT03" \
162-
-i "pandas.Series.str.casefold RT03" \
163-
-i "pandas.Series.str.center RT03,SA01" \
164-
-i "pandas.Series.str.decode PR07,RT03,SA01" \
165-
-i "pandas.Series.str.encode PR07,RT03,SA01" \
166-
-i "pandas.Series.str.ljust RT03,SA01" \
167-
-i "pandas.Series.str.lower RT03" \
168161
-i "pandas.Series.str.lstrip RT03" \
169162
-i "pandas.Series.str.match RT03" \
170163
-i "pandas.Series.str.normalize RT03,SA01" \
171164
-i "pandas.Series.str.partition RT03" \
172165
-i "pandas.Series.str.repeat SA01" \
173166
-i "pandas.Series.str.replace SA01" \
174-
-i "pandas.Series.str.rjust RT03,SA01" \
175167
-i "pandas.Series.str.rpartition RT03" \
176168
-i "pandas.Series.str.rstrip RT03" \
177169
-i "pandas.Series.str.strip RT03" \
178-
-i "pandas.Series.str.swapcase RT03" \
179-
-i "pandas.Series.str.title RT03" \
180-
-i "pandas.Series.str.upper RT03" \
181170
-i "pandas.Series.str.wrap RT03,SA01" \
182171
-i "pandas.Series.str.zfill RT03" \
183172
-i "pandas.Series.struct.dtypes SA01" \
@@ -231,13 +220,7 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
231220
-i "pandas.Timestamp.to_period PR01,SA01" \
232221
-i "pandas.Timestamp.today SA01" \
233222
-i "pandas.Timestamp.toordinal SA01" \
234-
-i "pandas.Timestamp.tz_localize SA01" \
235223
-i "pandas.Timestamp.tzinfo GL08" \
236-
-i "pandas.Timestamp.tzname SA01" \
237-
-i "pandas.Timestamp.unit SA01" \
238-
-i "pandas.Timestamp.utcfromtimestamp PR01,SA01" \
239-
-i "pandas.Timestamp.utcoffset SA01" \
240-
-i "pandas.Timestamp.utctimetuple SA01" \
241224
-i "pandas.Timestamp.value GL08" \
242225
-i "pandas.Timestamp.year GL08" \
243226
-i "pandas.api.extensions.ExtensionArray._pad_or_backfill PR01,RT03,SA01" \
@@ -508,10 +491,14 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
508491
-i "pandas.tseries.offsets.Day.n GL08" \
509492
-i "pandas.tseries.offsets.Day.normalize GL08" \
510493
-i "pandas.tseries.offsets.Easter PR02" \
494+
-i "pandas.tseries.offsets.Day.rule_code GL08" \
495+
-i "pandas.tseries.offsets.Easter.freqstr SA01" \
511496
-i "pandas.tseries.offsets.Easter.is_on_offset GL08" \
512497
-i "pandas.tseries.offsets.Easter.n GL08" \
513498
-i "pandas.tseries.offsets.Easter.normalize GL08" \
514499
-i "pandas.tseries.offsets.FY5253 PR02" \
500+
-i "pandas.tseries.offsets.Easter.rule_code GL08" \
501+
-i "pandas.tseries.offsets.FY5253.freqstr SA01" \
515502
-i "pandas.tseries.offsets.FY5253.get_rule_code_suffix GL08" \
516503
-i "pandas.tseries.offsets.FY5253.get_year_end GL08" \
517504
-i "pandas.tseries.offsets.FY5253.is_on_offset GL08" \
@@ -522,6 +509,7 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
522509
-i "pandas.tseries.offsets.FY5253.variation GL08" \
523510
-i "pandas.tseries.offsets.FY5253.weekday GL08" \
524511
-i "pandas.tseries.offsets.FY5253Quarter PR02" \
512+
-i "pandas.tseries.offsets.FY5253Quarter.freqstr SA01" \
525513
-i "pandas.tseries.offsets.FY5253Quarter.get_rule_code_suffix GL08" \
526514
-i "pandas.tseries.offsets.FY5253Quarter.get_weeks GL08" \
527515
-i "pandas.tseries.offsets.FY5253Quarter.is_on_offset GL08" \
@@ -534,24 +522,32 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
534522
-i "pandas.tseries.offsets.FY5253Quarter.weekday GL08" \
535523
-i "pandas.tseries.offsets.FY5253Quarter.year_has_extra_week GL08" \
536524
-i "pandas.tseries.offsets.Hour PR02" \
525+
-i "pandas.tseries.offsets.Hour.freqstr SA01" \
537526
-i "pandas.tseries.offsets.Hour.is_on_offset GL08" \
538527
-i "pandas.tseries.offsets.Hour.n GL08" \
539528
-i "pandas.tseries.offsets.Hour.normalize GL08" \
540529
-i "pandas.tseries.offsets.LastWeekOfMonth PR02,SA01" \
530+
-i "pandas.tseries.offsets.Hour.rule_code GL08" \
531+
-i "pandas.tseries.offsets.LastWeekOfMonth SA01" \
532+
-i "pandas.tseries.offsets.LastWeekOfMonth.freqstr SA01" \
541533
-i "pandas.tseries.offsets.LastWeekOfMonth.is_on_offset GL08" \
542534
-i "pandas.tseries.offsets.LastWeekOfMonth.n GL08" \
543535
-i "pandas.tseries.offsets.LastWeekOfMonth.normalize GL08" \
544536
-i "pandas.tseries.offsets.LastWeekOfMonth.week GL08" \
545537
-i "pandas.tseries.offsets.LastWeekOfMonth.weekday GL08" \
546538
-i "pandas.tseries.offsets.Micro PR02" \
539+
-i "pandas.tseries.offsets.Micro.freqstr SA01" \
547540
-i "pandas.tseries.offsets.Micro.is_on_offset GL08" \
548541
-i "pandas.tseries.offsets.Micro.n GL08" \
549542
-i "pandas.tseries.offsets.Micro.normalize GL08" \
550543
-i "pandas.tseries.offsets.Milli PR02" \
544+
-i "pandas.tseries.offsets.Micro.rule_code GL08" \
545+
-i "pandas.tseries.offsets.Milli.freqstr SA01" \
551546
-i "pandas.tseries.offsets.Milli.is_on_offset GL08" \
552547
-i "pandas.tseries.offsets.Milli.n GL08" \
553548
-i "pandas.tseries.offsets.Milli.normalize GL08" \
554-
-i "pandas.tseries.offsets.Minute PR02" \
549+
-i "pandas.tseries.offsets.Milli.rule_code GL08" \
550+
-i "pandas.tseries.offsets.Minute.freqstr SA01" \
555551
-i "pandas.tseries.offsets.Minute.is_on_offset GL08" \
556552
-i "pandas.tseries.offsets.Minute.n GL08" \
557553
-i "pandas.tseries.offsets.Minute.normalize GL08" \

‎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

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ dependencies:
1818

1919
# pandas dependencies
2020
- python-dateutil
21-
- pytz
2221
- pip
2322

2423
- pip:

‎ci/deps/actions-311-pyarrownightly.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ dependencies:
1919
# required dependencies
2020
- python-dateutil
2121
- numpy<2
22-
- pytz
2322
- pip
2423

2524
- pip:

‎ci/deps/actions-311.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-312.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

0 commit comments

Comments
 (0)