Skip to content

P
Pdm

后端镜像 / Pdm

通知 0
Star 0
Fork 0
P
Pdm

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 6af0c5a0 编写于 作者: F Frost Ming
浏览文件
操作

Simply the marker extracting logic

上级 56b5482b
隐藏空白更改
内联 并排
Showing with 114 addition and 115 deletion
news/170.bugfix 0 → 100644
浏览文件 @ 6af0c5a0
Fix a bug that package's marker fails to propagate to its grandchildren if they have already been resolved.
pdm.lock
浏览文件 @ 6af0c5a0
......@@ -2,7 +2,6 @@
name = "apipkg"
sections = ["dev"]
version = "1.5"
marker = "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'"
summary = "apipkg: namespace control and lazy-import mechanism"
[[package]]
......@@ -15,21 +14,19 @@ summary = "A small Python module for determining appropriate platform-specific d
name = "atomicwrites"
sections = ["dev"]
version = "1.4.0"
marker = "sys_platform == 'win32' and python_version >= '3.5'"
marker = "sys_platform == 'win32'"
summary = "Atomic file writes."
[[package]]
name = "attrs"
sections = ["default", "dev"]
version = "20.3.0"
marker = "python_version >= '2.7'"
summary = "Classes Without Boilerplate"
[[package]]
name = "cached-property"
sections = ["default"]
version = "1.5.2"
marker = "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'"
summary = "A decorator for caching properties in classes."
[[package]]
......@@ -50,21 +47,18 @@ summary = "Universal encoding detector for Python 2 and 3"
name = "click"
sections = ["default", "dev", "doc"]
version = "7.1.2"
marker = "python_version >= '2.7'"
summary = "Composable command line interface toolkit"
[[package]]
name = "colorama"
sections = ["default", "dev"]
version = "0.4.4"
marker = "python_version >= '2.7'"
summary = "Cross-platform colored terminal text."
[[package]]
name = "coverage"
sections = ["dev"]
version = "5.3"
marker = "python_version >= '2.7' and python_version < '4.0' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'"
summary = "Code coverage measurement for Python"
[[package]]
......@@ -77,7 +71,6 @@ summary = "Distribution utilities"
name = "execnet"
sections = ["dev"]
version = "1.7.1"
marker = "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'"
summary = "execnet: rapid multi-Python deployment"
[package.dependencies]
......@@ -87,7 +80,6 @@ apipkg = ">=1.4"
name = "future"
sections = ["doc"]
version = "0.18.2"
marker = "python_version >= '3.5'"
summary = "Clean single-source support for Python 3 and 2"
[[package]]
......@@ -101,7 +93,7 @@ summary = "Internationalized Domain Names in Applications (IDNA)"
name = "importlib-metadata"
sections = ["default", "dev", "doc"]
version = "2.0.0"
marker = "python_version >= '2.7' and python_version < '4.0'"
marker = "python_version < '4.0'"
summary = "Read metadata from Python packages"
[package.dependencies]
......@@ -117,14 +109,12 @@ summary = "UNKNOWN"
name = "iniconfig"
sections = ["dev"]
version = "1.1.1"
marker = "python_version >= '3.5'"
summary = "iniconfig: brain-dead simple config-ini parsing"
[[package]]
name = "jinja2"
sections = ["dev", "doc"]
version = "2.11.2"
marker = "python_version >= '2.7'"
summary = "A very fast and expressive template engine."
[package.dependencies]
......@@ -134,7 +124,7 @@ MarkupSafe = ">=0.23"
name = "joblib"
sections = ["doc"]
version = "0.17.0"
marker = "python_version >= '3.6'"
marker = "python_version >= '2.8'"
summary = "Lightweight pipelining: using Python functions as pipeline jobs."
[[package]]
......@@ -155,7 +145,6 @@ six = ">=1.11.0"
name = "livereload"
sections = ["doc"]
version = "2.6.3"
marker = "python_version >= '3.5'"
summary = "Python LiveReload is an awesome tool for web developers"
[package.dependencies]
......@@ -166,7 +155,6 @@ tornado = {marker = "python_version > '2.7'", version = "*"}
name = "lunr"
sections = ["doc"]
version = "0.5.8"
marker = "python_version >= '3.5'"
summary = "A Python implementation of Lunr.js"
[package.dependencies]
......@@ -178,7 +166,6 @@ name = "lunr"
sections = ["doc"]
version = "0.5.8"
extras = ["languages"]
marker = "python_version >= '3.5'"
summary = "A Python implementation of Lunr.js"
[package.dependencies]
......@@ -191,7 +178,6 @@ lunr = "==0.5.8"
name = "markdown"
sections = ["doc"]
version = "3.3.3"
marker = "python_version >= '3.6'"
summary = "Python implementation of Markdown."
[package.dependencies]
......@@ -210,14 +196,12 @@ markdown = "*"
name = "MarkupSafe"
sections = ["dev", "doc"]
version = "1.1.1"
marker = "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'"
summary = "Safely add untrusted strings to HTML/XML markup."
[[package]]
name = "mkdocs"
sections = ["doc"]
version = "1.1.2"
marker = "python_version >= '3.5'"
summary = "Project documentation with Markdown."
[package.dependencies]
......@@ -245,7 +229,7 @@ pymdown-extensions = ">=6.3"
name = "nltk"
sections = ["doc"]
version = "3.5"
marker = "python_version >= '3.5'"
marker = "python_version >= '2.8'"
summary = "Natural Language Toolkit"
[package.dependencies]
......@@ -258,7 +242,6 @@ tqdm = "*"
name = "packaging"
sections = ["default", "dev"]
version = "20.4"
marker = "python_version >= '2.7'"
summary = "Core utilities for Python packages"
[package.dependencies]
......@@ -269,7 +252,6 @@ six = "*"
name = "pdm-pep517"
sections = ["default"]
version = "0.2.1"
marker = "python_version >= '3.6'"
summary = "PEP 517 support"
[[package]]
......@@ -287,14 +269,12 @@ zipp = {marker = "python_version < '3.8'", version = "*"}
name = "pip"
sections = ["default"]
version = "20.2.4"
marker = "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'"
summary = "The PyPA recommended tool for installing Python packages."
[[package]]
name = "pip-shims"
sections = ["default"]
version = "0.5.3"
marker = "python_version >= '2.7' and python_full_version not in '3.0.0, 3.1.0, 3.2.0, 3.3.0, 3.4.0'"
summary = "Compatibility shims for pip versions 8 thru current."
[package.dependencies]
......@@ -308,7 +288,6 @@ wheel = "*"
name = "pluggy"
sections = ["dev"]
version = "0.13.1"
marker = "python_version >= '3.5'"
summary = "plugin and hook calling mechanisms for python"
[package.dependencies]
......@@ -318,28 +297,24 @@ importlib-metadata = {marker = "python_version < '3.8'", version = ">=0.12"}
name = "py"
sections = ["dev"]
version = "1.9.0"
marker = "python_version >= '2.7'"
summary = "library with cross-python path, ini-parsing, io, code, log facilities"
[[package]]
name = "pycomplete"
sections = ["default"]
version = "0.3.1"
marker = "python_version >= '3.6'"
summary = "A Python library to generate static completion scripts for your CLI app"
[[package]]
name = "Pygments"
sections = ["doc"]
version = "2.7.2"
marker = "python_version >= '3.5'"
summary = "Pygments is a syntax highlighting package written in Python."
[[package]]
name = "pymdown-extensions"
sections = ["doc"]
version = "8.0.1"
marker = "python_version >= '3.5'"
summary = "Extension pack for Python Markdown."
[package.dependencies]
......@@ -362,7 +337,6 @@ summary = "Persistent/Functional/Immutable data structures"
name = "pytest"
sections = ["dev"]
version = "6.1.2"
marker = "python_version >= '3.5'"
summary = "pytest: simple powerful testing with Python"
[package.dependencies]
......@@ -380,7 +354,6 @@ colorama = {marker = "sys_platform == 'win32'", version = "*"}
name = "pytest-cov"
sections = ["dev"]
version = "2.10.1"
marker = "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'"
summary = "Pytest plugin for measuring coverage."
[package.dependencies]
......@@ -391,7 +364,6 @@ coverage = ">=4.4"
name = "pytest-forked"
sections = ["dev"]
version = "1.3.0"
marker = "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'"
summary = "run tests in isolated forked subprocesses"
[package.dependencies]
......@@ -402,7 +374,6 @@ pytest = ">=3.10"
name = "pytest-mock"
sections = ["dev"]
version = "3.3.1"
marker = "python_version >= '3.5'"
summary = "Thin-wrapper around the mock package for easier use with pytest"
[package.dependencies]
......@@ -412,7 +383,6 @@ pytest = ">=5.0"
name = "pytest-xdist"
sections = ["dev"]
version = "1.34.0"
marker = "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'"
summary = "pytest xdist plugin for distributed testing and loop-on-failing modes"
[package.dependencies]
......@@ -425,7 +395,6 @@ six = "*"
name = "python-cfonts"
sections = ["default"]
version = "1.3.1"
marker = "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'"
summary = "Sexy fonts for the console"
[package.dependencies]
......@@ -435,7 +404,6 @@ colorama = "*"
name = "pythonfinder"
sections = ["default"]
version = "1.2.5"
marker = "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'"
summary = "A cross-platform python discovery tool to help locate python on any system."
[package.dependencies]
......@@ -449,14 +417,13 @@ packaging = "*"
name = "PyYAML"
sections = ["doc"]
version = "5.3.1"
marker = "python_version >= '3.5'"
summary = "YAML parser and emitter for Python"
[[package]]
name = "regex"
sections = ["doc"]
version = "2020.11.13"
marker = "python_version >= '3.5'"
marker = "python_version >= '2.8'"
summary = "Alternative regular expression module, to replace re."
[[package]]
......@@ -482,35 +449,30 @@ summary = "Resolve abstract dependencies into concrete ones"
name = "setuptools"
sections = ["default", "dev"]
version = "50.3.2"
marker = "python_version >= '3.5'"
summary = "Easily download, build, install, upgrade, and uninstall Python packages"
[[package]]
name = "six"
sections = ["default", "dev", "doc"]
version = "1.15.0"
marker = "python_version >= '2.7'"
summary = "Python 2 and 3 compatibility utilities"
[[package]]
name = "toml"
sections = ["default", "dev"]
version = "0.10.2"
marker = "python_version >= '2.6'"
summary = "Python Library for Tom's Obvious, Minimal Language"
[[package]]
name = "tomlkit"
sections = ["default"]
version = "0.7.0"
marker = "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'"
summary = "Style preserving TOML library"
[[package]]
name = "tornado"
sections = ["doc"]
version = "6.1"
marker = "python_version >= '3.5'"
summary = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed."
[[package]]
......@@ -529,7 +491,7 @@ toml = "*"
name = "tqdm"
sections = ["doc"]
version = "4.52.0"
marker = "python_version >= '3.5'"
marker = "python_version >= '2.8'"
summary = "Fast, Extensible Progress Meter"
[[package]]
......@@ -557,14 +519,13 @@ packaging = "*"
name = "wheel"
sections = ["default"]
version = "0.35.1"
marker = "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'"
summary = "A built-package format for Python"
[[package]]
name = "zipp"
sections = ["default", "dev", "doc"]
version = "3.4.0"
marker = "python_version >= '3.6' and python_version < '3.8'"
marker = "python_version < '4.0'"
summary = "Backport of pathlib-compatible object wrapper for zip files"
[metadata]
......
pdm/models/markers.py
浏览文件 @ 6af0c5a0
......@@ -172,14 +172,3 @@ def _build_pyspec_from_marker(markers):
if marker == "or":
groups.append(PySpecSet())
return reduce(operator.or_, groups)
def join_metaset(metaset: Tuple[Optional[Marker], PySpecSet]) -> Optional[Marker]:
"""Join marker and python specifier into a new marker."""
marker, pyspec = metaset
py_marker = pyspec.as_marker_string() or None
py_marker = Marker(py_marker) if py_marker else None
try:
return marker & py_marker
except TypeError:
return None
pdm/resolver/core.py
浏览文件 @ 6af0c5a0
......@@ -4,14 +4,14 @@ from typing import TYPE_CHECKING, Dict, Iterable, List, Optional, Set, Tuple
from resolvelib.resolvers import Criterion, Resolution
from pdm.models.markers import PySpecSet, join_metaset
from pdm.models.markers import PySpecSet
from pdm.models.requirements import strip_extras
from pdm.resolver.metaset import Metaset
if TYPE_CHECKING:
from resolvelib.resolvers import Resolver, Result
from pdm.models.candidates import Candidate
from pdm.models.markers import Marker
from pdm.models.requirements import Requirement
......@@ -39,38 +39,27 @@ def _identify_parent(parent: Optional[Candidate]) -> None:
return parent.identify() if parent else None
def _build_marker_and_pyspec(
key: str,
def _build_metaset(
criterion: Criterion,
pythons: Dict[str, PySpecSet],
all_metasets: Dict[str, Tuple[Optional[Marker], PySpecSet]],
all_metasets: Dict[str, Metaset],
keep_unresolved: Set[Optional[str]],
) -> Tuple[Optional[Marker], PySpecSet]:
) -> Metaset:
metasets = None
metaset = None
for r, parent in criterion.information:
if parent and _identify_parent(parent) in keep_unresolved:
continue
python = pythons[strip_extras(key)[0]]
marker, pyspec = r.marker_no_python, r.requires_python
pyspec = python & pyspec
this_metaset = Metaset(r.marker)
# Use 'and' to connect markers inherited from parent.
if not parent:
parent_metaset = None, PySpecSet()
parent_metaset = Metaset()
else:
parent_metaset = all_metasets[_identify_parent(parent)]
child_marker = (
parent_metaset[0] & marker if any((parent_metaset[0], marker)) else None
)
child_pyspec = parent_metaset[1] & pyspec
if not metasets:
metasets = child_marker, child_pyspec
else:
# Use 'or' to connect metasets inherited from different parents.
marker = metasets[0] | child_marker if any((child_marker, marker)) else None
metasets = marker, metasets[1] | child_pyspec
return metasets or (None, PySpecSet())
merged = this_metaset & parent_metaset
# Use 'or' to connect metasets inherited from different parents.
metaset = metaset | merged if metaset is not None else merged
return metaset or Metaset()
def _get_sections(crit: Criterion) -> Iterable[str]:
......@@ -81,12 +70,14 @@ def _get_sections(crit: Criterion) -> Iterable[str]:
yield from parent.sections
def _calculate_markers_and_pyspecs(
result: Result, pythons: Dict[str, PySpecSet]
) -> Dict[str, Tuple[Optional[Marker], PySpecSet]]:
all_metasets = {}
unresolved = {k for k in result.mapping}
circular = {}
def extract_metadata(result: Result) -> Dict[str, Metaset]:
"""Traverse through the parent dependencies till the top
and merge any requirement markers on the path.
Return a map of Metaset for each candidate.
"""
all_metasets: Dict[str, Metaset] = {}
unresolved: Set[str] = {k for k in result.mapping}
circular: Dict[str, Set[str]] = {}
while unresolved:
new_metasets = {}
......@@ -99,9 +90,7 @@ def _calculate_markers_and_pyspecs(
for p in crit.iter_parent()
):
continue
new_metasets[k] = _build_marker_and_pyspec(
k, crit, pythons, all_metasets, keep_unresolved
)
new_metasets[k] = _build_metaset(crit, all_metasets, keep_unresolved)
result.mapping[k].sections = list(set(_get_sections(crit)))
if new_metasets:
......@@ -126,31 +115,27 @@ def _calculate_markers_and_pyspecs(
for key in circular:
crit = result.criteria[key]
all_metasets[key] = _build_marker_and_pyspec(
key, crit, pythons, all_metasets, set()
)
all_metasets[key] = _build_metaset(crit, all_metasets, set())
result.mapping[key].sections = list(set(_get_sections(crit)))
return all_metasets
def _get_sections_from_top_requirements(traces):
all_sections = {}
for key, trace in traces.items():
all_sections[key] = set(item[0][2:-2] for item in trace)
return all_sections
def resolve(
resolver: Resolver, requirements: List[Requirement], requires_python: PySpecSet
) -> Tuple[Dict[str, Candidate], Dict[str, Dict[str, Requirement]], Dict[str, str]]:
"""Core function to perform the actual resolve process.
Return a tuple containing 3 items:
1. A map of pinned candidates
2. A map of resolved dependencies from each section of pyproject.toml
3. A map of package descriptions fetched from PyPI source.
"""
provider, reporter = resolver.provider, resolver.reporter
result = resolver.resolve(requirements)
reporter.extract_metadata()
all_metasets = _calculate_markers_and_pyspecs(
result, provider.requires_python_collection
)
all_metasets = extract_metadata(result)
mapping = result.mapping
......@@ -159,12 +144,16 @@ def resolve(
continue
# Root requires_python doesn't participate in the metaset resolving,
# now check it!
python = requires_python & metaset[1]
python = (
requires_python
& metaset.requires_python
& provider.requires_python_collection[strip_extras(key)[0]]
)
if python.is_impossible:
# Candidate doesn't match requires_python constraint
del mapping[key]
else:
candidate = mapping[key]
candidate.marker = join_metaset(metaset)
candidate.marker = metaset.as_marker()
candidate.hashes = provider.get_hashes(candidate)
return mapping, provider.fetched_dependencies, provider.summary_collection
pdm/resolver/metaset.py 0 → 100644
浏览文件 @ 6af0c5a0
from typing import Optional
from pdm.models.markers import Marker
from pdm.models.specifiers import PySpecSet
class Metaset:
"""A wrapper class on top of :class:`pdm.models.markers.Marker`
with the ability to merge python specifiers
"""
def __init__(self, marker: Optional[Marker] = None) -> None:
if not marker:
self.marker_no_python, self.requires_python = None, PySpecSet()
else:
self.marker_no_python, self.requires_python = marker.split_pyspec()
def __and__(self, other: "Metaset") -> "Metaset":
if not isinstance(other, Metaset):
raise TypeError(f"Can't perform 'and' with type {type(other)} object")
inst = Metaset()
inst.marker_no_python = (
self.marker_no_python & other.marker_no_python
if any([self.marker_no_python, other.marker_no_python])
else None
)
inst.requires_python = self.requires_python & other.requires_python
return inst
def __or__(self, other: "Metaset") -> "Metaset":
if not isinstance(other, Metaset):
raise TypeError(f"Can't perform 'or' with type {type(other)} object")
inst = Metaset()
inst.marker_no_python = (
self.marker_no_python | other.marker_no_python
if any([self.marker_no_python, other.marker_no_python])
else None
)
inst.requires_python = self.requires_python | other.requires_python
return inst
def as_marker(self) -> Optional[Marker]:
marker, pyspec = self.marker_no_python, self.requires_python
py_marker = pyspec.as_marker_string() or None
py_marker = Marker(py_marker) if py_marker else None
try:
return marker & py_marker
except TypeError:
return None
tests/resolver/test_resolve.py
浏览文件 @ 6af0c5a0
......@@ -168,17 +168,6 @@ def test_resolve_no_available_versions(project, repository):
resolve_requirements(repository, ["foo>=0.2.0"])
def test_resolving_marker_merging(project, repository):
repository.add_candidate("foo", "0.1.0", ">=2.7, !=3.4.*")
result = resolve_requirements(
repository, ["foo; os_name=='nt' and python_version != '3.5'"], ">=3.6"
)
assert (
str(result["foo"].marker) == 'os_name == "nt" and python_version >= "2.7" '
'and python_version not in "3.4, 3.5"'
)
def test_exclude_incompatible_requirements(project, repository):
repository.add_candidate("foo", "0.1.0")
repository.add_dependencies("foo", "0.1.0", ["bar; python_version < '3'"])
......@@ -224,3 +213,24 @@ def test_resolve_dependency_with_extra_marker(project, repository):
result = resolve_requirements(repository, ["foo[tz]"])
assert "pytz" in result
def test_resolve_parent_from_multiple_sources(project, repository):
repository.add_candidate("foo", "0.1.0")
repository.add_dependencies("foo", "0.1.0", ["django"])
repository.add_candidate("bar", "0.1.0")
repository.add_dependencies("bar", "0.1.0", ["django"])
result = resolve_requirements(
repository, ["foo; python_version ~= '3.8'", "bar"], ">=3.6"
)
assert not result["pytz"].marker
def test_resolve_circular_dependencies(project, repository):
repository.add_candidate("foo", "0.1.0")
repository.add_dependencies("foo", "0.1.0", ["foobar"])
repository.add_candidate("foobar", "0.2.0")
repository.add_dependencies("foobar", "0.2.0", ["foo"])
result = resolve_requirements(repository, ["foo"])
assert result["foo"].version == "0.1.0"
assert result["foobar"].version == "0.2.0"
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或