zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version_types.py: Version -> Union[StandardVersion, GitVersion] (#50061)

Browse Source
This commit is contained in:
Harmen Stoppels 2025-04-16 09:15:13 +02:00 committed by GitHub
parent 1d70dc8292
commit dbd3895cbf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/spack/spack/database.py
View File

@ -149,12 +149,12 @@ def _getfqdn():
return socket.getfqdn() return socket.getfqdn()
def reader(version: vn.ConcreteVersion) -> Type["spack.spec.SpecfileReaderBase"]: def reader(version: vn.StandardVersion) -> Type["spack.spec.SpecfileReaderBase"]:
reader_cls = { reader_cls = {
vn.Version("5"): spack.spec.SpecfileV1, vn.StandardVersion.from_string("5"): spack.spec.SpecfileV1,
vn.Version("6"): spack.spec.SpecfileV3, vn.StandardVersion.from_string("6"): spack.spec.SpecfileV3,
vn.Version("7"): spack.spec.SpecfileV4, vn.StandardVersion.from_string("7"): spack.spec.SpecfileV4,
vn.Version("8"): spack.spec.SpecfileV5, vn.StandardVersion.from_string("8"): spack.spec.SpecfileV5,
} }
return reader_cls[version] return reader_cls[version]
@ -824,7 +824,7 @@ def check(cond, msg):
db = fdata["database"] db = fdata["database"]
check("version" in db, "no 'version' in JSON DB.") check("version" in db, "no 'version' in JSON DB.")
self.db_version = vn.Version(db["version"]) self.db_version = vn.StandardVersion.from_string(db["version"])
if self.db_version > _DB_VERSION: if self.db_version > _DB_VERSION:
raise InvalidDatabaseVersionError(self, _DB_VERSION, self.db_version) raise InvalidDatabaseVersionError(self, _DB_VERSION, self.db_version)
elif self.db_version < _DB_VERSION: elif self.db_version < _DB_VERSION:

2
lib/spack/spack/version/version_types.py
View File

@ -1257,7 +1257,7 @@ def _prev_version(v: StandardVersion) -> StandardVersion:
return StandardVersion("", (release, prerelease), separators) return StandardVersion("", (release, prerelease), separators)
def Version(string: Union[str, int]) -> ConcreteVersion: def Version(string: Union[str, int]) -> Union[StandardVersion, GitVersion]:
if not isinstance(string, (str, int)): if not isinstance(string, (str, int)):
raise TypeError(f"Cannot construct a version from {type(string)}") raise TypeError(f"Cannot construct a version from {type(string)}")
string = str(string) string = str(string)