Skip to content
Snippets Groups Projects
Verified Commit 4dbebd9c authored by David Runge's avatar David Runge :chipmunk:
Browse files

chore: Adapt type ignores to latest dependency versions (mostly pydantic)


Signed-off-by: default avatarDavid Runge <dvzrv@archlinux.org>
parent 001a4239
No related branches found
No related tags found
1 merge request!161Add documentation and changelog for 0.3.1
......@@ -561,7 +561,7 @@ class CreateOutputPackageBasesTask(Task):
debug(f"Create OutputPackageBase representing pkgbase {key}")
try:
outputpackagebase = OutputPackageBase.from_package(packages=list(group))
outputpackagebase.source_url = self.pkgbase_urls.get(
outputpackagebase.source_url = self.pkgbase_urls.get( # type: ignore[attr-defined]
outputpackagebase.base, # type: ignore[attr-defined]
)
self.pkgbases.append(outputpackagebase)
......
......@@ -128,7 +128,7 @@ def test_matchingfilenamecheck(
) -> None:
caplog.set_level(DEBUG)
packagev1.filename = filename
packagev1.filename = filename # type: ignore[attr-defined]
packagev1.pkginfo.name = name # type: ignore[attr-defined]
packagev1.pkginfo.version = version # type: ignore[attr-defined]
packagev1.pkginfo.arch = arch # type: ignore[attr-defined]
......@@ -154,9 +154,9 @@ def test_pkgbasesversionupdatecheck(
new_outputpackagebase1 = deepcopy(outputpackagebasev1)
new_outputpackagebase2 = deepcopy(outputpackagebasev1)
if increase_version:
new_outputpackagebase1.version = "2:1.0.0-1"
new_outputpackagebase2.version = "2:1.0.0-1"
new_outputpackagebase2.base = "baz"
new_outputpackagebase1.version = "2:1.0.0-1" # type: ignore[attr-defined]
new_outputpackagebase2.version = "2:1.0.0-1" # type: ignore[attr-defined]
new_outputpackagebase2.base = "baz" # type: ignore[attr-defined]
check_ = check.PkgbasesVersionUpdateCheck(
new_pkgbases=[new_outputpackagebase1, new_outputpackagebase2],
......@@ -190,10 +190,10 @@ def test_packagesneworupdatedcheck(
caplog.set_level(DEBUG)
if change_new_base:
outputpackagebasev1.base = "beh"
outputpackagebasev1.base = "beh" # type: ignore[attr-defined]
if increase_version:
outputpackagebasev1.version = "2:1.0.0-1"
outputpackagebasev1.version = "2:1.0.0-1" # type: ignore[attr-defined]
if not create_symlink:
rmtree(outputpackagebasev1_json_files_in_dir / "pkgnames")
......@@ -237,9 +237,13 @@ def test_sourceurlcheck(
new_pkgbase = outputpackagebasev1
current_pkgbase = deepcopy(new_pkgbase)
if new_pkgbase_provides_url:
new_pkgbase.source_url = TypeAdapter(AnyUrl).validate_python("https://foobar.com/foo/bar")
new_pkgbase.source_url = TypeAdapter(AnyUrl).validate_python( # type: ignore[attr-defined]
"https://foobar.com/foo/bar"
)
if current_pkgbase_provides_url:
current_pkgbase.source_url = TypeAdapter(AnyUrl).validate_python("https://foobar.com/foo/bar")
current_pkgbase.source_url = TypeAdapter(AnyUrl).validate_python( # type: ignore[attr-defined]
"https://foobar.com/foo/bar"
)
check_ = check.SourceUrlCheck(
new_pkgbases=[new_pkgbase],
......@@ -280,17 +284,17 @@ def test_stabilitylayercheck(
pkgbases_below = []
pkgbase = outputpackagebasev1
pkgbase.version = pkgbase_version
pkgbase.version = pkgbase_version # type: ignore[attr-defined]
pkgbases.append(pkgbase)
if pkgbase_above_version is not None:
pkgbase_above = deepcopy(pkgbase)
pkgbase_above.version = pkgbase_above_version
pkgbase_above.version = pkgbase_above_version # type: ignore[attr-defined]
pkgbases_above.append(pkgbase_above)
if pkgbase_below_version is not None:
pkgbase_below = deepcopy(pkgbase)
pkgbase_below.version = pkgbase_below_version
pkgbase_below.version = pkgbase_below_version # type: ignore[attr-defined]
pkgbases_below.append(pkgbase_below)
check_ = check.StabilityLayerCheck(
......
......@@ -1483,7 +1483,7 @@ def test_consolidateoutputpackagebasestask_do(
pkgbases = [outputpackagebasev1]
if pkgbase_without_file:
other_pkgbase = deepcopy(outputpackagebasev1)
other_pkgbase.base = "beh"
other_pkgbase.base = "beh" # type: ignore[attr-defined]
pkgbases.append(other_pkgbase)
dependencies = [
......
......@@ -936,7 +936,7 @@ def test_package_desc_v1_get_output_package_v1(
package_desc = packagedescv1
files = filesv1
if no_files:
output_package.files = None
output_package.files = None # type: ignore[attr-defined]
files = None
if invalid_packagedesc_version:
package_desc = PackageDescV9999()
......@@ -976,7 +976,7 @@ def test_package_desc_v1_get_output_package_base_v1(
# remove all but the first package
output_package_base.packages = output_package_base.packages[0:1] # type: ignore[attr-defined]
# remove buildinfo data (when converting from sync databases we do not have the data available)
output_package_base.buildinfo = None
output_package_base.buildinfo = None # type: ignore[attr-defined]
if no_files:
files = None
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment