Skip to content

Commit 8500b40

Browse files
authored
MAINT Increment min scikit-learn version to 0.23.0 (#101)
1 parent 1a774a7 commit 8500b40

File tree

5 files changed

+20
-26
lines changed

5 files changed

+20
-26
lines changed

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Dependencies
3333
scikit-learn-extra requires,
3434

3535
- Python (>=3.6)
36-
- scikit-learn (>=0.22), and its dependencies
36+
- scikit-learn (>=0.23), and its dependencies
3737

3838

3939
User installation

azure-pipelines.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ jobs:
99
python.version: '3.6'
1010
NUMPY_VERSION: "1.13.3"
1111
SCIPY_VERSION: "0.19.1"
12-
SKLEARN_VERSION: "0.22.2post1"
12+
SKLEARN_VERSION: "0.23.0"
1313
Python37:
1414
python.version: '3.7'
1515
NUMPY_VERSION: "1.16.5"
1616
SCIPY_VERSION: "1.1.0"
17-
SKLEARN_VERSION: "0.22.2post1"
17+
SKLEARN_VERSION: "0.23.2"
1818
Python38:
1919
python.version: '3.8'
2020
NUMPY_VERSION: "1.19.4"
2121
SCIPY_VERSION: "1.4.1"
22-
SKLEARN_VERSION: "0.23.2"
22+
SKLEARN_VERSION: "0.24.1"
2323
Python39:
2424
python.version: '3.9'
2525
NUMPY_VERSION: "1.19.4"
@@ -74,12 +74,12 @@ jobs:
7474
python.version: '3.6'
7575
NUMPY_VERSION: "1.13.3"
7676
SCIPY_VERSION: "0.19.1"
77-
SKLEARN_VERSION: "0.22.2post1"
77+
SKLEARN_VERSION: "0.23.2"
7878
Python37:
7979
python.version: '3.7'
8080
NUMPY_VERSION: "1.16.5"
8181
SCIPY_VERSION: "1.1.0"
82-
SKLEARN_VERSION: "0.22.2post1"
82+
SKLEARN_VERSION: "0.24.1"
8383
Python38:
8484
python.version: '3.8'
8585
SKLEARN_VERSION: "*"
@@ -131,13 +131,13 @@ jobs:
131131
python.version: '3.6'
132132
NUMPY_VERSION: "1.13.3"
133133
SCIPY_VERSION: "1.0.1"
134-
SKLEARN_VERSION: "0.22.2post1"
134+
SKLEARN_VERSION: "0.23.2"
135135
Python38:
136136
python_ver: '38'
137137
python.version: '3.8'
138138
NUMPY_VERSION: "1.18.2"
139139
SCIPY_VERSION: "1.4.1"
140-
SKLEARN_VERSION: "0.22.2post1"
140+
SKLEARN_VERSION: "0.24.1"
141141
variables:
142142
OMP_NUM_THREADS: '2'
143143

doc/install.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Dependencies
77
scikit-learn-extra requires,
88

99
- Python (>=3.6)
10-
- scikit-learn (>=0.22), and its dependencies
10+
- scikit-learn (>=0.23), and its dependencies
1111

1212

1313
User installation

pyproject.toml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
[build-system]
2-
# build with the oldest numpy that has pre-build wheels for Py3.7 on PyPi
2+
# Minimum requirements for the build system to execute.
33
requires = [
44
"setuptools",
55
"wheel",
6-
"cython>=0.28",
7-
"numpy==1.13.3; python_version=='3.5' and platform_system!='AIX'",
8-
"numpy==1.13.3; python_version=='3.6' and platform_system!='AIX'",
9-
"numpy==1.14.5; python_version=='3.7' and platform_system!='AIX'",
10-
"numpy==1.17.3; python_version>='3.8' and platform_system!='AIX'",
11-
# Minimum supported numpy 1.16 for AIX
12-
# see https://github.com/scipy/scipy/pull/10431
13-
"numpy==1.16.0; python_version=='3.5' and platform_system=='AIX'",
14-
"numpy==1.16.0; python_version=='3.6' and platform_system=='AIX'",
15-
"numpy==1.16.0; python_version=='3.7' and platform_system=='AIX'",
16-
"numpy==1.17.3; python_version>='3.8' and platform_system=='AIX'",
6+
"Cython>=0.28.5",
7+
8+
# use oldest-supported-numpy which provides the oldest numpy version with
9+
# wheels on PyPI
10+
#
11+
# see: https://github.com/scipy/oldest-supported-numpy/blob/master/setup.cfg
12+
"oldest-supported-numpy"
1713
]
1814

1915
[tool.black]

setup.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@
2020
DESCRIPTION = "A set of tools for scikit-learn."
2121
with codecs.open("README.rst", encoding="utf-8-sig") as f:
2222
LONG_DESCRIPTION = f.read()
23-
MAINTAINER = "G. Lemaitre"
24-
MAINTAINER_EMAIL = "[email protected]"
2523
URL = "https://github.com/scikit-learn-contrib/scikit-learn-extra"
2624
LICENSE = "new BSD"
2725
DOWNLOAD_URL = "https://github.com/scikit-learn-contrib/scikit-learn-extra"
2826
VERSION = __version__ # noqa
29-
INSTALL_REQUIRES = ["numpy>=1.13.3", "scipy>=0.19.1", "scikit-learn>=0.22.0"]
27+
INSTALL_REQUIRES = ["numpy>=1.13.3", "scipy>=0.19.1", "scikit-learn>=0.23.0"]
3028
CLASSIFIERS = [
3129
"Intended Audience :: Science/Research",
3230
"Intended Audience :: Developers",
@@ -41,6 +39,7 @@
4139
"Programming Language :: Python :: 3.6",
4240
"Programming Language :: Python :: 3.7",
4341
"Programming Language :: Python :: 3.8",
42+
"Programming Language :: Python :: 3.9",
4443
"Programming Language :: Python :: Implementation :: CPython",
4544
]
4645
EXTRAS_REQUIRE = {
@@ -91,8 +90,6 @@
9190

9291
setup(
9392
name=DISTNAME,
94-
maintainer=MAINTAINER,
95-
maintainer_email=MAINTAINER_EMAIL,
9693
description=DESCRIPTION,
9794
license=LICENSE,
9895
url=URL,
@@ -104,5 +101,6 @@
104101
packages=find_packages(),
105102
install_requires=INSTALL_REQUIRES,
106103
extras_require=EXTRAS_REQUIRE,
104+
python_requires=">=3.6",
107105
**args
108106
)

0 commit comments

Comments
 (0)