diff --git a/examples/manual_repo/basic_repo.py b/examples/manual_repo/basic_repo.py index e619c190af..a974460767 100644 --- a/examples/manual_repo/basic_repo.py +++ b/examples/manual_repo/basic_repo.py @@ -1,3 +1,6 @@ +# Copyright 2021-2024, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ A TUF repository example using the low-level TUF Metadata API. diff --git a/examples/manual_repo/hashed_bin_delegation.py b/examples/manual_repo/hashed_bin_delegation.py index 144a612e7d..f84a2acc03 100644 --- a/examples/manual_repo/hashed_bin_delegation.py +++ b/examples/manual_repo/hashed_bin_delegation.py @@ -1,3 +1,6 @@ +# Copyright 2021-2025, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """ A TUF hash bin delegation example using the low-level TUF Metadata API. diff --git a/examples/manual_repo/succinct_hash_bin_delegations.py b/examples/manual_repo/succinct_hash_bin_delegations.py index 3923a97d16..d0c94bd91f 100644 --- a/examples/manual_repo/succinct_hash_bin_delegations.py +++ b/examples/manual_repo/succinct_hash_bin_delegations.py @@ -1,4 +1,4 @@ -# Copyright New York University and the TUF contributors +# Copyright 2022-2024, New York University and the TUF contributors # SPDX-License-Identifier: MIT OR Apache-2.0 """ A TUF succinct hash bin delegation example using the low-level TUF Metadata API. diff --git a/requirements/lint.txt b/requirements/lint.txt index 48c02dd262..1d04579454 100644 --- a/requirements/lint.txt +++ b/requirements/lint.txt @@ -6,9 +6,9 @@ # Lint tools # (We are not so interested in the specific versions of the tools: the versions # are pinned to prevent unexpected linting failures when tools update) -ruff==0.15.22 +ruff==0.16.2 mypy==2.3.0 -zizmor==1.26.1 +zizmor==1.29.0 # Required for type stubs freezegun==1.5.5 diff --git a/requirements/test.txt b/requirements/test.txt index abc35e27a7..59a97b8472 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -4,5 +4,5 @@ -r pinned.txt # coverage measurement -coverage[toml]==7.15.2 +coverage[toml]==7.15.4 freezegun==1.5.5 diff --git a/tests/__init__.py b/tests/__init__.py index e69de29bb2..5f79ac6b1e 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -0,0 +1,2 @@ +# Copyright 2013-2024, the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 diff --git a/tests/generated_data/__init__.py b/tests/generated_data/__init__.py index e69de29bb2..4fd7379ef3 100644 --- a/tests/generated_data/__init__.py +++ b/tests/generated_data/__init__.py @@ -0,0 +1,2 @@ +# Copyright 2013-2022, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 diff --git a/tests/generated_data/generate_md.py b/tests/generated_data/generate_md.py index c7cabeec78..cb9b04577d 100644 --- a/tests/generated_data/generate_md.py +++ b/tests/generated_data/generate_md.py @@ -1,8 +1,8 @@ -"""Script for generating new metadata files.""" - -# Copyright New York University and the TUF contributors +# Copyright 2022-2024, New York University and the TUF contributors # SPDX-License-Identifier: MIT OR Apache-2.0 +"""Script for generating new metadata files.""" + from __future__ import annotations import os diff --git a/tests/test_metadata_eq_.py b/tests/test_metadata_eq_.py index 4768c86761..d07927358d 100644 --- a/tests/test_metadata_eq_.py +++ b/tests/test_metadata_eq_.py @@ -1,4 +1,4 @@ -# Copyright New York University and the TUF contributors +# Copyright 2022-2025, New York University and the TUF contributors # SPDX-License-Identifier: MIT OR Apache-2.0 """Test __eq__ implementations of classes inside tuf/api/metadata.py.""" diff --git a/tests/test_metadata_generation.py b/tests/test_metadata_generation.py index 03cc5ab688..494df73544 100644 --- a/tests/test_metadata_generation.py +++ b/tests/test_metadata_generation.py @@ -1,8 +1,8 @@ -"""Unit tests for 'tests/generated_data/generate_md.py'.""" - -# Copyright New York University and the TUF contributors +# Copyright 2022-2024, New York University and the TUF contributors # SPDX-License-Identifier: MIT OR Apache-2.0 +"""Unit tests for 'tests/generated_data/generate_md.py'.""" + import sys import unittest diff --git a/tests/test_metadata_serialization.py b/tests/test_metadata_serialization.py index 7d1099fcb9..c7457482cc 100644 --- a/tests/test_metadata_serialization.py +++ b/tests/test_metadata_serialization.py @@ -1,4 +1,4 @@ -# Copyright New York University and the TUF contributors +# Copyright 2021-2024, New York University and the TUF contributors # SPDX-License-Identifier: MIT OR Apache-2.0 """Unit tests testing tuf/api/metadata.py classes diff --git a/tests/test_trusted_metadata_set.py b/tests/test_trusted_metadata_set.py index fd59635ed8..008008b0a7 100644 --- a/tests/test_trusted_metadata_set.py +++ b/tests/test_trusted_metadata_set.py @@ -1,3 +1,6 @@ +# Copyright 2021-2026, the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """Unit tests for 'tuf/ngclient/_internal/trusted_metadata_set.py'.""" from __future__ import annotations diff --git a/tuf/__init__.py b/tuf/__init__.py index 6a942ce5ee..2b08224170 100644 --- a/tuf/__init__.py +++ b/tuf/__init__.py @@ -1,4 +1,4 @@ -# Copyright New York University and the TUF contributors +# Copyright 2013-2026, New York University and the TUF contributors # SPDX-License-Identifier: MIT OR Apache-2.0 """TUF.""" diff --git a/tuf/api/__init__.py b/tuf/api/__init__.py index e69de29bb2..894e6323c2 100644 --- a/tuf/api/__init__.py +++ b/tuf/api/__init__.py @@ -0,0 +1,2 @@ +# Copyright 2013-2020, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 diff --git a/tuf/api/_payload.py b/tuf/api/_payload.py index bfcc87a659..9a6922e6fb 100644 --- a/tuf/api/_payload.py +++ b/tuf/api/_payload.py @@ -1,4 +1,4 @@ -# Copyright the TUF contributors +# Copyright 2020-2026, the TUF contributors # SPDX-License-Identifier: MIT OR Apache-2.0 @@ -530,7 +530,7 @@ class Root(Signed, _DelegatorMixin): type = _ROOT - def __init__( + def __init__( # noqa: PLR0917 self, version: int | None = None, spec_version: str | None = None, @@ -1089,7 +1089,7 @@ class DelegatedRole(Role): ValueError: Invalid arguments. """ - def __init__( + def __init__( # noqa: PLR0917 self, name: str, keyids: list[str], @@ -1710,7 +1710,7 @@ class Targets(Signed, _DelegatorMixin): type = _TARGETS - def __init__( + def __init__( # noqa: PLR0917 self, version: int | None = None, spec_version: str | None = None, diff --git a/tuf/api/dsse.py b/tuf/api/dsse.py index ae624b5107..8299100a8c 100644 --- a/tuf/api/dsse.py +++ b/tuf/api/dsse.py @@ -1,3 +1,6 @@ +# Copyright 2023-2025, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 + """Low-level TUF DSSE API. (experimental!)""" from __future__ import annotations diff --git a/tuf/api/exceptions.py b/tuf/api/exceptions.py index d5ba2ecce0..c049f315ea 100644 --- a/tuf/api/exceptions.py +++ b/tuf/api/exceptions.py @@ -1,4 +1,4 @@ -# Copyright New York University and the TUF contributors +# Copyright 2021-2025, New York University and the TUF contributors # SPDX-License-Identifier: MIT OR Apache-2.0 """ diff --git a/tuf/api/metadata.py b/tuf/api/metadata.py index 85433e73a7..8bd281131a 100644 --- a/tuf/api/metadata.py +++ b/tuf/api/metadata.py @@ -1,4 +1,4 @@ -# Copyright New York University and the TUF contributors +# Copyright 2020-2025, New York University and the TUF contributors # SPDX-License-Identifier: MIT OR Apache-2.0 """The low-level Metadata API. diff --git a/tuf/api/serialization/__init__.py b/tuf/api/serialization/__init__.py index f24a70227f..bc1715e800 100644 --- a/tuf/api/serialization/__init__.py +++ b/tuf/api/serialization/__init__.py @@ -1,4 +1,4 @@ -# Copyright New York University and the TUF contributors +# Copyright 2021-2024, New York University and the TUF contributors # SPDX-License-Identifier: MIT OR Apache-2.0 """``tuf.api.serialization`` module provides abstract base classes and concrete diff --git a/tuf/api/serialization/json.py b/tuf/api/serialization/json.py index 9b411eb99f..7232152f3a 100644 --- a/tuf/api/serialization/json.py +++ b/tuf/api/serialization/json.py @@ -1,4 +1,4 @@ -# Copyright New York University and the TUF contributors +# Copyright 2021-2025, New York University and the TUF contributors # SPDX-License-Identifier: MIT OR Apache-2.0 """``tuf.api.serialization.json`` module provides concrete implementations to diff --git a/tuf/ngclient/__init__.py b/tuf/ngclient/__init__.py index afab48f5cd..fe72c6cf2b 100644 --- a/tuf/ngclient/__init__.py +++ b/tuf/ngclient/__init__.py @@ -1,4 +1,4 @@ -# Copyright New York University and the TUF contributors +# Copyright 2021-2025, New York University and the TUF contributors # SPDX-License-Identifier: MIT OR Apache-2.0 """TUF client public API.""" diff --git a/tuf/ngclient/_internal/__init__.py b/tuf/ngclient/_internal/__init__.py index e69de29bb2..21a6146d16 100644 --- a/tuf/ngclient/_internal/__init__.py +++ b/tuf/ngclient/_internal/__init__.py @@ -0,0 +1,2 @@ +# Copyright 2013-2021, New York University and the TUF contributors +# SPDX-License-Identifier: MIT OR Apache-2.0 diff --git a/tuf/ngclient/_internal/proxy.py b/tuf/ngclient/_internal/proxy.py index b42ea2f415..f863428318 100644 --- a/tuf/ngclient/_internal/proxy.py +++ b/tuf/ngclient/_internal/proxy.py @@ -1,4 +1,4 @@ -# Copyright New York University and the TUF contributors +# Copyright 2025, New York University and the TUF contributors # SPDX-License-Identifier: MIT OR Apache-2.0 """Proxy environment variable handling with Urllib3""" diff --git a/tuf/ngclient/_internal/trusted_metadata_set.py b/tuf/ngclient/_internal/trusted_metadata_set.py index 689eef01de..8f1c1336e9 100644 --- a/tuf/ngclient/_internal/trusted_metadata_set.py +++ b/tuf/ngclient/_internal/trusted_metadata_set.py @@ -1,4 +1,4 @@ -# Copyright the TUF contributors +# Copyright 2021-2026, the TUF contributors # SPDX-License-Identifier: MIT OR Apache-2.0 """Trusted collection of client-side TUF Metadata. diff --git a/tuf/ngclient/updater.py b/tuf/ngclient/updater.py index 9b93053464..aada3b5729 100644 --- a/tuf/ngclient/updater.py +++ b/tuf/ngclient/updater.py @@ -103,7 +103,7 @@ class Updater: RepositoryError: Local root.json is invalid """ - def __init__( + def __init__( # noqa: PLR0917 self, metadata_dir: str, metadata_base_url: str,