Skip to content

Commit c50bc0f

Browse files
rgommersrgommers
committed
WIP: undo some type annotation changes that don't seem needed
1 parent c665192 commit c50bc0f

File tree

1 file changed

+40
-35
lines changed

1 file changed

+40
-35
lines changed

‎spec/API_specification/dataframe_api/dataframe_object.py

Lines changed: 40 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
1-
__all__ = ["DataFrame"]
2-
1+
from __future__ import annotations
32
from typing import Sequence, Union, TYPE_CHECKING
43

54
from .column_object import Column
65
from .groupby_object import GroupBy
76

87

8+
__all__ = ["DataFrame"]
9+
10+
class Scalar:
11+
"A class to represent Python scalars"
12+
13+
914
class DataFrame:
1015
def groupby(self, keys: list[str], /) -> GroupBy:
1116
"""
@@ -32,7 +37,7 @@ def get_column_by_name(self, name: str, /) -> Column:
3237
"""
3338
...
3439

35-
def get_columns_by_name(self, names: Sequence[str], /) -> "DataFrame":
40+
def get_columns_by_name(self, names: Sequence[str], /) -> DataFrame:
3641
"""
3742
Select multiple columns by name.
3843
@@ -51,7 +56,7 @@ def get_columns_by_name(self, names: Sequence[str], /) -> "DataFrame":
5156
"""
5257
...
5358

54-
def get_rows(self, indices: Sequence[int]) -> "DataFrame":
59+
def get_rows(self, indices: Sequence[int]) -> DataFrame:
5560
"""
5661
Select a subset of rows, similar to `ndarray.take`.
5762
@@ -74,7 +79,7 @@ def get_rows(self, indices: Sequence[int]) -> "DataFrame":
7479

7580
def slice_rows(
7681
self, start: int | None, stop: int | None, step: int | None
77-
) -> "DataFrame":
82+
) -> DataFrame:
7883
"""
7984
Select a subset of rows corresponding to a slice.
8085
@@ -90,7 +95,7 @@ def slice_rows(
9095
"""
9196
...
9297

93-
def get_rows_by_mask(self, mask: "Column[bool]") -> "DataFrame":
98+
def get_rows_by_mask(self, mask: "Column[bool]") -> DataFrame:
9499
"""
95100
Select a subset of rows corresponding to a mask.
96101
@@ -109,7 +114,7 @@ def get_rows_by_mask(self, mask: "Column[bool]") -> "DataFrame":
109114
"""
110115
...
111116

112-
def insert(self, loc: int, label: str, value: Column) -> "DataFrame":
117+
def insert(self, loc: int, label: str, value: Column) -> DataFrame:
113118
"""
114119
Insert column into DataFrame at specified location.
115120
@@ -123,7 +128,7 @@ def insert(self, loc: int, label: str, value: Column) -> "DataFrame":
123128
"""
124129
...
125130

126-
def drop_column(self, label: str) -> "DataFrame":
131+
def drop_column(self, label: str) -> DataFrame:
127132
"""
128133
Drop the specified column.
129134
@@ -142,7 +147,7 @@ def drop_column(self, label: str) -> "DataFrame":
142147
"""
143148
...
144149

145-
def set_column(self, label: str, value: Column) -> "DataFrame":
150+
def set_column(self, label: str, value: Column) -> DataFrame:
146151
"""
147152
Add or replace a column.
148153
@@ -157,7 +162,7 @@ def set_column(self, label: str, value: Column) -> "DataFrame":
157162
"""
158163
...
159164

160-
def __eq__(self, other: Union["DataFrame", "Scalar"]) -> "DataFrame":
165+
def __eq__(self, other: DataFrame | "Scalar") -> DataFrame:
161166
"""
162167
Parameters
163168
----------
@@ -172,7 +177,7 @@ def __eq__(self, other: Union["DataFrame", "Scalar"]) -> "DataFrame":
172177
"""
173178
...
174179

175-
def __ne__(self, other: Union["DataFrame", "Scalar"]) -> "DataFrame":
180+
def __ne__(self, other: DataFrame | "Scalar") -> DataFrame:
176181
"""
177182
Parameters
178183
----------
@@ -187,7 +192,7 @@ def __ne__(self, other: Union["DataFrame", "Scalar"]) -> "DataFrame":
187192
"""
188193
...
189194

190-
def __ge__(self, other: Union["DataFrame", "Scalar"]) -> "DataFrame":
195+
def __ge__(self, other: DataFrame | "Scalar") -> DataFrame:
191196
"""
192197
Parameters
193198
----------
@@ -202,7 +207,7 @@ def __ge__(self, other: Union["DataFrame", "Scalar"]) -> "DataFrame":
202207
"""
203208
...
204209

205-
def __gt__(self, other: Union["DataFrame", "Scalar"]) -> "DataFrame":
210+
def __gt__(self, other: DataFrame | "Scalar") -> DataFrame:
206211
"""
207212
Parameters
208213
----------
@@ -217,7 +222,7 @@ def __gt__(self, other: Union["DataFrame", "Scalar"]) -> "DataFrame":
217222
"""
218223
...
219224

220-
def __le__(self, other: Union["DataFrame", "Scalar"]) -> "DataFrame":
225+
def __le__(self, other: DataFrame | "Scalar") -> DataFrame:
221226
"""
222227
Parameters
223228
----------
@@ -232,7 +237,7 @@ def __le__(self, other: Union["DataFrame", "Scalar"]) -> "DataFrame":
232237
"""
233238
...
234239

235-
def __lt__(self, other: Union["DataFrame", "Scalar"]) -> "DataFrame":
240+
def __lt__(self, other: DataFrame | "Scalar") -> DataFrame:
236241
"""
237242
Parameters
238243
----------
@@ -247,7 +252,7 @@ def __lt__(self, other: Union["DataFrame", "Scalar"]) -> "DataFrame":
247252
"""
248253
...
249254

250-
def __add__(self, other: Union["DataFrame", "Scalar"]) -> "DataFrame":
255+
def __add__(self, other: DataFrame | "Scalar") -> DataFrame:
251256
"""
252257
Parameters
253258
----------
@@ -262,7 +267,7 @@ def __add__(self, other: Union["DataFrame", "Scalar"]) -> "DataFrame":
262267
"""
263268
...
264269

265-
def __sub__(self, other: Union["DataFrame", "Scalar"]) -> "DataFrame":
270+
def __sub__(self, other: DataFrame | "Scalar") -> DataFrame:
266271
"""
267272
Parameters
268273
----------
@@ -277,7 +282,7 @@ def __sub__(self, other: Union["DataFrame", "Scalar"]) -> "DataFrame":
277282
"""
278283
...
279284

280-
def __mul__(self, other: Union["DataFrame", "Scalar"]) -> "DataFrame":
285+
def __mul__(self, other: DataFrame | "Scalar") -> DataFrame:
281286
"""
282287
Parameters
283288
----------
@@ -292,7 +297,7 @@ def __mul__(self, other: Union["DataFrame", "Scalar"]) -> "DataFrame":
292297
"""
293298
...
294299

295-
def __truediv__(self, other: Union["DataFrame", "Scalar"]) -> "DataFrame":
300+
def __truediv__(self, other: DataFrame | "Scalar") -> DataFrame:
296301
"""
297302
Parameters
298303
----------
@@ -307,7 +312,7 @@ def __truediv__(self, other: Union["DataFrame", "Scalar"]) -> "DataFrame":
307312
"""
308313
...
309314

310-
def __floordiv__(self, other: Union["DataFrame", "Scalar"]) -> "DataFrame":
315+
def __floordiv__(self, other: DataFrame | "Scalar") -> DataFrame:
311316
"""
312317
Parameters
313318
----------
@@ -322,7 +327,7 @@ def __floordiv__(self, other: Union["DataFrame", "Scalar"]) -> "DataFrame":
322327
"""
323328
...
324329

325-
def __pow__(self, other: Union["DataFrame", "Scalar"]) -> "DataFrame":
330+
def __pow__(self, other: DataFrame | "Scalar") -> DataFrame:
326331
"""
327332
Parameters
328333
----------
@@ -337,7 +342,7 @@ def __pow__(self, other: Union["DataFrame", "Scalar"]) -> "DataFrame":
337342
"""
338343
...
339344

340-
def __mod__(self, other: Union["DataFrame", "Scalar"]) -> "DataFrame":
345+
def __mod__(self, other: DataFrame | "Scalar") -> DataFrame:
341346
"""
342347
Parameters
343348
----------
@@ -352,7 +357,7 @@ def __mod__(self, other: Union["DataFrame", "Scalar"]) -> "DataFrame":
352357
"""
353358
...
354359

355-
def __divmod__(self, other: Union["DataFrame", "Scalar"]) -> tuple["DataFrame", "DataFrame"]:
360+
def __divmod__(self, other: DataFrame | "Scalar") -> tuple[DataFrame, DataFrame]:
356361
"""
357362
Parameters
358363
----------
@@ -368,67 +373,67 @@ def __divmod__(self, other: Union["DataFrame", "Scalar"]) -> tuple["DataFrame",
368373
"""
369374
...
370375

371-
def any(self, skipna: bool = True) -> "DataFrame":
376+
def any(self, skipna: bool = True) -> DataFrame:
372377
"""
373378
Reduction returns a 1-row DataFrame.
374379
"""
375380
...
376381

377-
def all(self, skipna: bool = True) -> "DataFrame":
382+
def all(self, skipna: bool = True) -> DataFrame:
378383
"""
379384
Reduction returns a 1-row DataFrame.
380385
"""
381386
...
382387

383-
def min(self, skipna: bool = True) -> "DataFrame":
388+
def min(self, skipna: bool = True) -> DataFrame:
384389
"""
385390
Reduction returns a 1-row DataFrame.
386391
"""
387392
...
388393

389-
def max(self, skipna: bool = True) -> "DataFrame":
394+
def max(self, skipna: bool = True) -> DataFrame:
390395
"""
391396
Reduction returns a 1-row DataFrame.
392397
"""
393398
...
394399

395-
def sum(self, skipna: bool = True) -> "DataFrame":
400+
def sum(self, skipna: bool = True) -> DataFrame:
396401
"""
397402
Reduction returns a 1-row DataFrame.
398403
"""
399404
...
400405

401-
def prod(self, skipna: bool = True) -> "DataFrame":
406+
def prod(self, skipna: bool = True) -> DataFrame:
402407
"""
403408
Reduction returns a 1-row DataFrame.
404409
"""
405410
...
406411

407-
def median(self, skipna: bool = True) -> "DataFrame":
412+
def median(self, skipna: bool = True) -> DataFrame:
408413
"""
409414
Reduction returns a 1-row DataFrame.
410415
"""
411416
...
412417

413-
def mean(self, skipna: bool = True) -> "DataFrame":
418+
def mean(self, skipna: bool = True) -> DataFrame:
414419
"""
415420
Reduction returns a 1-row DataFrame.
416421
"""
417422
...
418423

419-
def std(self, skipna: bool = True) -> "DataFrame":
424+
def std(self, skipna: bool = True) -> DataFrame:
420425
"""
421426
Reduction returns a 1-row DataFrame.
422427
"""
423428
...
424429

425-
def var(self, skipna: bool = True) -> "DataFrame":
430+
def var(self, skipna: bool = True) -> DataFrame:
426431
"""
427432
Reduction returns a 1-row DataFrame.
428433
"""
429434
...
430435

431-
def isnull(self) -> "DataFrame":
436+
def isnull(self) -> DataFrame:
432437
"""
433438
Check for 'missing' or 'null' entries.
434439
@@ -446,7 +451,7 @@ def isnull(self) -> "DataFrame":
446451
"""
447452
...
448453

449-
def isnan(self) -> "DataFrame":
454+
def isnan(self) -> DataFrame:
450455
"""
451456
Check for nan-like entries.
452457

0 commit comments

Comments
 (0)