diff --git a/setup.py b/setup.py index 5720ca4d48..275446acd9 100755 --- a/setup.py +++ b/setup.py @@ -103,7 +103,7 @@ def recursive_data_files(directory, install_directory): "craft-cli~=2.6", "craft-grammar>=2.0.1,<3.0.0", "craft-parts>=2.1.2,<3.0.0", - "craft-platforms~=0.4.0", + "craft-platforms~=0.4", "craft-providers>=2.0.4,<3.0.0", "craft-store>=3.0.2,<4.0.0", "docutils<0.20", # Frozen until we can update sphinx dependencies. diff --git a/snapcraft/models/project.py b/snapcraft/models/project.py index d3cad5581b..d748ef347f 100644 --- a/snapcraft/models/project.py +++ b/snapcraft/models/project.py @@ -1233,10 +1233,6 @@ def get_build_plan(self) -> list[BuildInfo]: # the two overloads of get_platforms_snap_build_plan. But, pyright and # mypy aren't smart enough to realize this, so we need the type checker # ignores. - # Also note that you have to put mypy's "type" ignore before the - # pyright ignore when they're on the same line, because only pyright is - # smart enough to register the ignore when it isn't the first comment - # on the line. _validate_mandatory_base(self.base, self.type) return [ BuildInfo( @@ -1249,7 +1245,7 @@ def get_build_plan(self) -> list[BuildInfo]: ), ) for buildinfo in snap.get_platforms_snap_build_plan( # pyright: ignore[reportCallIssue] - base=self.base, # type: ignore[arg-type] # pyright: ignore[reportArgumentType] + base=self.base, # type: ignore[arg-type] build_base=self.build_base, snap_type=self.type, # type: ignore[arg-type] platforms=platforms,