Skip to content

Commit 3667165

Browse files
Remove numpy pin from environment.yml on 1.2.x (pandas-dev#39998)
1 parent 4df87a3 commit 3667165

File tree

5 files changed

+6
-12
lines changed

5 files changed

+6
-12
lines changed

environment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ channels:
33
- conda-forge
44
dependencies:
55
# required
6-
- numpy>=1.16.5, <1.20 # gh-39513
6+
- numpy>=1.16.5
77
- python=3
88
- python-dateutil>=2.7.3
99
- pytz

pandas/tests/arrays/string_/test_string.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,8 @@
1414

1515
@pytest.fixture(
1616
params=[
17-
# pandas\tests\arrays\string_\test_string.py:16: error: List item 1 has
18-
# incompatible type "ParameterSet"; expected
19-
# "Sequence[Collection[object]]" [list-item]
2017
"string",
21-
pytest.param(
22-
"arrow_string", marks=skip_if_no_pyarrow
23-
), # type:ignore[list-item]
18+
pytest.param("arrow_string", marks=skip_if_no_pyarrow),
2419
]
2520
)
2621
def dtype(request):

pandas/tests/window/conftest.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,7 @@ def ignore_na(request):
100100

101101
@pytest.fixture(
102102
params=[
103-
pytest.param(
104-
"numba", marks=td.skip_if_no("numba", "0.46.0")
105-
), # type: ignore[list-item]
103+
pytest.param("numba", marks=td.skip_if_no("numba", "0.46.0")),
106104
"cython",
107105
]
108106
)
@@ -318,7 +316,7 @@ def halflife_with_times(request):
318316
"float64",
319317
"m8[ns]",
320318
"M8[ns]",
321-
pytest.param( # type: ignore[list-item]
319+
pytest.param(
322320
"datetime64[ns, UTC]",
323321
marks=pytest.mark.skip(
324322
"direct creation of extension dtype datetime64[ns, UTC] "

requirements-dev.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This file is auto-generated from environment.yml, do not modify.
22
# See that file for comments about the need/usage of each dependency.
33

4-
numpy>=1.16.5, <1.20
4+
numpy>=1.16.5
55
python-dateutil>=2.7.3
66
pytz
77
asv

setup.cfg

+1
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ strict_equality = True
122122
warn_redundant_casts = True
123123
warn_unused_ignores = True
124124
show_error_codes = True
125+
no_site_packages = True
125126

126127
[mypy-pandas.tests.*]
127128
check_untyped_defs=False

0 commit comments

Comments
 (0)