Skip to content

Commit ef13449

Browse files
committed
DEPS: resolve min version conflicts (pandas-dev#34472)
1 parent d6ccbaf commit ef13449

File tree

4 files changed

+12
-15
lines changed

4 files changed

+12
-15
lines changed
+10-10
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
name: pandas-dev
1+
name: pandas-test
22
channels:
33
- conda-forge
44
dependencies:
5-
- python=3.7.1
5+
- python=3.7.0
66

77
# tools
88
- cython=0.29.16
@@ -15,16 +15,16 @@ dependencies:
1515
# pandas dependencies
1616
- beautifulsoup4=4.6.0
1717
- bottleneck=1.2.1
18-
- jinja2=2.8
18+
- jinja2=2.10
1919
- numba=0.46.0
20-
- numexpr=2.6.2
20+
- numexpr=2.6.8
2121
- numpy=1.16.0
2222
- openpyxl=2.5.7
23-
- pytables=3.4.3
24-
- python-dateutil=2.7.3
25-
- pytz=2017.2
23+
- pytables=3.5.0
24+
- python-dateutil=2.7.4
25+
- pytz=2018.3
2626
- scipy=1.2
2727
- xlrd=1.1.0
28-
- xlsxwriter=0.9.8
29-
- xlwt=1.2.0
30-
- html5lib=1.0.1
28+
- xlsxwriter=1.0.2
29+
- xlwt=1.3.0
30+
- html5lib=1.0.1

ci/deps/azure-windows-38.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies:
1616
- blosc
1717
- bottleneck
1818
- fastparquet>=0.3.2
19-
- matplotlib=3.0.2
19+
- matplotlib=3.1.0
2020
- numba
2121
- numexpr
2222
- numpy=1.18.*

pandas/tests/arrays/categorical/test_constructors.py

-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import numpy as np
44
import pytest
55

6-
from pandas.compat.numpy import _np_version_under1p16
7-
86
from pandas.core.dtypes.common import is_float_dtype, is_integer_dtype
97
from pandas.core.dtypes.dtypes import CategoricalDtype
108

@@ -637,7 +635,6 @@ def test_constructor_imaginary(self):
637635
tm.assert_index_equal(c1.categories, Index(values))
638636
tm.assert_numpy_array_equal(np.array(c1), np.array(values))
639637

640-
@pytest.mark.skipif(_np_version_under1p16, reason="Skipping for NumPy <1.16")
641638
def test_constructor_string_and_tuples(self):
642639
# GH 21416
643640
c = pd.Categorical(np.array(["c", ("a", "b"), ("b", "a"), "c"], dtype=object))

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,7 @@ def setup_package():
765765
long_description=LONG_DESCRIPTION,
766766
classifiers=CLASSIFIERS,
767767
platforms="any",
768-
python_requires=">=3.7.1",
768+
python_requires=">=3.7.0",
769769
extras_require={
770770
"test": [
771771
# sync with setup.cfg minversion & install.rst

0 commit comments

Comments
 (0)