blob: e488b3cacc3d4a3c301e5c8ad36b52b41c2c1b3d (
plain)
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
|
From 3bbc46967d35cd7e05677018bdc9d552efaeea3e Mon Sep 17 00:00:00 2001
From: Ben Finney <ben+python@benfinney.id.au>
Date: Mar 08 2023 07:02:47 +0000
Subject: Use explicitly-maintained ‘packaging.version’ for version string parsing.
---
#diff --git a/ChangeLog b/ChangeLog
#index bba4b5a..f5ee1e0 100644
#--- a/ChangeLog
#+++ b/ChangeLog
#@@ -14,9 +14,14 @@ Version NEXT
# :Released: FUTURE
# :Maintainer: UNKNOWN <unknown@example.org>
#
#-Changes:
#+Bugs Fixed:
#+
#+* Migrate to use the explicitly-maintained ‘packaging’ library.
#+
#+ The package bundled in ‘setuptools.extern.packaging’ is to help make that
#+ package self-contained, but is not a supported API.
#
#-* None.
#+ Closes: Pagure #73. Thanks to Michał Górny for the report.
#
#
# Version 3.0.1
diff --git a/test_version.py b/test_version.py
index c43cd36..d6095e4 100644
--- a/test_version.py
+++ b/test_version.py
@@ -20,10 +20,10 @@ import unittest.mock
import docutils
import docutils.nodes
import docutils.writers
+from packaging.version import InvalidVersion
import setuptools
import setuptools.command
import setuptools.dist
-from setuptools.extern.packaging.version import InvalidVersion
import testscenarios
import testtools
diff --git a/version.py b/version.py
index 20d3ef3..2d7d048 100644
--- a/version.py
+++ b/version.py
@@ -31,12 +31,12 @@ import re
import sys
import textwrap
+import packaging.version
import setuptools
import setuptools.command.build
import setuptools.command.build_py
import setuptools.command.egg_info
import setuptools.dist
-import setuptools.extern.packaging.version
def ensure_class_bases_begin_with(namespace, class_name, base_class):
@@ -186,7 +186,7 @@ class ChangeLogEntry:
# A valid non-version value.
return None
- valid_version = setuptools.extern.packaging.version.Version(value)
+ valid_version = packaging.version.Version(value)
@classmethod
def validate_maintainer(cls, value):
|
