Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
setuptools
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
setuptools
Commits
18fc31b1
Commit
18fc31b1
authored
Dec 13, 2014
by
Donald Stufft
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Restore iterating over Version objects for compat with buildout
parent
b3203c3f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
88 additions
and
2 deletions
+88
-2
pkg_resources.py
pkg_resources.py
+69
-2
setuptools/tests/test_resources.py
setuptools/tests/test_resources.py
+19
-0
No files found.
pkg_resources.py
View file @
18fc31b1
...
...
@@ -79,8 +79,75 @@ import setuptools._vendor.packaging.version
import
setuptools._vendor.packaging.specifiers
packaging
=
setuptools
.
_vendor
.
packaging
# For compatibility, expose packaging.version.parse as parse_version
parse_version
=
packaging
.
version
.
parse
class
_SetuptoolsVersionMixin
(
object
):
def
__iter__
(
self
):
component_re
=
re
.
compile
(
r'(\
d+ | [
a-z]+ | \
.| -)
', re.VERBOSE)
replace = {
'
pre
': '
c
',
'
preview
': '
c
',
'
-
': '
final
-
',
'
rc
': '
c
',
'
dev
': '
@
',
}.get
def _parse_version_parts(s):
for part in component_re.split(s):
part = replace(part, part)
if not part or part == '
.
':
continue
if part[:1] in '
0123456789
':
# pad for numeric comparison
yield part.zfill(8)
else:
yield '
*
'+part
# ensure that alpha/beta/candidate are before final
yield '
*
final
'
def old_parse_version(s):
parts = []
for part in _parse_version_parts(s.lower()):
if part.startswith('
*
'):
# remove '
-
' before a prerelease tag
if part < '
*
final
':
while parts and parts[-1] == '
*
final
-
':
parts.pop()
# remove trailing zeros from each series of numeric parts
while parts and parts[-1] == '
00000000
':
parts.pop()
parts.append(part)
return tuple(parts)
# Warn for use of this function
warnings.warn(
"You have iterated over the result of "
"pkg_resources.parse_version. This is a legacy behavior which is "
"inconsistent with the new version class introduced in setuptools "
"8.0. That class should be used directly instead of attempting to "
"iterate over the result.",
RuntimeWarning,
stacklevel=1,
)
for part in old_parse_version(str(self)):
yield part
class SetuptoolsVersion(_SetuptoolsVersionMixin, packaging.version.Version):
pass
class SetuptoolsLegacyVersion(_SetuptoolsVersionMixin,
packaging.version.LegacyVersion):
pass
def parse_version(v):
try:
return SetuptoolsVersion(v)
except packaging.version.InvalidVersion:
return SetuptoolsLegacyVersion(v)
_state_vars = {}
...
...
setuptools/tests/test_resources.py
View file @
18fc31b1
...
...
@@ -488,6 +488,25 @@ class ParseTests(TestCase):
for
v2
in
torture
[
p
+
1
:]:
c
(
v2
,
v1
)
def
testVersionBuildout
(
self
):
"""
Buildout has a function in it's bootstrap.py that inspected the return
value of parse_version. The new parse_version returns a Version class
which needs to support this behavior, at least for now.
"""
def
buildout
(
parsed_version
):
_final_parts
=
'*final-'
,
'*final'
def
_final_version
(
parsed_version
):
for
part
in
parsed_version
:
if
(
part
[:
1
]
==
'*'
)
and
(
part
not
in
_final_parts
):
return
False
return
True
return
_final_version
(
parsed_version
)
self
.
assertTrue
(
buildout
(
parse_version
(
"1.0"
)))
self
.
assertFalse
(
buildout
(
parse_version
(
"1.0a1"
)))
class
ScriptHeaderTests
(
TestCase
):
non_ascii_exe
=
'/Users/José/bin/python'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment