Skip to content

Commit bcc6f6f

Browse files
authored
Add LooseVersion for case with unavailable packaging (#957)
1 parent 0ea7f69 commit bcc6f6f

File tree

11 files changed

+44
-11
lines changed

11 files changed

+44
-11
lines changed

.circleci/deselect_tests.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
import argparse
2020
import os.path
2121
from yaml import FullLoader, load as yaml_load
22-
from packaging.version import Version
22+
try:
23+
from packaging.version import Version
24+
except ImportError:
25+
from distutils.version import LooseVersion as Version
2326
import sklearn
2427
from sklearn import __version__ as sklearn_version
2528
import warnings

daal4py/sklearn/_utils.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919

2020
from daal4py import _get__daal_link_version__ as dv
2121
from sklearn import __version__ as sklearn_version
22-
from packaging.version import Version
22+
try:
23+
from packaging.version import Version
24+
except ImportError:
25+
from distutils.version import LooseVersion as Version
2326
import logging
2427

2528

daal4py/sklearn/ensemble/AdaBoostClassifier.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@
2626
from .._utils import getFPType
2727

2828
from sklearn import __version__ as sklearn_version
29-
from packaging.version import Version
29+
try:
30+
from packaging.version import Version
31+
except ImportError:
32+
from distutils.version import LooseVersion as Version
3033

3134

3235
class AdaBoostClassifier(BaseEstimator, ClassifierMixin):

daal4py/sklearn/svm/_svm_0_23.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@
3333
from sklearn.utils.multiclass import _ovr_decision_function
3434
from sklearn.model_selection import StratifiedKFold
3535

36-
from packaging.version import Version
36+
try:
37+
from packaging.version import Version
38+
except ImportError:
39+
from distutils.version import LooseVersion as Version
3740
from sklearn import __version__ as sklearn_version
3841

3942
import daal4py

sklearnex/neighbors/knn_classification.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@
1515
# limitations under the License.
1616
#===============================================================================
1717

18-
from packaging.version import Version
18+
try:
19+
from packaging.version import Version
20+
except ImportError:
21+
from distutils.version import LooseVersion as Version
1922
from sklearn import __version__ as sklearn_version
2023
import warnings
2124

sklearnex/neighbors/knn_unsupervised.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@
1515
# limitations under the License.
1616
#===============================================================================
1717

18-
from packaging.version import Version
18+
try:
19+
from packaging.version import Version
20+
except ImportError:
21+
from distutils.version import LooseVersion as Version
1922
from sklearn import __version__ as sklearn_version
2023
import warnings
2124

sklearnex/svm/_common.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616

1717
from abc import ABC
1818
import numpy as np
19-
from packaging.version import Version
19+
try:
20+
from packaging.version import Version
21+
except ImportError:
22+
from distutils.version import LooseVersion as Version
2023

2124
from sklearn.model_selection import StratifiedKFold
2225
from sklearn.preprocessing import LabelEncoder

sklearnex/svm/nusvc.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@
2121
from sklearn.utils.validation import _deprecate_positional_args
2222
from sklearn.exceptions import NotFittedError
2323
from sklearn import __version__ as sklearn_version
24-
from packaging.version import Version
24+
try:
25+
from packaging.version import Version
26+
except ImportError:
27+
from distutils.version import LooseVersion as Version
2528

2629
from onedal.svm import NuSVC as onedal_NuSVC
2730

sklearnex/svm/nusvr.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@
2121
from sklearn.utils.validation import _deprecate_positional_args
2222
from sklearn import __version__ as sklearn_version
2323

24-
from packaging.version import Version
24+
try:
25+
from packaging.version import Version
26+
except ImportError:
27+
from distutils.version import LooseVersion as Version
2528
from onedal.svm import NuSVR as onedal_NuSVR
2629

2730

sklearnex/svm/svc.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@
2121
from sklearn.utils.validation import _deprecate_positional_args
2222
from sklearn.exceptions import NotFittedError
2323
from sklearn import __version__ as sklearn_version
24-
from packaging.version import Version
24+
try:
25+
from packaging.version import Version
26+
except ImportError:
27+
from distutils.version import LooseVersion as Version
2528

2629
from onedal.svm import SVC as onedal_SVC
2730

0 commit comments

Comments
 (0)