diff --git a/.spdev/rust.py b/.spdev/rust.py index 307034a7dd..034a9a6a48 100644 --- a/.spdev/rust.py +++ b/.spdev/rust.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + import spdev diff --git a/conftest.py b/conftest.py index 19c9e6aaff..01fdb5dd94 100644 --- a/conftest.py +++ b/conftest.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Any import py.path import pytest diff --git a/examples/_test.py b/examples/_test.py index 61e5fd25c1..91b557b8e0 100644 --- a/examples/_test.py +++ b/examples/_test.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Any, Iterable import os import sys diff --git a/examples/cmake/package.py b/examples/cmake/package.py index 425267d8f2..1b4600ad54 100644 --- a/examples/cmake/package.py +++ b/examples/cmake/package.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + name = "SSPKCmakeExample" # the package version number is updated automatically in this file diff --git a/examples/python/python_example/__init__.py b/examples/python/python_example/__init__.py index 4aedaeb19c..a811f10642 100644 --- a/examples/python/python_example/__init__.py +++ b/examples/python/python_example/__init__.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + """An example spk package written in python""" __version__ = "0.1.0" diff --git a/examples/python/python_example/__main__.py b/examples/python/python_example/__main__.py index a4449a2a10..72d091e251 100644 --- a/examples/python/python_example/__main__.py +++ b/examples/python/python_example/__main__.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + import python_example print(python_example.__version__) diff --git a/examples/python/python_example/_example_test.py b/examples/python/python_example/_example_test.py index 5613c54f7a..c21f9c3ca4 100644 --- a/examples/python/python_example/_example_test.py +++ b/examples/python/python_example/_example_test.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from . import print_version diff --git a/examples/python/setup.py b/examples/python/setup.py index 93dc79675a..89d3e33612 100644 --- a/examples/python/setup.py +++ b/examples/python/setup.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + """ The setup.py file is a command line application built with setuptools. diff --git a/setup.py b/setup.py index 4f52a66afa..e6b2645d20 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + """ The setup.py file is a command line application built with setuptools. diff --git a/spk/__init__.py b/spk/__init__.py index ae35cf302f..651069e1cd 100644 --- a/spk/__init__.py +++ b/spk/__init__.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + """SPack - an SpFS Package Manager""" __version__ = "0.28.1" diff --git a/spk/__main__.py b/spk/__main__.py index 2e09f6d734..7d15d61405 100755 --- a/spk/__main__.py +++ b/spk/__main__.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + #!/usr/bin/env python3 """Command-line entrypoint for spk.""" import spk.cli diff --git a/spk/_env.py b/spk/_env.py index 8cac94ab01..dec8c63b53 100644 --- a/spk/_env.py +++ b/spk/_env.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + import os import spkrs diff --git a/spk/_global.py b/spk/_global.py index 3c498212a6..ec87cfaf5a 100644 --- a/spk/_global.py +++ b/spk/_global.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Union from . import api, storage diff --git a/spk/_global_test.py b/spk/_global_test.py index c908b474a0..c74dce35ff 100644 --- a/spk/_global_test.py +++ b/spk/_global_test.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + import pytest from . import storage, api diff --git a/spk/_publish.py b/spk/_publish.py index 64620a376c..34e4967b11 100644 --- a/spk/_publish.py +++ b/spk/_publish.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Union import structlog diff --git a/spk/_publish_test.py b/spk/_publish_test.py index c054f874f0..720deb7904 100644 --- a/spk/_publish_test.py +++ b/spk/_publish_test.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + import spkrs from . import api, storage diff --git a/spk/api/__init__.py b/spk/api/__init__.py index 9fd2c889cd..9e36deac26 100644 --- a/spk/api/__init__.py +++ b/spk/api/__init__.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from ._name import InvalidNameError from ._option_map import OptionMap, host_options from ._version import Version, parse_version, VERSION_SEP, InvalidVersionError diff --git a/spk/api/_build.py b/spk/api/_build.py index 7aad2ce8d6..b8e3b2af7e 100644 --- a/spk/api/_build.py +++ b/spk/api/_build.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from dataclasses import dataclass import base64 import binascii diff --git a/spk/api/_build_spec.py b/spk/api/_build_spec.py index 7fc00eb9a2..56c7b0f5d9 100644 --- a/spk/api/_build_spec.py +++ b/spk/api/_build_spec.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Dict, List, Any, Optional, Tuple, Union, Set import abc import enum diff --git a/spk/api/_build_spec_test.py b/spk/api/_build_spec_test.py index 402b8073cf..0854a16427 100644 --- a/spk/api/_build_spec_test.py +++ b/spk/api/_build_spec_test.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Dict, Type import pytest diff --git a/spk/api/_build_test.py b/spk/api/_build_test.py index db90c1f67b..c6d4ca3ccf 100644 --- a/spk/api/_build_test.py +++ b/spk/api/_build_test.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + import pytest from ._build import parse_build, SRC diff --git a/spk/api/_compat.py b/spk/api/_compat.py index c530c57d36..142d96104f 100644 --- a/spk/api/_compat.py +++ b/spk/api/_compat.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Any import enum diff --git a/spk/api/_compat_test.py b/spk/api/_compat_test.py index 649afbc1ec..820b1c5c61 100644 --- a/spk/api/_compat_test.py +++ b/spk/api/_compat_test.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + import pytest from ._version import parse_version diff --git a/spk/api/_ident.py b/spk/api/_ident.py index 41f58f08d3..0e7375bf83 100644 --- a/spk/api/_ident.py +++ b/spk/api/_ident.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Union, Optional from dataclasses import dataclass, field diff --git a/spk/api/_ident_test.py b/spk/api/_ident_test.py index 3fbeb3ffeb..f8c6e91915 100644 --- a/spk/api/_ident_test.py +++ b/spk/api/_ident_test.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from ._version import parse_version from ._build import Build from ._ident import Ident, parse_ident diff --git a/spk/api/_name.py b/spk/api/_name.py index ef55ac056d..ec5701c835 100644 --- a/spk/api/_name.py +++ b/spk/api/_name.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Tuple import unicodedata diff --git a/spk/api/_option_map.py b/spk/api/_option_map.py index 719ba66b8b..d7bf9279ea 100644 --- a/spk/api/_option_map.py +++ b/spk/api/_option_map.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Dict, Any, Mapping import hashlib import base64 diff --git a/spk/api/_option_map_test.py b/spk/api/_option_map_test.py index 380f1e0028..b84def56f6 100644 --- a/spk/api/_option_map_test.py +++ b/spk/api/_option_map_test.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from ._option_map import OptionMap diff --git a/spk/api/_request.py b/spk/api/_request.py index 1a0619e717..da18edebc4 100644 --- a/spk/api/_request.py +++ b/spk/api/_request.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Dict, Any, Union, Optional, TypeVar, TYPE_CHECKING from dataclasses import dataclass, field import abc diff --git a/spk/api/_request_test.py b/spk/api/_request_test.py index 8986ae50b5..d2af07c729 100644 --- a/spk/api/_request_test.py +++ b/spk/api/_request_test.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from ._request import PkgRequest, PreReleasePolicy, InclusionPolicy diff --git a/spk/api/_source_spec.py b/spk/api/_source_spec.py index be7db0c51e..722c21e826 100644 --- a/spk/api/_source_spec.py +++ b/spk/api/_source_spec.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Dict, List, Any, Optional import abc import os diff --git a/spk/api/_source_spec_test.py b/spk/api/_source_spec_test.py index fc8d69f9c3..91ec3084a5 100644 --- a/spk/api/_source_spec_test.py +++ b/spk/api/_source_spec_test.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + import tarfile import os diff --git a/spk/api/_spec.py b/spk/api/_spec.py index 1bec0acc42..3d1abe7518 100644 --- a/spk/api/_spec.py +++ b/spk/api/_spec.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from ast import parse from typing import List, Any, Dict, Optional, Union, IO, Iterable from dataclasses import dataclass, field diff --git a/spk/api/_spec_test.py b/spk/api/_spec_test.py index ca0bac22fb..53cce77c7c 100644 --- a/spk/api/_spec_test.py +++ b/spk/api/_spec_test.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + import io import pytest diff --git a/spk/api/_test_spec.py b/spk/api/_test_spec.py index 27d5245db6..30678e2149 100644 --- a/spk/api/_test_spec.py +++ b/spk/api/_test_spec.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Dict, List, Any from dataclasses import dataclass, field diff --git a/spk/api/_version.py b/spk/api/_version.py index 970fd8e93f..f27a87e7b2 100644 --- a/spk/api/_version.py +++ b/spk/api/_version.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Tuple, Any, MutableMapping from dataclasses import dataclass, field from sortedcontainers import SortedDict diff --git a/spk/api/_version_range.py b/spk/api/_version_range.py index 97a3057741..3120a0f68d 100644 --- a/spk/api/_version_range.py +++ b/spk/api/_version_range.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Optional, Any, Union, Set, TYPE_CHECKING import abc from functools import lru_cache diff --git a/spk/api/_version_range_test.py b/spk/api/_version_range_test.py index 572a0ef4d2..18dea621d0 100644 --- a/spk/api/_version_range_test.py +++ b/spk/api/_version_range_test.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Dict import pytest diff --git a/spk/api/_version_test.py b/spk/api/_version_test.py index 5d97b4a8cf..633563aad1 100644 --- a/spk/api/_version_test.py +++ b/spk/api/_version_test.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + import pytest from ._version import parse_version, Version, TagSet diff --git a/spk/cli/__init__.py b/spk/cli/__init__.py index f4e179c121..683e6019f9 100644 --- a/spk/cli/__init__.py +++ b/spk/cli/__init__.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + """Main entry points and utilities for command line interface and interaction.""" from ._run import main, run diff --git a/spk/cli/_args.py b/spk/cli/_args.py index 416952ebd1..5da24abcdf 100644 --- a/spk/cli/_args.py +++ b/spk/cli/_args.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Sequence import os import sys diff --git a/spk/cli/_cmd_bake.py b/spk/cli/_cmd_bake.py index 4367c53a29..d3531d2455 100644 --- a/spk/cli/_cmd_bake.py +++ b/spk/cli/_cmd_bake.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Any, List import argparse import sys diff --git a/spk/cli/_cmd_build.py b/spk/cli/_cmd_build.py index 00a12ea9b4..bdfce89007 100644 --- a/spk/cli/_cmd_build.py +++ b/spk/cli/_cmd_build.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from spk import build from typing import Any import argparse diff --git a/spk/cli/_cmd_convert.py b/spk/cli/_cmd_convert.py index 6dbe7f6500..6807558c1b 100644 --- a/spk/cli/_cmd_convert.py +++ b/spk/cli/_cmd_convert.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Any import re import argparse diff --git a/spk/cli/_cmd_deprecate.py b/spk/cli/_cmd_deprecate.py index a2dd729c23..7be698506a 100644 --- a/spk/cli/_cmd_deprecate.py +++ b/spk/cli/_cmd_deprecate.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Any import argparse import sys diff --git a/spk/cli/_cmd_env.py b/spk/cli/_cmd_env.py index 3fc997c8da..cd6e50abbd 100644 --- a/spk/cli/_cmd_env.py +++ b/spk/cli/_cmd_env.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Any import argparse import sys diff --git a/spk/cli/_cmd_explain.py b/spk/cli/_cmd_explain.py index 7473b966bb..c724d3f869 100644 --- a/spk/cli/_cmd_explain.py +++ b/spk/cli/_cmd_explain.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Any, Optional import argparse import sys diff --git a/spk/cli/_cmd_export.py b/spk/cli/_cmd_export.py index 75cd1770ac..eca03434fd 100644 --- a/spk/cli/_cmd_export.py +++ b/spk/cli/_cmd_export.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Any import os import argparse diff --git a/spk/cli/_cmd_import.py b/spk/cli/_cmd_import.py index a9d82d9538..75ee12d67f 100644 --- a/spk/cli/_cmd_import.py +++ b/spk/cli/_cmd_import.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Any import argparse diff --git a/spk/cli/_cmd_install.py b/spk/cli/_cmd_install.py index 9fca03f163..a3b2e834d7 100644 --- a/spk/cli/_cmd_install.py +++ b/spk/cli/_cmd_install.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Any import argparse import sys diff --git a/spk/cli/_cmd_ls.py b/spk/cli/_cmd_ls.py index 5aecd24946..08baa1c030 100644 --- a/spk/cli/_cmd_ls.py +++ b/spk/cli/_cmd_ls.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Any, Dict import argparse import sys diff --git a/spk/cli/_cmd_make_binary.py b/spk/cli/_cmd_make_binary.py index 41b79e358b..a2791aa43c 100644 --- a/spk/cli/_cmd_make_binary.py +++ b/spk/cli/_cmd_make_binary.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Any import argparse import os diff --git a/spk/cli/_cmd_make_source.py b/spk/cli/_cmd_make_source.py index 782848ed5c..dadc0e1f61 100644 --- a/spk/cli/_cmd_make_source.py +++ b/spk/cli/_cmd_make_source.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Any import argparse import os diff --git a/spk/cli/_cmd_new.py b/spk/cli/_cmd_new.py index a42796a9bf..a66993f02c 100644 --- a/spk/cli/_cmd_new.py +++ b/spk/cli/_cmd_new.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Any import argparse diff --git a/spk/cli/_cmd_new_test.py b/spk/cli/_cmd_new_test.py index f11ade1ea0..e46daa59ad 100644 --- a/spk/cli/_cmd_new_test.py +++ b/spk/cli/_cmd_new_test.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + import io import spk diff --git a/spk/cli/_cmd_publish.py b/spk/cli/_cmd_publish.py index 2887449bd3..4daa57507e 100644 --- a/spk/cli/_cmd_publish.py +++ b/spk/cli/_cmd_publish.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Any import argparse diff --git a/spk/cli/_cmd_remove.py b/spk/cli/_cmd_remove.py index 3121217562..f56f7b35dc 100644 --- a/spk/cli/_cmd_remove.py +++ b/spk/cli/_cmd_remove.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Any import argparse import sys diff --git a/spk/cli/_cmd_render.py b/spk/cli/_cmd_render.py index 39de74c605..a0ef5efb98 100644 --- a/spk/cli/_cmd_render.py +++ b/spk/cli/_cmd_render.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + import os from typing import Any import argparse diff --git a/spk/cli/_cmd_search.py b/spk/cli/_cmd_search.py index 5548dbfaea..ecb00be961 100644 --- a/spk/cli/_cmd_search.py +++ b/spk/cli/_cmd_search.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Any import argparse diff --git a/spk/cli/_cmd_test.py b/spk/cli/_cmd_test.py index 8ace9b97e4..d6a9e9877b 100644 --- a/spk/cli/_cmd_test.py +++ b/spk/cli/_cmd_test.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Any, Union import argparse diff --git a/spk/cli/_cmd_version.py b/spk/cli/_cmd_version.py index 23df6b73cf..330b4b6cab 100644 --- a/spk/cli/_cmd_version.py +++ b/spk/cli/_cmd_version.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Any import argparse diff --git a/spk/cli/_cmd_view.py b/spk/cli/_cmd_view.py index 53fdf265a2..fb8a9616ac 100644 --- a/spk/cli/_cmd_view.py +++ b/spk/cli/_cmd_view.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Any import argparse import sys diff --git a/spk/cli/_flags.py b/spk/cli/_flags.py index 023cbe99f1..b3faf8b577 100644 --- a/spk/cli/_flags.py +++ b/spk/cli/_flags.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from spk.exec import _LOGGER from typing import Dict, List, Tuple import os diff --git a/spk/cli/_run.py b/spk/cli/_run.py index c9da851832..4d659378a2 100644 --- a/spk/cli/_run.py +++ b/spk/cli/_run.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Sequence import sys import traceback diff --git a/spk/exec.py b/spk/exec.py index 4e6de87b56..39dd1adff4 100644 --- a/spk/exec.py +++ b/spk/exec.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import List import sys diff --git a/spk/external/__init__.py b/spk/external/__init__.py index 653e09b783..609f31b685 100644 --- a/spk/external/__init__.py +++ b/spk/external/__init__.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + """Utilities to interop with external packaging systems.""" from ._spcomp2 import import_spcomp2 diff --git a/spk/external/_pip.py b/spk/external/_pip.py index 57b21d87a0..3efa0c2f2a 100644 --- a/spk/external/_pip.py +++ b/spk/external/_pip.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import List, Optional, Set import re import tempfile diff --git a/spk/external/_pip_test.py b/spk/external/_pip_test.py index 5e36060773..150749c546 100644 --- a/spk/external/_pip_test.py +++ b/spk/external/_pip_test.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + import pytest from .. import api diff --git a/spk/external/_spcomp2.py b/spk/external/_spcomp2.py index 3cc33f4989..ea7c3522da 100644 --- a/spk/external/_spcomp2.py +++ b/spk/external/_spcomp2.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Iterable, List, Iterable, Optional, Tuple import os import re diff --git a/spk/external/_spcomp2_test.py b/spk/external/_spcomp2_test.py index cda2a11cb3..91ce261431 100644 --- a/spk/external/_spcomp2_test.py +++ b/spk/external/_spcomp2_test.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + import os import pytest diff --git a/spk/io.py b/spk/io.py index 0ce2f87a0c..dec9893b59 100644 --- a/spk/io.py +++ b/spk/io.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Iterable, Sequence, TextIO, Tuple, Union from colorama import Fore, Style import io diff --git a/spk/solve/__init__.py b/spk/solve/__init__.py index 811046750b..fe3681d95f 100644 --- a/spk/solve/__init__.py +++ b/spk/solve/__init__.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from ._errors import ( SolverError, PackageNotFoundError, diff --git a/spk/solve/_errors.py b/spk/solve/_errors.py index d68702dced..15b925e46d 100644 --- a/spk/solve/_errors.py +++ b/spk/solve/_errors.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from .. import storage diff --git a/spk/solve/_graph_test.py b/spk/solve/_graph_test.py index aca9649b45..fd1013ea1b 100644 --- a/spk/solve/_graph_test.py +++ b/spk/solve/_graph_test.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from .. import api, io from . import graph, Solution diff --git a/spk/solve/_package_iterator.py b/spk/solve/_package_iterator.py index aebeddc1f1..954c1ad520 100644 --- a/spk/solve/_package_iterator.py +++ b/spk/solve/_package_iterator.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import List, Dict, Optional, Iterator, Tuple, Iterator, Tuple, TypeVar from abc import ABCMeta, abstractmethod diff --git a/spk/solve/_solution.py b/spk/solve/_solution.py index 81aee19f6c..a1ddae6b06 100644 --- a/spk/solve/_solution.py +++ b/spk/solve/_solution.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Mapping, Tuple, Iterator, Dict, List, NamedTuple, Union from .. import api, storage diff --git a/spk/solve/_solver.py b/spk/solve/_solver.py index 10ed97dfa7..96ded09f0c 100644 --- a/spk/solve/_solver.py +++ b/spk/solve/_solver.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Generator, Iterable, Iterator, List, Optional, Tuple, Union, Dict import structlog diff --git a/spk/solve/_solver_test.py b/spk/solve/_solver_test.py index 9f303bc3bf..65dac2f28b 100644 --- a/spk/solve/_solver_test.py +++ b/spk/solve/_solver_test.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Any, Dict, List, Union import spkrs diff --git a/spk/solve/_validation_test.py b/spk/solve/_validation_test.py index bba1c9adc7..e5020b4fc7 100644 --- a/spk/solve/_validation_test.py +++ b/spk/solve/_validation_test.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import List from .. import api from .graph import State diff --git a/spk/solve/graph.py b/spk/solve/graph.py index dd0cae1232..dbb19ff590 100644 --- a/spk/solve/graph.py +++ b/spk/solve/graph.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Dict, Iterable, Iterator, List, NamedTuple, Optional, Tuple import abc import base64 diff --git a/spk/solve/legacy/__init__.py b/spk/solve/legacy/__init__.py index 1151604b3a..f53f63412d 100644 --- a/spk/solve/legacy/__init__.py +++ b/spk/solve/legacy/__init__.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + """The previous implementation of the solver, kept around for regrassion testing.""" from .. import PackageNotFoundError from ._errors import ( diff --git a/spk/solve/legacy/_decision.py b/spk/solve/legacy/_decision.py index 5eaf058ed6..7ba5a53dba 100644 --- a/spk/solve/legacy/_decision.py +++ b/spk/solve/legacy/_decision.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import List, Dict, Optional, Union, Iterator, Iterable from collections import defaultdict from functools import lru_cache diff --git a/spk/solve/legacy/_decision_test.py b/spk/solve/legacy/_decision_test.py index 0bceb4be78..9c42d09c26 100644 --- a/spk/solve/legacy/_decision_test.py +++ b/spk/solve/legacy/_decision_test.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from ... import api, storage from ._decision import Decision from ._package_iterator import RepositoryPackageIterator, FilteredPackageIterator diff --git a/spk/solve/legacy/_errors.py b/spk/solve/legacy/_errors.py index 9b62f88e53..5a1cecd9f7 100644 --- a/spk/solve/legacy/_errors.py +++ b/spk/solve/legacy/_errors.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Dict, Any, Sequence from ... import api diff --git a/spk/solve/legacy/_package_iterator.py b/spk/solve/legacy/_package_iterator.py index 3af9826967..3a720881fd 100644 --- a/spk/solve/legacy/_package_iterator.py +++ b/spk/solve/legacy/_package_iterator.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from abc import ABCMeta, abstractmethod from typing import List, Dict, Optional, Iterator, Tuple, Iterator, Tuple, TypeVar diff --git a/spk/solve/legacy/_package_iterator_test.py b/spk/solve/legacy/_package_iterator_test.py index 26ff624a70..ac4ce54ee1 100644 --- a/spk/solve/legacy/_package_iterator_test.py +++ b/spk/solve/legacy/_package_iterator_test.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + import spkrs from ... import storage, api diff --git a/spk/solve/legacy/_solver.py b/spk/solve/legacy/_solver.py index 85b62893c8..3013c0a967 100644 --- a/spk/solve/legacy/_solver.py +++ b/spk/solve/legacy/_solver.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import List, Union, Dict from ruamel import yaml diff --git a/spk/solve/legacy/_solver_test.py b/spk/solve/legacy/_solver_test.py index a528b6fcd5..f17e5c30d2 100644 --- a/spk/solve/legacy/_solver_test.py +++ b/spk/solve/legacy/_solver_test.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + import pytest from ... import api, io diff --git a/spk/solve/validation.py b/spk/solve/validation.py index 11ff0b7a3c..c7bac17517 100644 --- a/spk/solve/validation.py +++ b/spk/solve/validation.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + import abc from typing import List diff --git a/spk/storage/__init__.py b/spk/storage/__init__.py index e8bb4b5400..c1996c27af 100644 --- a/spk/storage/__init__.py +++ b/spk/storage/__init__.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from ._repository import Repository, PackageNotFoundError, VersionExistsError from ._spfs import SpFSRepository, local_repository, remote_repository from ._mem import MemRepository diff --git a/spk/storage/_archive.py b/spk/storage/_archive.py index 5284d59dfe..424babaa5d 100644 --- a/spk/storage/_archive.py +++ b/spk/storage/_archive.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Union import os diff --git a/spk/storage/_archive_test.py b/spk/storage/_archive_test.py index 0deb17510a..be2cbf2c0a 100644 --- a/spk/storage/_archive_test.py +++ b/spk/storage/_archive_test.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import List import py.path import getpass diff --git a/spk/storage/_mem.py b/spk/storage/_mem.py index 404c98f135..55ba0bfdd7 100644 --- a/spk/storage/_mem.py +++ b/spk/storage/_mem.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Dict, Iterable, Union, Tuple import spkrs diff --git a/spk/storage/_repository.py b/spk/storage/_repository.py index ec8c0bc401..33aff2fcd6 100644 --- a/spk/storage/_repository.py +++ b/spk/storage/_repository.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Any, Iterable, Union import abc diff --git a/spk/storage/_repository_test.py b/spk/storage/_repository_test.py index dadf960dfc..60371f0af6 100644 --- a/spk/storage/_repository_test.py +++ b/spk/storage/_repository_test.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + import pytest import spkrs diff --git a/spk/storage/_runtime.py b/spk/storage/_runtime.py index 60c0673a05..0ac25676e0 100644 --- a/spk/storage/_runtime.py +++ b/spk/storage/_runtime.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Iterable, Union import os diff --git a/spk/storage/_spfs.py b/spk/storage/_spfs.py index d12302a791..a9383454d5 100644 --- a/spk/storage/_spfs.py +++ b/spk/storage/_spfs.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Iterable, Union import io import posixpath diff --git a/spk/storage/conftest.py b/spk/storage/conftest.py index 0d8b3330e1..0dcf2ce17a 100644 --- a/spk/storage/conftest.py +++ b/spk/storage/conftest.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Any import py.path diff --git a/spk/test/__init__.py b/spk/test/__init__.py index 5a38a77cdf..96100ad5ba 100644 --- a/spk/test/__init__.py +++ b/spk/test/__init__.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from ._sources import PackageSourceTester from ._install import PackageInstallTester from ._build import PackageBuildTester diff --git a/spk/test/_build.py b/spk/test/_build.py index 2da6cec4c4..a1082fe2eb 100644 --- a/spk/test/_build.py +++ b/spk/test/_build.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + from typing import Iterable, List, Union import os import subprocess diff --git a/spk/test/_install.py b/spk/test/_install.py index 07f61d4c7b..9f8fd65731 100644 --- a/spk/test/_install.py +++ b/spk/test/_install.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + import os import subprocess import tempfile diff --git a/spk/test/_sources.py b/spk/test/_sources.py index d020d007c7..014aeb0d0f 100644 --- a/spk/test/_sources.py +++ b/spk/test/_sources.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Sony Pictures Imageworks, et al. +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/imageworks/spk + import os import subprocess import tempfile diff --git a/src/error.rs b/src/error.rs index 5dd4c0200f..e59eb05e81 100644 --- a/src/error.rs +++ b/src/error.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use pyo3::{exceptions, prelude::*}; use spfs; diff --git a/src/lib.rs b/src/lib.rs index ec412face9..491423c1cf 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + pub mod build; mod error; pub mod storage; diff --git a/src/storage/mod.rs b/src/storage/mod.rs index d71f4a9725..b7a5d99366 100644 --- a/src/storage/mod.rs +++ b/src/storage/mod.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + mod spfs; pub use self::spfs::{local_repository, remote_repository, SpFSRepository}; diff --git a/src/storage/spfs.rs b/src/storage/spfs.rs index bfa3bfa8fc..d78ed390bb 100644 --- a/src/storage/spfs.rs +++ b/src/storage/spfs.rs @@ -1,3 +1,7 @@ +// Copyright (c) 2021 Sony Pictures Imageworks, et al. +// SPDX-License-Identifier: Apache-2.0 +// https://github.com/imageworks/spk + use pyo3::prelude::*; use spfs;