Skip to content

Commit d27da82

Browse files
jbrockmendeljbrockmendel
committed
Merge branch 'main' into depr-sparse-astype
2 parents 0b6a543 + 4e034ec commit d27da82

File tree

113 files changed

+1400
-1003
lines changed

Some content is hidden

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

113 files changed

+1400
-1003
lines changed

‎.github/workflows/posix.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ jobs:
2828
[actions-38-downstream_compat.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
2929
[actions-38-minimum_versions.yaml, "slow", "", "", "", "", ""],
3030
[actions-38-minimum_versions.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
31-
[actions-38-locale_slow.yaml, "slow", "language-pack-it xsel", "it_IT.utf8", "it_IT.utf8", "", ""],
31+
[actions-38.yaml, "not slow and not network", "language-pack-it xsel", "it_IT.utf8", "it_IT.utf8", "", ""],
32+
[actions-38.yaml, "not slow and not network", "language-pack-zh-hans xsel", "zh_CN.utf8", "zh_CN.utf8", "", ""],
3233
[actions-38.yaml, "not slow and not clipboard", "", "", "", "", ""],
33-
[actions-38-slow.yaml, "slow", "", "", "", "", ""],
34-
[actions-38-locale.yaml, "not slow and not network", "language-pack-zh-hans xsel", "zh_CN.utf8", "zh_CN.utf8", "", ""],
35-
[actions-39-slow.yaml, "slow", "", "", "", "", ""],
34+
[actions-38.yaml, "slow", "", "", "", "", ""],
3635
[actions-pypy-38.yaml, "not slow and not clipboard", "", "", "", "", "--max-worker-restart 0"],
3736
[actions-39-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"],
37+
[actions-39.yaml, "slow", "", "", "", "", ""],
3838
[actions-39.yaml, "not slow and not clipboard", "", "", "", "", ""]
3939
]
4040
fail-fast: false

‎.github/workflows/stale-pr.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ jobs:
1414
stale-pr-message: "This pull request is stale because it has been open for thirty days with no activity. Please [update](https://pandas.pydata.org/pandas-docs/stable/development/contributing.html#updating-your-pull-request) and respond to this comment if you're still interested in working on this."
1515
stale-pr-label: "Stale"
1616
exempt-pr-labels: "Needs Review,Blocked,Needs Discussion"
17-
days-before-stale: 30
17+
days-before-issue-stale: -1
18+
days-before-pr-stale: 30
1819
days-before-close: -1
1920
remove-stale-when-updated: false
2021
debug-only: false

‎asv_bench/benchmarks/strings.py‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
import numpy as np
44

55
from pandas import (
6+
NA,
67
Categorical,
78
DataFrame,
89
Series,
910
)
11+
from pandas.arrays import StringArray
1012

1113
from .pandas_vb_common import tm
1214

@@ -285,3 +287,18 @@ class Iter(Dtypes):
285287
def time_iter(self, dtype):
286288
for i in self.s:
287289
pass
290+
291+
292+
class StringArrayConstruction:
293+
def setup(self):
294+
self.series_arr = tm.rands_array(nchars=10, size=10 ** 5)
295+
self.series_arr_nan = np.concatenate([self.series_arr, np.array([NA] * 1000)])
296+
297+
def time_string_array_construction(self):
298+
StringArray(self.series_arr)
299+
300+
def time_string_array_with_nan_construction(self):
301+
StringArray(self.series_arr_nan)
302+
303+
def peakmem_stringarray_construction(self):
304+
StringArray(self.series_arr)

‎ci/deps/actions-38-locale.yaml‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎ci/deps/actions-38-locale_slow.yaml‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎ci/deps/actions-38-slow.yaml‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎ci/deps/actions-38.yaml‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,50 @@
11
name: pandas-dev
22
channels:
3-
- defaults
43
- conda-forge
54
dependencies:
65
- python=3.8
76

8-
# tools
9-
- cython>=0.29.24
7+
# test dependencies
8+
- cython=0.29.24
109
- pytest>=6.0
1110
- pytest-cov
1211
- pytest-xdist>=1.31
1312
- hypothesis>=5.5.3
13+
- psutil
1414

15-
# pandas dependencies
16-
- numpy
15+
# required dependencies
1716
- python-dateutil
18-
- nomkl
17+
- numpy
1918
- pytz
19+
20+
# optional dependencies
21+
- beautifulsoup4
22+
- blosc
23+
- bottleneck
24+
- fastparquet
25+
- fsspec
26+
- html5lib
27+
- gcsfs
28+
- jinja2
29+
- lxml
30+
- matplotlib
31+
- numba
32+
- numexpr
33+
- openpyxl
34+
- odfpy
35+
- pandas-gbq
36+
- psycopg2
37+
- pymysql
38+
- pytables
39+
- pyarrow
40+
- pyreadstat
41+
- pyxlsb
42+
- s3fs
43+
- scipy
44+
- sqlalchemy
2045
- tabulate
46+
- xarray
47+
- xlrd
48+
- xlsxwriter
49+
- xlwt
50+
- zstandard

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

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎ci/deps/actions-39.yaml‎

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,47 @@ channels:
44
dependencies:
55
- python=3.9
66

7-
# tools
8-
- cython>=0.29.24
7+
# test dependencies
8+
- cython=0.29.24
99
- pytest>=6.0
1010
- pytest-cov
1111
- pytest-xdist>=1.31
1212
- hypothesis>=5.5.3
13+
- psutil
1314

14-
# pandas dependencies
15+
# required dependencies
16+
- python-dateutil
17+
- numpy
18+
- pytz
19+
20+
# optional dependencies
1521
- beautifulsoup4
22+
- blosc
1623
- bottleneck
17-
- boto3
18-
- fsspec>=0.8.0
19-
- gcsfs
24+
- fastparquet
25+
- fsspec
2026
- html5lib
27+
- gcsfs
2128
- jinja2
2229
- lxml
2330
- matplotlib
24-
- numpy # move up to solve before numba
2531
- numba
2632
- numexpr
2733
- openpyxl
28-
- pyarrow>2.0.1
34+
- odfpy
35+
- pandas-gbq
36+
- psycopg2
37+
- pymysql
2938
- pytables
30-
- python-dateutil
31-
- pytz
32-
- s3fs>=0.4.2
39+
- pyarrow
40+
- pyreadstat
41+
- pyxlsb
42+
- s3fs
3343
- scipy
3444
- sqlalchemy
45+
- tabulate
46+
- xarray
3547
- xlrd
3648
- xlsxwriter
3749
- xlwt
38-
- pyreadstat
39-
- pyxlsb
4050
- zstandard

‎doc/source/reference/arrays.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ be stored efficiently as a :class:`arrays.SparseArray`.
464464

465465
The ``Series.sparse`` accessor may be used to access sparse-specific attributes
466466
and methods if the :class:`Series` contains sparse values. See
467-
:ref:`api.series.sparse` for more.
467+
:ref:`api.series.sparse` and :ref:`the user guide <sparse>` for more.
468468

469469

470470
.. _api.arrays.string:

0 commit comments

Comments
 (0)