File: change_setuptools_dep_to_packaging.patch

package info (click to toggle)
spyder 6.0.5%2Bds-7
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 24,676 kB
  • sloc: python: 121,632; sh: 420; xml: 142; javascript: 131; cpp: 67; makefile: 20; ansic: 19; erlang: 15; lisp: 11; java: 5
file content (102 lines) | stat: -rw-r--r-- 3,137 bytes parent folder | download | duplicates (2)
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
Description: Spyder declares a runtime dependency on setuptools rather
 than on packaging; this was due to a change in the package-version
 code without a corresponding change in the dependencies.  This patch
 fixes this.
Forwarded: https://github.com/spyder-ide/spyder/pull/24114
Author: Alexandre Detiste <tchet@debian.org>, Julian Gilbey <jdg@debian.org>
Last-Update: 2025-04-02

--- a/requirements/main.yml
+++ b/requirements/main.yml
@@ -24,6 +24,7 @@
   - keyring >=17.0.0
   - nbconvert >=4.0
   - numpydoc >=0.6.0
+  - packaging >=20.0
   - parso >=0.7.0,<0.9.0
   - pexpect >=4.4.0
   - pickleshare >=0.4
@@ -45,7 +46,6 @@
   - qtconsole >=5.6.1,<5.7.0
   - qtpy >=2.4.0
   - rtree >=0.9.7
-  - setuptools >=49.6.0
   - sphinx >=0.6.6
   - spyder-kernels >=3.0.3,<3.1.0
   - superqt >=0.6.2,<1.0.0
--- a/setup.py
+++ b/setup.py
@@ -284,6 +284,7 @@
     'keyring>=17.0.0',
     'nbconvert>=4.0',
     'numpydoc>=0.6.0',
+    'packaging>=20.0',
     'parso>=0.7.0,<0.9.0',
     'pexpect>=4.4.0',
     'pickleshare>=0.4',
@@ -303,7 +304,6 @@
     'qtawesome>=1.4.0,<1.5.0',
     'qtpy>=2.4.0',
     'rtree>=0.9.7',
-    'setuptools>=49.6.0',
     'sphinx>=0.6.6',
     'spyder-kernels>=3.0.3,<3.1.0',
     'superqt>=0.6.2,<1.0.0',
--- a/spyder/dependencies.py
+++ b/spyder/dependencies.py
@@ -51,6 +51,7 @@
 KEYRING_REQVER = '>=17.0.0'
 NBCONVERT_REQVER = '>=4.0'
 NUMPYDOC_REQVER = '>=0.6.0'
+PACKAGING_REQVER = '>=20.0'
 PARSO_REQVER = '>=0.7.0,<0.9.0'
 PEXPECT_REQVER = '>=4.4.0'
 PICKLESHARE_REQVER = '>=0.4'
@@ -71,7 +72,6 @@
 QTCONSOLE_REQVER = '>=5.6.1,<5.7.0'
 QTPY_REQVER = '>=2.4.0'
 RTREE_REQVER = '>=0.9.7'
-SETUPTOOLS_REQVER = '>=49.6.0'
 SPHINX_REQVER = '>=0.6.6'
 SPYDER_KERNELS_REQVER = '>=3.0.3,<3.1.0'
 SUPERQT_REQVER = '>=0.6.2,<1.0.0'
@@ -167,6 +167,10 @@
      'package_name': "numpydoc",
      'features': _("Improve code completion for objects that use Numpy docstrings"),
      'required_version': NUMPYDOC_REQVER},
+    {'modname': "packaging",
+     'package_name': "packaging",
+     'features': _("Core utilities for handling version numbers of Python packages"),
+     'required_version': PACKAGING_REQVER},
     {'modname': "parso",
      'package_name': "parso",
      'features': _("Python parser that supports error recovery and "
@@ -251,10 +255,6 @@
      'package_name': "rtree",
      'features': _("Fast access to code snippet regions"),
      'required_version': RTREE_REQVER},
-    {'modname': "setuptools",
-     'package_name': "setuptools",
-     'features': _("Determine package versions"),
-     'required_version': SETUPTOOLS_REQVER},
     {'modname': "sphinx",
      'package_name': "sphinx",
      'features': _("Show help for objects in the Editor and Consoles in a dedicated pane"),
--- a/binder/environment.yml
+++ b/binder/environment.yml
@@ -26,6 +26,7 @@
 - keyring >=17.0.0
 - nbconvert >=4.0
 - numpydoc >=0.6.0
+- packaging >=20.0
 - parso >=0.7.0,<0.9.0
 - pexpect >=4.4.0
 - pickleshare >=0.4
@@ -48,7 +49,6 @@
 - qtconsole >=5.6.1,<5.7.0
 - qtpy >=2.4.0
 - rtree >=0.9.7
-- setuptools >=49.6.0
 - sphinx >=0.6.6
 - spyder-kernels >=3.0.3,<3.1.0
 - superqt >=0.6.2,<1.0.0