1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
|
Description: Replace distutils which is removed in Python3.12
Bug-Debian: https://bugs.debian.org/1059921
Author: Andreas Tille <tille@debian.org>
Last-Update: Thu, 04 Jan 2024 11:25:24 +0100
--- a/intake/container/dataframe.py
+++ b/intake/container/dataframe.py
@@ -4,7 +4,7 @@
#
# The full license is in the LICENSE file, distributed with this software.
#-----------------------------------------------------------------------------
-from distutils.version import LooseVersion
+from packaging.version import Version
from intake.source.base import Schema, DataSource
@@ -38,7 +38,7 @@ class RemoteDataFrame(RemoteSource):
self.url, self.headers, self._source_id, self.container, i
)
for i in range(self.npartitions)]
- if LooseVersion(dask.__version__) < LooseVersion("2.5.0"):
+ if Version(dask.__version__) < Version("2.5.0"):
self.dataframe = dd.from_delayed(self.parts)
else:
self.dataframe = dd.from_delayed(self.parts, verify_meta=self.verify)
--- a/intake/interface/__init__.py
+++ b/intake/interface/__init__.py
@@ -4,7 +4,7 @@
#
# The full license is in the LICENSE file, distributed with this software.
#-----------------------------------------------------------------------------
-from distutils.version import LooseVersion
+from packaging.version import Version
gl = globals()
@@ -13,7 +13,7 @@ def do_import():
error = too_old = False
try:
import panel as pn
- too_old = LooseVersion(pn.__version__) < LooseVersion("0.9.5")
+ too_old = Version(pn.__version__) < Version("0.9.5")
except ImportError as e:
error = e
--- a/intake/interface/source/defined_plots.py
+++ b/intake/interface/source/defined_plots.py
@@ -4,18 +4,18 @@
#
# The full license is in the LICENSE file, distributed with this software.
#-----------------------------------------------------------------------------
-from distutils.version import LooseVersion
+from packaging.version import Version
try:
import dfviz
- assert LooseVersion(dfviz.__version__) >= LooseVersion("0.1.0")
+ assert Version(dfviz.__version__) >= Version("0.1.0")
except ImportError:
dfviz = False
try:
import xrviz
from xrviz.dashboard import Dashboard as XRViz
- assert LooseVersion(xrviz.__version__) >= LooseVersion("0.1.1")
+ assert Version(xrviz.__version__) >= Version("0.1.1")
except ImportError:
xrviz = False
--- a/intake/interface/source/tests/test_gui.py
+++ b/intake/interface/source/tests/test_gui.py
@@ -4,10 +4,10 @@
#
# The full license is in the LICENSE file, distributed with this software.
#-----------------------------------------------------------------------------
-from distutils.version import LooseVersion
+from packaging.version import Version
import pytest
pn = pytest.importorskip('panel')
-too_old = LooseVersion(pn.__version__) < LooseVersion("0.9.5")
+too_old = Version(pn.__version__) < Version("0.9.5")
@pytest.mark.skipif(too_old, reason="Use with latest panel")
--- a/intake/source/utils.py
+++ b/intake/source/utils.py
@@ -5,10 +5,10 @@
# The full license is in the LICENSE file, distributed with this software.
#-----------------------------------------------------------------------------
-from distutils.version import LooseVersion
+from packaging.version import Version
try:
import dask
- DASK_VERSION = LooseVersion(dask.__version__)
+ DASK_VERSION = Version(dask.__version__)
except:
DASK_VERSION = None
from ..utils import make_path_posix
--- a/intake/catalog/default.py
+++ b/intake/catalog/default.py
@@ -8,6 +8,7 @@
import appdirs
import json
import os
+import shutil
import subprocess
import sys
@@ -51,11 +52,9 @@ def conda_prefix():
except (subprocess.CalledProcessError, json.JSONDecodeError, OSError):
return False
-
def which(program):
"""Emulate posix ``which``"""
- import distutils.spawn
- return distutils.spawn.find_executable(program)
+ return shutil.which(program)
def global_data_dir():
--- a/versioneer.py
+++ b/versioneer.py
@@ -1499,6 +1499,7 @@ def get_cmdclass():
cmds = {}
# we add "version" to both distutils and setuptools
+ import setuptools
from distutils.core import Command
class cmd_version(Command):
|
