Skip to content

Commit f6fed6e

Browse files
committed
Encapsulate LockConfiguration extraction from locks.
1 parent cbc9fb4 commit f6fed6e

File tree

3 files changed

+17
-14
lines changed

3 files changed

+17
-14
lines changed

pex/resolve/lock_downloader.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
DownloadableArtifact,
2626
FileArtifact,
2727
LocalProjectArtifact,
28-
LockConfiguration,
2928
VCSArtifact,
3029
)
3130
from pex.resolve.lockfile.download_manager import DownloadedArtifact, DownloadManager
@@ -233,12 +232,7 @@ def create(
233232
file_lock_style=file_lock_style,
234233
downloader=ArtifactDownloader(
235234
resolver=resolver,
236-
lock_configuration=LockConfiguration(
237-
style=lock.style,
238-
requires_python=lock.requires_python,
239-
target_systems=lock.target_systems,
240-
lock_build_systems=lock.lock_build_systems,
241-
),
235+
lock_configuration=lock.lock_configuration(),
242236
target=target,
243237
package_index_configuration=PackageIndexConfiguration.create(
244238
pip_version=pip_version,

pex/resolve/lockfile/model.py

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,13 @@
1212
from pex.pep_503 import ProjectName
1313
from pex.pip.version import PipVersion, PipVersionValue
1414
from pex.requirements import LocalProjectRequirement
15-
from pex.resolve.locked_resolve import LocalProjectArtifact, LockedResolve, LockStyle, TargetSystem
15+
from pex.resolve.locked_resolve import (
16+
LocalProjectArtifact,
17+
LockConfiguration,
18+
LockedResolve,
19+
LockStyle,
20+
TargetSystem,
21+
)
1622
from pex.resolve.resolved_requirement import Pin
1723
from pex.resolve.resolver_configuration import BuildConfiguration, ResolverVersion
1824
from pex.sorted_tuple import SortedTuple
@@ -149,6 +155,14 @@ def extract_requirement(req):
149155
local_project_requirement_mapping = attr.ib(eq=False) # type: Mapping[str, Requirement]
150156
source = attr.ib(default=None, eq=False) # type: Optional[str]
151157

158+
def lock_configuration(self):
159+
return LockConfiguration(
160+
style=self.style,
161+
requires_python=self.requires_python,
162+
target_systems=self.target_systems,
163+
lock_build_systems=self.lock_build_systems,
164+
)
165+
152166
def build_configuration(self):
153167
# type: () -> BuildConfiguration
154168
return BuildConfiguration.create(

pex/resolve/lockfile/updater.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -661,12 +661,7 @@ def create(
661661
):
662662
# type: (...) -> LockUpdater
663663

664-
lock_configuration = LockConfiguration(
665-
style=lock_file.style,
666-
requires_python=lock_file.requires_python,
667-
target_systems=lock_file.target_systems,
668-
lock_build_systems=lock_file.lock_build_systems,
669-
)
664+
lock_configuration = lock_file.lock_configuration()
670665
pip_configuration = PipConfiguration(
671666
version=lock_file.pip_version,
672667
resolver_version=lock_file.resolver_version,

0 commit comments

Comments
 (0)