Skip to content

Commit abfdedb

Browse files
MichaelTiemannOSCMichaelTiemannOSC
authored
Merge branch 'main' into test_numpy_complex2
2 parents 4e273fa + c468028 commit abfdedb

File tree

179 files changed

+1646
-2262
lines changed

Some content is hidden

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

179 files changed

+1646
-2262
lines changed

‎asv_bench/benchmarks/categoricals.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def setup(self):
8888
)
8989

9090
for col in ("int", "float", "timestamp"):
91-
self.df[col + "_as_str"] = self.df[col].astype(str)
91+
self.df[f"{col}_as_str"] = self.df[col].astype(str)
9292

9393
for col in self.df.columns:
9494
self.df[col] = self.df[col].astype("category")

‎asv_bench/benchmarks/join_merge.py‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,23 @@ def time_i8merge(self, how):
328328
merge(self.left, self.right, how=how)
329329

330330

331+
class UniqueMerge:
332+
params = [4_000_000, 1_000_000]
333+
param_names = ["unique_elements"]
334+
335+
def setup(self, unique_elements):
336+
N = 1_000_000
337+
self.left = DataFrame({"a": np.random.randint(1, unique_elements, (N,))})
338+
self.right = DataFrame({"a": np.random.randint(1, unique_elements, (N,))})
339+
uniques = self.right.a.drop_duplicates()
340+
self.right["a"] = concat(
341+
[uniques, Series(np.arange(0, -(N - len(uniques)), -1))], ignore_index=True
342+
)
343+
344+
def time_unique_merge(self, unique_elements):
345+
merge(self.left, self.right, how="inner")
346+
347+
331348
class MergeDatetime:
332349
params = [
333350
[

‎ci/code_checks.sh‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
504504
-i "pandas.Timedelta.to_timedelta64 SA01" \
505505
-i "pandas.Timedelta.total_seconds SA01" \
506506
-i "pandas.Timedelta.view SA01" \
507-
-i "pandas.TimedeltaIndex PR01" \
508507
-i "pandas.TimedeltaIndex.as_unit RT03,SA01" \
509508
-i "pandas.TimedeltaIndex.ceil SA01" \
510509
-i "pandas.TimedeltaIndex.components SA01" \
@@ -797,8 +796,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
797796
-i "pandas.io.formats.style.Styler.clear SA01" \
798797
-i "pandas.io.formats.style.Styler.concat RT03,SA01" \
799798
-i "pandas.io.formats.style.Styler.export RT03" \
800-
-i "pandas.io.formats.style.Styler.format RT03" \
801-
-i "pandas.io.formats.style.Styler.format_index RT03" \
802799
-i "pandas.io.formats.style.Styler.from_custom_template SA01" \
803800
-i "pandas.io.formats.style.Styler.hide RT03,SA01" \
804801
-i "pandas.io.formats.style.Styler.highlight_between RT03" \
@@ -808,7 +805,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
808805
-i "pandas.io.formats.style.Styler.highlight_quantile RT03" \
809806
-i "pandas.io.formats.style.Styler.map RT03" \
810807
-i "pandas.io.formats.style.Styler.map_index RT03" \
811-
-i "pandas.io.formats.style.Styler.relabel_index RT03" \
812808
-i "pandas.io.formats.style.Styler.set_caption RT03,SA01" \
813809
-i "pandas.io.formats.style.Styler.set_properties RT03,SA01" \
814810
-i "pandas.io.formats.style.Styler.set_sticky RT03,SA01" \
@@ -1022,7 +1018,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
10221018
-i "pandas.tseries.offsets.DateOffset.rule_code GL08" \
10231019
-i "pandas.tseries.offsets.Day PR02" \
10241020
-i "pandas.tseries.offsets.Day.copy SA01" \
1025-
-i "pandas.tseries.offsets.Day.delta GL08" \
10261021
-i "pandas.tseries.offsets.Day.freqstr SA01" \
10271022
-i "pandas.tseries.offsets.Day.is_on_offset GL08" \
10281023
-i "pandas.tseries.offsets.Day.kwds SA01" \
@@ -1075,7 +1070,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
10751070
-i "pandas.tseries.offsets.FY5253Quarter.year_has_extra_week GL08" \
10761071
-i "pandas.tseries.offsets.Hour PR02" \
10771072
-i "pandas.tseries.offsets.Hour.copy SA01" \
1078-
-i "pandas.tseries.offsets.Hour.delta GL08" \
10791073
-i "pandas.tseries.offsets.Hour.freqstr SA01" \
10801074
-i "pandas.tseries.offsets.Hour.is_on_offset GL08" \
10811075
-i "pandas.tseries.offsets.Hour.kwds SA01" \
@@ -1098,7 +1092,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
10981092
-i "pandas.tseries.offsets.LastWeekOfMonth.weekday GL08" \
10991093
-i "pandas.tseries.offsets.Micro PR02" \
11001094
-i "pandas.tseries.offsets.Micro.copy SA01" \
1101-
-i "pandas.tseries.offsets.Micro.delta GL08" \
11021095
-i "pandas.tseries.offsets.Micro.freqstr SA01" \
11031096
-i "pandas.tseries.offsets.Micro.is_on_offset GL08" \
11041097
-i "pandas.tseries.offsets.Micro.kwds SA01" \
@@ -1109,7 +1102,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
11091102
-i "pandas.tseries.offsets.Micro.rule_code GL08" \
11101103
-i "pandas.tseries.offsets.Milli PR02" \
11111104
-i "pandas.tseries.offsets.Milli.copy SA01" \
1112-
-i "pandas.tseries.offsets.Milli.delta GL08" \
11131105
-i "pandas.tseries.offsets.Milli.freqstr SA01" \
11141106
-i "pandas.tseries.offsets.Milli.is_on_offset GL08" \
11151107
-i "pandas.tseries.offsets.Milli.kwds SA01" \
@@ -1120,7 +1112,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
11201112
-i "pandas.tseries.offsets.Milli.rule_code GL08" \
11211113
-i "pandas.tseries.offsets.Minute PR02" \
11221114
-i "pandas.tseries.offsets.Minute.copy SA01" \
1123-
-i "pandas.tseries.offsets.Minute.delta GL08" \
11241115
-i "pandas.tseries.offsets.Minute.freqstr SA01" \
11251116
-i "pandas.tseries.offsets.Minute.is_on_offset GL08" \
11261117
-i "pandas.tseries.offsets.Minute.kwds SA01" \
@@ -1151,7 +1142,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
11511142
-i "pandas.tseries.offsets.MonthEnd.rule_code GL08" \
11521143
-i "pandas.tseries.offsets.Nano PR02" \
11531144
-i "pandas.tseries.offsets.Nano.copy SA01" \
1154-
-i "pandas.tseries.offsets.Nano.delta GL08" \
11551145
-i "pandas.tseries.offsets.Nano.freqstr SA01" \
11561146
-i "pandas.tseries.offsets.Nano.is_on_offset GL08" \
11571147
-i "pandas.tseries.offsets.Nano.kwds SA01" \
@@ -1184,7 +1174,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
11841174
-i "pandas.tseries.offsets.QuarterEnd.startingMonth GL08" \
11851175
-i "pandas.tseries.offsets.Second PR02" \
11861176
-i "pandas.tseries.offsets.Second.copy SA01" \
1187-
-i "pandas.tseries.offsets.Second.delta GL08" \
11881177
-i "pandas.tseries.offsets.Second.freqstr SA01" \
11891178
-i "pandas.tseries.offsets.Second.is_on_offset GL08" \
11901179
-i "pandas.tseries.offsets.Second.kwds SA01" \
@@ -1217,7 +1206,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
12171206
-i "pandas.tseries.offsets.SemiMonthEnd.rule_code GL08" \
12181207
-i "pandas.tseries.offsets.Tick GL08" \
12191208
-i "pandas.tseries.offsets.Tick.copy SA01" \
1220-
-i "pandas.tseries.offsets.Tick.delta GL08" \
12211209
-i "pandas.tseries.offsets.Tick.freqstr SA01" \
12221210
-i "pandas.tseries.offsets.Tick.is_on_offset GL08" \
12231211
-i "pandas.tseries.offsets.Tick.kwds SA01" \

‎ci/deps/actions-310.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies:
2626
- beautifulsoup4>=4.11.2
2727
- blosc>=1.21.3
2828
- bottleneck>=1.3.6
29-
- fastparquet>=2023.04.0
29+
- fastparquet>=2023.10.0
3030
- fsspec>=2022.11.0
3131
- html5lib>=1.1
3232
- hypothesis>=6.46.1
@@ -57,7 +57,7 @@ dependencies:
5757
- zstandard>=0.19.0
5858

5959
- pip:
60-
- adbc-driver-postgresql>=0.8.0
60+
- adbc-driver-postgresql>=0.10.0
6161
- adbc-driver-sqlite>=0.8.0
6262
- tzdata>=2022.7
6363
- pytest-localserver>=0.7.1

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ dependencies:
2828
- beautifulsoup4>=4.11.2
2929
- blosc>=1.21.3
3030
- bottleneck>=1.3.6
31-
- fastparquet>=2023.04.0
31+
- fastparquet>=2023.10.0
3232
- fsspec>=2022.11.0
3333
- html5lib>=1.1
3434
- hypothesis>=6.46.1
@@ -72,6 +72,6 @@ dependencies:
7272
- pyyaml
7373
- py
7474
- pip:
75-
- adbc-driver-postgresql>=0.8.0
75+
- adbc-driver-postgresql>=0.10.0
7676
- adbc-driver-sqlite>=0.8.0
7777
- tzdata>=2022.7

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ dependencies:
1313
# test dependencies
1414
- pytest>=7.3.2
1515
- pytest-cov
16-
# Once pytest-cov > 4 comes out, unpin this
17-
# Right now, a DeprecationWarning related to rsyncdir
18-
# causes an InternalError within pytest
19-
- pytest-xdist>=2.2.0, <3
16+
- pytest-xdist>=2.2.0
2017
- hypothesis>=6.46.1
2118

2219
# pandas dependencies

‎ci/deps/actions-311.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies:
2626
- beautifulsoup4>=4.11.2
2727
- blosc>=1.21.3
2828
- bottleneck>=1.3.6
29-
- fastparquet>=2023.04.0
29+
- fastparquet>=2023.10.0
3030
- fsspec>=2022.11.0
3131
- html5lib>=1.1
3232
- hypothesis>=6.46.1
@@ -57,6 +57,6 @@ dependencies:
5757
- zstandard>=0.19.0
5858

5959
- pip:
60-
- adbc-driver-postgresql>=0.8.0
60+
- adbc-driver-postgresql>=0.10.0
6161
- adbc-driver-sqlite>=0.8.0
6262
- pytest-localserver>=0.7.1

‎ci/deps/actions-312.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ dependencies:
2626
- beautifulsoup4>=4.11.2
2727
- blosc>=1.21.3
2828
- bottleneck>=1.3.6
29-
- fastparquet>=2023.04.0
29+
- fastparquet>=2023.10.0
3030
- fsspec>=2022.11.0
3131
- html5lib>=1.1
3232
- hypothesis>=6.46.1
3333
- gcsfs>=2022.11.0
3434
- jinja2>=3.1.2
3535
- lxml>=4.9.2
3636
- matplotlib>=3.6.3
37-
# - numba>=0.56.4
37+
- numba>=0.56.4
3838
- numexpr>=2.8.4
3939
- odfpy>=1.4.1
4040
- qtpy>=2.3.0
@@ -44,7 +44,7 @@ dependencies:
4444
- pyarrow>=10.0.1
4545
- pymysql>=1.0.2
4646
- pyreadstat>=1.2.0
47-
# - pytables>=3.8.0
47+
- pytables>=3.8.0
4848
- python-calamine>=0.1.7
4949
- pyxlsb>=1.0.10
5050
- s3fs>=2022.11.0
@@ -57,7 +57,7 @@ dependencies:
5757
- zstandard>=0.19.0
5858

5959
- pip:
60-
- adbc-driver-postgresql>=0.8.0
60+
- adbc-driver-postgresql>=0.10.0
6161
- adbc-driver-sqlite>=0.8.0
6262
- tzdata>=2022.7
6363
- pytest-localserver>=0.7.1

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ dependencies:
2929
- beautifulsoup4=4.11.2
3030
- blosc=1.21.3
3131
- bottleneck=1.3.6
32-
- fastparquet=2023.04.0
32+
- fastparquet=2023.10.0
3333
- fsspec=2022.11.0
3434
- html5lib=1.1
3535
- hypothesis=6.46.1
@@ -60,6 +60,6 @@ dependencies:
6060
- zstandard=0.19.0
6161

6262
- pip:
63-
- adbc-driver-postgresql==0.8.0
63+
- adbc-driver-postgresql==0.10.0
6464
- adbc-driver-sqlite==0.8.0
6565
- tzdata==2022.7

‎ci/deps/actions-39.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies:
2626
- beautifulsoup4>=4.11.2
2727
- blosc>=1.21.3
2828
- bottleneck>=1.3.6
29-
- fastparquet>=2023.04.0
29+
- fastparquet>=2023.10.0
3030
- fsspec>=2022.11.0
3131
- html5lib>=1.1
3232
- hypothesis>=6.46.1
@@ -57,7 +57,7 @@ dependencies:
5757
- zstandard>=0.19.0
5858

5959
- pip:
60-
- adbc-driver-postgresql>=0.8.0
60+
- adbc-driver-postgresql>=0.10.0
6161
- adbc-driver-sqlite>=0.8.0
6262
- tzdata>=2022.7
6363
- pytest-localserver>=0.7.1

0 commit comments

Comments
 (0)