Skip to content

Commit 4bcb9f1

Browse files
ci python 3.9,3.10,3.10 and Looseversion everywhere
1 parent 27f3875 commit 4bcb9f1

File tree

2 files changed

+32
-41
lines changed

2 files changed

+32
-41
lines changed

azure-pipelines.yml

Lines changed: 30 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,21 @@ jobs:
55
vmImage: 'ubuntu-latest'
66
strategy:
77
matrix:
8-
Python37:
9-
python.version: '3.7'
10-
NUMPY_VERSION: "1.16.5"
11-
SCIPY_VERSION: "1.1.0"
12-
SKLEARN_VERSION: "0.24.1"
13-
Python38:
14-
python.version: '3.8'
15-
NUMPY_VERSION: "1.19.4"
16-
SCIPY_VERSION: "1.4.1"
17-
SKLEARN_VERSION: "0.24.1"
188
Python39:
199
python.version: '3.9'
2010
NUMPY_VERSION: "1.19.4"
2111
SCIPY_VERSION: "1.5.4"
22-
SKLEARN_VERSION: "nightly"
23-
Py39_sklearn1:
24-
python.version: '3.9'
25-
NUMPY_VERSION: "1.19.4"
26-
SCIPY_VERSION: "1.5.4"
27-
SKLEARN_VERSION: "1.0.0"
12+
SKLEARN_VERSION: "*"
13+
Python310:
14+
python.version: '3.10'
15+
NUMPY_VERSION: "1.26.1"
16+
SCIPY_VERSION: "1.11.3"
17+
SKLEARN_VERSION: "*"
18+
Python311:
19+
python.version: '3.10'
20+
NUMPY_VERSION: "1.26.1"
21+
SCIPY_VERSION: "1.11.3"
22+
SKLEARN_VERSION: "*"
2823

2924
variables:
3025
OMP_NUM_THREADS: '2'
@@ -71,19 +66,16 @@ jobs:
7166
vmImage: 'macOS-latest'
7267
strategy:
7368
matrix:
74-
Python37:
75-
python.version: '3.7'
76-
NUMPY_VERSION: "1.16.5"
77-
SCIPY_VERSION: "1.1.0"
78-
SKLEARN_VERSION: "0.24.1"
79-
Python38:
80-
python.version: '3.8'
69+
Python310:
70+
python.version: '3.10'
71+
NUMPY_VERSION: "1.26.1"
72+
SCIPY_VERSION: "1.11.3"
73+
SKLEARN_VERSION: "*"
74+
Python311:
75+
python.version: '3.10'
76+
NUMPY_VERSION: "1.26.1"
77+
SCIPY_VERSION: "1.11.3"
8178
SKLEARN_VERSION: "*"
82-
Py39_sklearn1:
83-
python.version: '3.9'
84-
NUMPY_VERSION: "1.19.4"
85-
SCIPY_VERSION: "1.5.4"
86-
SKLEARN_VERSION: "1.0.0"
8779
variables:
8880
OMP_NUM_THREADS: '2'
8981

@@ -127,17 +119,16 @@ jobs:
127119
vmImage: 'windows-latest'
128120
strategy:
129121
matrix:
130-
Python38:
131-
python_ver: '38'
132-
python.version: '3.8'
133-
NUMPY_VERSION: "1.18.2"
134-
SCIPY_VERSION: "1.4.1"
135-
SKLEARN_VERSION: "0.24.1"
136-
Py39_sklearn1:
137-
python.version: '3.9'
138-
NUMPY_VERSION: "1.19.4"
139-
SCIPY_VERSION: "1.5.4"
140-
SKLEARN_VERSION: "1.0.0"
122+
Python310:
123+
python.version: '3.10'
124+
NUMPY_VERSION: "1.26.1"
125+
SCIPY_VERSION: "1.11.3"
126+
SKLEARN_VERSION: "*"
127+
Python311:
128+
python.version: '3.10'
129+
NUMPY_VERSION: "1.26.1"
130+
SCIPY_VERSION: "1.11.3"
131+
SKLEARN_VERSION: "*"
141132

142133
variables:
143134
OMP_NUM_THREADS: '2'

sklearn_extra/cluster/_commonnn.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ def fit(self, X, y=None, sample_weight=None):
317317
318318
"""
319319

320-
if LooseVersion(sklearn.__version__) < LooseVersion("0.23.0"):
320+
if Version(sklearn.__version__) < Version("0.23.0"):
321321
X = check_array(X, accept_sparse="csr")
322322
else:
323323
X = self._validate_data(X, accept_sparse="csr")
@@ -329,7 +329,7 @@ def fit(self, X, y=None, sample_weight=None):
329329
warnings.warn(
330330
"Sample weights are not fully supported, yet.", UserWarning
331331
)
332-
if LooseVersion(sklearn.__version__) < LooseVersion("0.23.0"):
332+
if Version(sklearn.__version__) < Version("0.23.0"):
333333
sample_weight = np.asarray(sample_weight)
334334
check_consistent_length(X, sample_weight)
335335
else:

0 commit comments

Comments
 (0)