morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Core: Cleanup unneeded use of Version/tuplize_version (#5519)

Browse Source 
* Remove weird version uses

* Restore version var

* Unrestore version var
This commit is contained in:
Duck
2025-10-05 17:56:09 -06:00
committed by GitHub
parent 60617c682e
commit 8dc9719b99
5 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Options.py
View File

@@ -1710,7 +1710,7 @@ def generate_yaml_templates(target_folder: typing.Union[str, "pathlib.Path"], ge
from jinja2 import Template from jinja2 import Template
from worlds import AutoWorldRegister from worlds import AutoWorldRegister
from Utils import local_path, __version__, tuplize_version from Utils import local_path, __version__
full_path: str full_path: str

3
Utils.py
View File

@@ -35,7 +35,7 @@ if typing.TYPE_CHECKING:
def tuplize_version(version: str) -> Version: def tuplize_version(version: str) -> Version:
return Version(*(int(piece, 10) for piece in version.split("."))) return Version(*(int(piece) for piece in version.split(".")))
class Version(typing.NamedTuple): class Version(typing.NamedTuple):
@@ -49,7 +49,6 @@ class Version(typing.NamedTuple):
__version__ = "0.6.4" __version__ = "0.6.4"
version_tuple = tuplize_version(__version__) version_tuple = tuplize_version(__version__)
version = Version(*version_tuple)
is_linux = sys.platform.startswith("linux") is_linux = sys.platform.startswith("linux")
is_macos = sys.platform == "darwin" is_macos = sys.platform == "darwin"

5
setup.py
View File

@@ -372,7 +372,6 @@ class BuildExeCommand(cx_Freeze.command.build_exe.build_exe):
from Options import generate_yaml_templates from Options import generate_yaml_templates
from worlds.AutoWorld import AutoWorldRegister from worlds.AutoWorld import AutoWorldRegister
from worlds.Files import APWorldContainer from worlds.Files import APWorldContainer
from Utils import version
assert not non_apworlds - set(AutoWorldRegister.world_types), \ assert not non_apworlds - set(AutoWorldRegister.world_types), \
f"Unknown world {non_apworlds - set(AutoWorldRegister.world_types)} designated for .apworld" f"Unknown world {non_apworlds - set(AutoWorldRegister.world_types)} designated for .apworld"
folders_to_remove: list[str] = [] folders_to_remove: list[str] = []
@@ -398,8 +397,8 @@ class BuildExeCommand(cx_Freeze.command.build_exe.build_exe):
# which should be ok # which should be ok
zip_path = self.libfolder / "worlds" / (file_name + ".apworld") zip_path = self.libfolder / "worlds" / (file_name + ".apworld")
apworld = APWorldContainer(str(zip_path)) apworld = APWorldContainer(str(zip_path))
apworld.minimum_ap_version = version apworld.minimum_ap_version = version_tuple
apworld.maximum_ap_version = version apworld.maximum_ap_version = version_tuple
apworld.game = worldtype.game apworld.game = worldtype.game
manifest.update(apworld.get_manifest()) manifest.update(apworld.get_manifest())
apworld.manifest_path = f"{file_name}/archipelago.json" apworld.manifest_path = f"{file_name}/archipelago.json"

4
worlds/Files.py
View File

@@ -175,12 +175,12 @@ class APWorldContainer(APContainer):
maximum_ap_version: "Version | None" = None maximum_ap_version: "Version | None" = None
def read_contents(self, opened_zipfile: zipfile.ZipFile) -> Dict[str, Any]: def read_contents(self, opened_zipfile: zipfile.ZipFile) -> Dict[str, Any]:
from Utils import tuplize_version, Version from Utils import tuplize_version
manifest = super().read_contents(opened_zipfile) manifest = super().read_contents(opened_zipfile)
self.game = manifest["game"] self.game = manifest["game"]
for version_key in ("world_version", "minimum_ap_version", "maximum_ap_version"): for version_key in ("world_version", "minimum_ap_version", "maximum_ap_version"):
if version_key in manifest: if version_key in manifest:
setattr(self, version_key, Version(*tuplize_version(manifest[version_key]))) setattr(self, version_key, tuplize_version(manifest[version_key]))
return manifest return manifest
def get_manifest(self) -> Dict[str, Any]: def get_manifest(self) -> Dict[str, Any]:

3
worlds/__init__.py
View File

@@ -128,8 +128,7 @@ for world_source in world_sources:
break break
game = manifest.get("game") game = manifest.get("game")
if game in AutoWorldRegister.world_types: if game in AutoWorldRegister.world_types:
AutoWorldRegister.world_types[game].world_version = Version(*tuplize_version(manifest.get("world_version", AutoWorldRegister.world_types[game].world_version = tuplize_version(manifest.get("world_version", "0.0.0"))
"0.0.0")))
if apworlds: if apworlds:
# encapsulation for namespace / gc purposes # encapsulation for namespace / gc purposes