Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.buildout
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
6
Merge Requests
6
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
slapos.buildout
Commits
aa1fee38
Commit
aa1fee38
authored
Nov 07, 2022
by
Maurits van Rees
Committed by
Godefroid Chapelle
Nov 08, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed import of packaging.markers.
parent
7de68258
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
news/621.bugfix
news/621.bugfix
+1
-0
src/zc/buildout/configparser.py
src/zc/buildout/configparser.py
+5
-5
No files found.
news/621.bugfix
0 → 100644
View file @
aa1fee38
Fixed import of packaging.markers. [maurits]
src/zc/buildout/configparser.py
View file @
aa1fee38
...
@@ -22,12 +22,12 @@ import textwrap
...
@@ -22,12 +22,12 @@ import textwrap
import
logging
import
logging
try
:
try
:
import
packaging
from
packaging
import
markers
except
ImportError
:
except
ImportError
:
try
:
try
:
from
pip._vendor
import
packaging
from
pip._vendor
.packaging
import
markers
except
ImportError
:
except
ImportError
:
from
pkg_resources
import
packaging
from
pkg_resources
.packaging
import
markers
logger
=
logging
.
getLogger
(
'zc.buildout'
)
logger
=
logging
.
getLogger
(
'zc.buildout'
)
...
@@ -191,9 +191,9 @@ def parse(fp, fpname, exp_globals=dict):
...
@@ -191,9 +191,9 @@ def parse(fp, fpname, exp_globals=dict):
try:
try:
# new-style markers as used in pip constraints, e.g.:
# new-style markers as used in pip constraints, e.g.:
# 'python_version < "3.11" and platform_system == "Windows"'
# 'python_version < "3.11" and platform_system == "Windows"'
marker =
packaging.
markers.Marker(expr)
marker = markers.Marker(expr)
section_condition = marker.evaluate()
section_condition = marker.evaluate()
except
packaging.
markers.InvalidMarker:
except markers.InvalidMarker:
# old style buildout expression
# old style buildout expression
# rebuild a valid Python expression wrapped in a list
# rebuild a valid Python expression wrapped in a list
expr = head + expr + tail
expr = head + expr + tail
...
...
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