Skip to content

Commit ebd254d

Browse files
committed
DEPS: drop 3.6 (pandas-dev#34472)
1 parent 2c3edaa commit ebd254d

13 files changed

+26
-55
lines changed

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ matrix:
4545
- JOB="3.7, arm64" PYTEST_WORKERS=8 ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard)"
4646

4747
- env:
48-
- JOB="3.6, locale" ENV_FILE="ci/deps/travis-36-locale.yaml" PATTERN="((not slow and not network and not clipboard) or (single and db))" LOCALE_OVERRIDE="zh_CN.UTF-8" SQL="1"
48+
- JOB="3.7, locale" ENV_FILE="ci/deps/travis-37-locale.yaml" PATTERN="((not slow and not network and not clipboard) or (single and db))" LOCALE_OVERRIDE="zh_CN.UTF-8" SQL="1"
4949
services:
5050
- mysql
5151
- postgresql
@@ -54,7 +54,7 @@ matrix:
5454
# Enabling Deprecations when running tests
5555
# PANDAS_TESTING_MODE="deprecate" causes DeprecationWarning messages to be displayed in the logs
5656
# See pandas/_testing.py for more details.
57-
- JOB="3.6, coverage" ENV_FILE="ci/deps/travis-36-cov.yaml" PATTERN="((not slow and not network and not clipboard) or (single and db))" PANDAS_TESTING_MODE="deprecate" COVERAGE=true SQL="1"
57+
- JOB="3.7, coverage" ENV_FILE="ci/deps/travis-37-cov.yaml" PATTERN="((not slow and not network and not clipboard) or (single and db))" PANDAS_TESTING_MODE="deprecate" COVERAGE=true SQL="1"
5858
services:
5959
- mysql
6060
- postgresql

ci/azure/posix.yml

+5-28
Original file line numberDiff line numberDiff line change
@@ -9,40 +9,17 @@ jobs:
99
strategy:
1010
matrix:
1111
${{ if eq(parameters.name, 'macOS') }}:
12-
py36_macos:
13-
ENV_FILE: ci/deps/azure-macos-36.yaml
14-
CONDA_PY: "36"
12+
py37_macos:
13+
ENV_FILE: ci/deps/azure-macos-37.yaml
14+
CONDA_PY: "37"
1515
PATTERN: "not slow and not network"
1616

1717
${{ if eq(parameters.name, 'Linux') }}:
1818
py36_minimum_versions:
19-
ENV_FILE: ci/deps/azure-36-minimum_versions.yaml
20-
CONDA_PY: "36"
19+
ENV_FILE: ci/deps/azure-37minimum_versions.yaml
20+
CONDA_PY: "37"
2121
PATTERN: "not slow and not network and not clipboard"
2222

23-
py36_locale_slow_old_np:
24-
ENV_FILE: ci/deps/azure-36-locale_slow.yaml
25-
CONDA_PY: "36"
26-
PATTERN: "slow"
27-
# pandas does not use the language (zh_CN), but should support different encodings (utf8)
28-
# we should test with encodings different than utf8, but doesn't seem like Ubuntu supports any
29-
LANG: "zh_CN.utf8"
30-
LC_ALL: "zh_CN.utf8"
31-
EXTRA_APT: "language-pack-zh-hans"
32-
33-
py36_slow:
34-
ENV_FILE: ci/deps/azure-36-slow.yaml
35-
CONDA_PY: "36"
36-
PATTERN: "slow"
37-
38-
py36_locale:
39-
ENV_FILE: ci/deps/azure-36-locale.yaml
40-
CONDA_PY: "36"
41-
PATTERN: "not slow and not network"
42-
LANG: "it_IT.utf8"
43-
LC_ALL: "it_IT.utf8"
44-
EXTRA_APT: "language-pack-it xsel"
45-
4623
#py36_32bit:
4724
# ENV_FILE: ci/deps/azure-36-32bit.yaml
4825
# CONDA_PY: "36"

ci/azure/windows.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ jobs:
99
strategy:
1010
matrix:
1111
py36_np15:
12-
ENV_FILE: ci/deps/azure-windows-36.yaml
13-
CONDA_PY: "36"
12+
ENV_FILE: ci/deps/azure-windows-37.yaml
13+
CONDA_PY: "37"
1414
PATTERN: "not slow and not network"
1515

1616
py37_np18:
17-
ENV_FILE: ci/deps/azure-windows-37.yaml
18-
CONDA_PY: "37"
17+
ENV_FILE: ci/deps/azure-windows-38.yaml
18+
CONDA_PY: "38"
1919
PATTERN: "not slow and not network"
2020

2121
steps:

ci/deps/azure-36-minimum_versions.yaml renamed to ci/deps/azure-37-minimum_versions.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies:
1414

1515
# pandas dependencies
1616
- beautifulsoup4=4.6.0
17-
- bottleneck=1.2.1
17+
- bottleneck=1.3.1
1818
- jinja2=2.8
1919
- numba=0.46.0
2020
- numexpr=2.6.2

ci/deps/azure-macos-36.yaml renamed to ci/deps/azure-macos-37.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: pandas-dev
22
channels:
33
- defaults
44
dependencies:
5-
- python=3.6.*
5+
- python=3.7.*
66

77
# tools
88
- pytest>=5.0.1

ci/deps/azure-windows-36.yaml renamed to ci/deps/azure-windows-38.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ channels:
33
- conda-forge
44
- defaults
55
dependencies:
6-
- python=3.6.*
6+
- python=3.8.*
77

88
# tools
99
- cython>=0.29.16
@@ -19,7 +19,7 @@ dependencies:
1919
- matplotlib=3.0.2
2020
- numba
2121
- numexpr
22-
- numpy=1.15.*
22+
- numpy=1.16.*
2323
- openpyxl
2424
- jinja2
2525
- pyarrow>=0.13.0

ci/deps/travis-36-cov.yaml renamed to ci/deps/travis-37-cov.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ channels:
33
- defaults
44
- conda-forge
55
dependencies:
6-
- python=3.6.*
6+
- python=3.7.*
77

88
# tools
99
- cython>=0.29.16
@@ -26,7 +26,7 @@ dependencies:
2626
- moto
2727
- nomkl
2828
- numexpr
29-
- numpy=1.15.*
29+
- numpy=1.16.*
3030
- odfpy
3131
- openpyxl
3232
- pandas-gbq

ci/deps/travis-36-locale.yaml renamed to ci/deps/travis-37-locale.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ channels:
33
- defaults
44
- conda-forge
55
dependencies:
6-
- python=3.6.*
6+
- python=3.7.*
77

88
# tools
99
- cython>=0.29.16

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.15
6+
- numpy>=1.16
77
- python=3
88
- python-dateutil>=2.7.3
99
- pytz

pandas/compat/numpy/__init__.py

+3-5
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,18 @@
88
# numpy versioning
99
_np_version = np.__version__
1010
_nlv = LooseVersion(_np_version)
11-
_np_version_under1p16 = _nlv < LooseVersion("1.16")
1211
_np_version_under1p17 = _nlv < LooseVersion("1.17")
1312
_np_version_under1p18 = _nlv < LooseVersion("1.18")
1413
_np_version_under1p19 = _nlv < LooseVersion("1.19")
1514
_np_version_under1p20 = _nlv < LooseVersion("1.20")
1615
_is_numpy_dev = ".dev" in str(_nlv)
1716

1817

19-
if _nlv < "1.15.4":
18+
if _nlv < "1.16.0":
2019
raise ImportError(
21-
"this version of pandas is incompatible with numpy < 1.15.4\n"
20+
"this version of pandas is incompatible with numpy < 1.16.0\n"
2221
f"your numpy version is {_np_version}.\n"
23-
"Please upgrade numpy to >= 1.15.4 to use this pandas version"
22+
"Please upgrade numpy to >= 1.16.0 to use this pandas version"
2423
)
2524

2625

@@ -65,7 +64,6 @@ def np_array_datetime64_compat(arr, *args, **kwargs):
6564
__all__ = [
6665
"np",
6766
"_np_version",
68-
"_np_version_under1p16",
6967
"_np_version_under1p17",
7068
"_is_numpy_dev",
7169
]

pandas/tests/api/test_api.py

-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ class TestPDApi(Base):
193193
"_hashtable",
194194
"_lib",
195195
"_libs",
196-
"_np_version_under1p16",
197196
"_np_version_under1p17",
198197
"_np_version_under1p18",
199198
"_is_numpy_dev",

pyproject.toml

+2-4
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,14 @@ requires = [
55
"setuptools",
66
"wheel",
77
"Cython>=0.29.16", # Note: sync with setup.py
8-
"numpy==1.15.4; python_version=='3.6' and platform_system!='AIX'",
9-
"numpy==1.15.4; python_version=='3.7' and platform_system!='AIX'",
8+
"numpy==1.16.0; python_version=='3.7' and platform_system!='AIX'",
109
"numpy==1.17.3; python_version>='3.8' and platform_system!='AIX'",
11-
"numpy==1.16.0; python_version=='3.6' and platform_system=='AIX'",
1210
"numpy==1.16.0; python_version=='3.7' and platform_system=='AIX'",
1311
"numpy==1.17.3; python_version>='3.8' and platform_system=='AIX'",
1412
]
1513

1614
[tool.black]
17-
target-version = ['py36', 'py37', 'py38']
15+
target-version = ['py37', 'py38']
1816
exclude = '''
1917
(
2018
asv_bench/env

setup.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def is_platform_mac():
3333
return sys.platform == "darwin"
3434

3535

36-
min_numpy_ver = "1.15.4"
36+
min_numpy_ver = "1.16.0"
3737
min_cython_ver = "0.29.16" # note: sync with pyproject.toml
3838

3939
try:
@@ -197,7 +197,6 @@ def build_extensions(self):
197197
"Intended Audience :: Science/Research",
198198
"Programming Language :: Python",
199199
"Programming Language :: Python :: 3",
200-
"Programming Language :: Python :: 3.6",
201200
"Programming Language :: Python :: 3.7",
202201
"Programming Language :: Python :: 3.8",
203202
"Programming Language :: Cython",
@@ -771,7 +770,7 @@ def setup_package():
771770
long_description=LONG_DESCRIPTION,
772771
classifiers=CLASSIFIERS,
773772
platforms="any",
774-
python_requires=">=3.6.1",
773+
python_requires=">=3.7.1",
775774
extras_require={
776775
"test": [
777776
# sync with setup.cfg minversion & install.rst

0 commit comments

Comments
 (0)