Compare commits

...

3 Commits

Author SHA1 Message Date
Dave Connors
cf4b2c2dbd remove exception 2023-02-07 21:01:59 -06:00
Dave Connors
914f23d859 arg 2023-02-07 20:30:16 -06:00
Dave Connors
1ec9888e17 honestly not far off 2023-02-07 20:27:04 -06:00
2 changed files with 22 additions and 1 deletions

View File

@@ -68,11 +68,25 @@ class RegistryUnpinnedPackage(RegistryPackageMixin, UnpinnedPackage[RegistryPinn
self.versions = versions
self.install_prerelease = install_prerelease
def __repr__(self) -> str:
version_list = []
for version in self.versions:
version_list.append(version.to_version_string())
return f"{self.name} : {version_list}"
def _check_in_index(self):
index = registry.index_cached()
if self.package not in index:
raise PackageNotFoundError(self.package)
def package_requests(self) -> List[str]:
return [
f"{self.name} requested with version(s) {[version.to_version_string() for version in self.versions]}"
]
def add_package_request(self, request: str):
return self.package_requests().append(request)
@classmethod
def from_contract(cls, contract: RegistryPackage) -> "RegistryUnpinnedPackage":
raw_version = contract.get_versions()
@@ -96,7 +110,7 @@ class RegistryUnpinnedPackage(RegistryPackageMixin, UnpinnedPackage[RegistryPinn
try:
range_ = semver.reduce_versions(*self.versions)
except VersionsNotCompatibleError as e:
new_msg = "Version error for package {}: {}".format(self.name, e)
new_msg = "Version error for package {}: {}".format(self.name, self.package_requests())
raise DependencyError(new_msg) from e
should_version_check = bool(flags.VERSION_CHECK)

View File

@@ -123,9 +123,16 @@ def resolve_packages(
while pending:
next_pending = PackageListing()
# resolve the dependency in question
import pdb
pdb.set_trace()
for package in pending:
final.incorporate(package)
target = final[package].resolved().fetch_metadata(config, renderer)
for parent_package in target.packages:
parent_unpinned_package = RegistryUnpinnedPackage.from_contract(parent_package)
test_msg = f"{parent_package.package} requested by {package.name} with version(s) {parent_package.version}"
final[parent_unpinned_package].add_package_request(test_msg)
next_pending.update_from(target.packages)
pending = next_pending