Replace mentions of the old containerbuildsystem organization

The project moved to a new GitHub organization "hermetoproject". Change the references accordingly. Signed-off-by: Erik Skultety <[email protected]>
hermetoproject · Feb 5, 2025 · e05b977 · e05b977
1 parent 86764ba
commit e05b977
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -260,7 +260,7 @@ still in early development phase.
 [cachi2-container-badge]: https://img.shields.io/badge/container-latest-blue
 [cachi2-container-status]: https://quay.io/repository/konflux-ci/cachi2/tag/latest
 
-[cachi2-releases]: https://github.com/containerbuildsystem/cachi2/releases
+[cachi2-releases]: https://github.com/hermetoproject/cachi2/releases
 [sdist-spec]: https://packaging.python.org/en/latest/specifications/source-distribution-format/
 [wheel-spec]: https://packaging.python.org/en/latest/specifications/binary-distribution-format/
 [setuppy-discouraged]: https://setuptools.pypa.io/en/latest/userguide/quickstart.html#setuppy-discouraged

diff --git a/cachi2/core/package_managers/bundler/main.py b/cachi2/core/package_managers/bundler/main.py
@@ -142,7 +142,7 @@ def _get_name_and_version_from_lockfile(dependencies: ParseResult) -> Optional[t
     version, and other metadata even if the package is not a gem. So we respect this edge case.
 
     See design doc for more details:
-    https://github.com/containerbuildsystem/cachi2/blob/main/docs/design/bundler.md
+    https://github.com/hermetoproject/cachi2/blob/main/docs/design/bundler.md
     """
     for dep in dependencies:
         if isinstance(dep, PathDependency) and dep.subpath == ".":

diff --git a/cachi2/core/package_managers/gomod.py b/cachi2/core/package_managers/gomod.py
@@ -48,7 +48,7 @@
 log = logging.getLogger(__name__)
 
 
-GOMOD_DOC = "https://github.com/containerbuildsystem/cachi2/blob/main/docs/gomod.md"
+GOMOD_DOC = "https://github.com/hermetoproject/cachi2/blob/main/docs/gomod.md"
 GOMOD_INPUT_DOC = f"{GOMOD_DOC}#specifying-modules-to-process"
 VENDORING_DOC = f"{GOMOD_DOC}#vendoring"
 

diff --git a/cachi2/core/package_managers/pip.py b/cachi2/core/package_managers/pip.py
@@ -70,16 +70,14 @@
 
 PYPI_URL = "https://pypi.org"
 
-PIP_METADATA_DOC = (
-    "https://github.com/containerbuildsystem/cachi2/blob/main/docs/pip.md#project-metadata"
-)
+PIP_METADATA_DOC = "https://github.com/hermetoproject/cachi2/blob/main/docs/pip.md#project-metadata"
 PIP_REQUIREMENTS_TXT_DOC = (
-    "https://github.com/containerbuildsystem/cachi2/blob/main/docs/pip.md#requirementstxt"
+    "https://github.com/hermetoproject/cachi2/blob/main/docs/pip.md#requirementstxt"
 )
 PIP_EXTERNAL_DEPS_DOC = (
-    "https://github.com/containerbuildsystem/cachi2/blob/main/docs/pip.md#external-dependencies"
+    "https://github.com/hermetoproject/cachi2/blob/main/docs/pip.md#external-dependencies"
 )
-PIP_NO_SDIST_DOC = "https://github.com/containerbuildsystem/cachi2/blob/main/docs/pip.md#dependency-does-not-distribute-sources"
+PIP_NO_SDIST_DOC = "https://github.com/hermetoproject/cachi2/blob/main/docs/pip.md#dependency-does-not-distribute-sources"
 
 
 @dataclass

diff --git a/cachi2/core/resolver.py b/cachi2/core/resolver.py
@@ -51,7 +51,7 @@ def resolve_packages(request: Request) -> RequestOutput:
 
             # Temporary solution to project files paths that are pointing to the work copy.
             # Should be replaced once we extend the work copy solution to other package managers.
-            # https://github.com/containerbuildsystem/cachi2/issues/712
+            # https://github.com/hermetoproject/cachi2/issues/712
             for project_file in output.build_config.project_files:
                 subpath = project_file.abspath.relative_to(source_backup)
                 project_file.abspath = original_source_dir / subpath

diff --git a/docs/adr/0002-yarn-v4.md b/docs/adr/0002-yarn-v4.md
@@ -106,7 +106,7 @@ $ cat package.json
 
 This used to be a configurable key in the `.yarnrc.yml` file. The previous default path, `./.pnp.data.json`, is now hard-coded and can't be changed.
 
-The only mention to `pnpDataPath` in Cachi2 is the [check](https://github.com/containerbuildsystem/cachi2/blob/a5f19c6f9be90be4289beee35ecccd2827bbb328/cachi2/core/package_managers/yarn/main.py#L43) for paths pointing outside of the repo. The check can be kept the same way so Yarn v3 can still be covered, and it will simply be skipped in v4.
+The only mention to `pnpDataPath` in Cachi2 is the [check](https://github.com/hermetoproject/cachi2/blob/a5f19c6f9be90be4289beee35ecccd2827bbb328/cachi2/core/package_managers/yarn/main.py#L43) for paths pointing outside of the repo. The check can be kept the same way so Yarn v3 can still be covered, and it will simply be skipped in v4.
 
 #### Yarn now caches npm version metadata
 
@@ -155,15 +155,15 @@ When updating v3 projects to v4, some differences in the lockfile appear. These
 +  resolution: "strip-ansi-tarball@file:external-packages/strip-ansi-4.0.0.tgz#external-packages/strip-ansi-4.0.0.tgz::hash=e17689&locator=berryscary%40workspace%3A."
 ```
 
-Yarn v4 introduced the subdirectory (`#external-packages/strip-ansi-4.0.0.tgz`) and the hash (`::hash=e17689`) to the previously existing locator. These parts are already [handled](https://github.com/containerbuildsystem/cachi2/blob/a5f19c6f9be90be4289beee35ecccd2827bbb328/cachi2/core/package_managers/yarn/locators.py#L77-L79) by the v3 implementation in Cachi2, though.
+Yarn v4 introduced the subdirectory (`#external-packages/strip-ansi-4.0.0.tgz`) and the hash (`::hash=e17689`) to the previously existing locator. These parts are already [handled](https://github.com/hermetoproject/cachi2/blob/a5f19c6f9be90be4289beee35ecccd2827bbb328/cachi2/core/package_managers/yarn/locators.py#L77-L79) by the v3 implementation in Cachi2, though.
 
 **Changes to some instances of the patch locator:**
 ```
 -  resolution: "typescript@patch:typescript@npm%3A5.1.6#~builtin<compat/typescript>::version=5.1.6&hash=5da071"
 +  resolution: "typescript@patch:typescript@npm%3A5.1.6#optional!builtin<compat/typescript>::version=5.1.6&hash=5da071"
 ```
 
-Instances of the patch locator are currently [being ignored](https://github.com/containerbuildsystem/cachi2/blob/a5f19c6f9be90be4289beee35ecccd2827bbb328/cachi2/core/package_managers/yarn/resolver.py#L264-L268) in the v3 implementation in Cachi2.
+Instances of the patch locator are currently [being ignored](https://github.com/hermetoproject/cachi2/blob/a5f19c6f9be90be4289beee35ecccd2827bbb328/cachi2/core/package_managers/yarn/resolver.py#L264-L268) in the v3 implementation in Cachi2.
 
 #### Hardened mode
 

diff --git a/docs/design/bundler.md b/docs/design/bundler.md
@@ -308,7 +308,7 @@ GIT
 
 #### Platform (i.e. pre-compiled) gems
 By default, binary gems are ignored for similar reasons as with [pip
-wheels](https://github.com/containerbuildsystem/cachi2/blob/main/docs/pip.md#distribution-formats),
+wheels](https://github.com/hermetoproject/cachi2/blob/main/docs/pip.md#distribution-formats),
 i.e. lacking sources which report in the SBOM.
 Platforms that relate to specific architectures will contain
 binaries that were pre-compiled for that architecture (see [Platforms](#platforms)).

diff --git a/docs/design/yarn-v1.md b/docs/design/yarn-v1.md
@@ -143,7 +143,7 @@ The user build can be configured to use the offline mirror by configuring the fo
     YARN_YARN_OFFLINE_MIRROR_PRUNING=false
 
 ## Implementation Scoping
- - Since we're executing Yarn commands directly, process the request in an [isolated temporary directory](https://github.com/containerbuildsystem/cachi2/blob/6953607b6ef52fd3f0bef7059d2c926767b1022b/cachi2/core/resolver.py#L41) to avoid any potential changes to the repository
+ - Since we're executing Yarn commands directly, process the request in an [isolated temporary directory](https://github.com/hermetoproject/cachi2/blob/6953607b6ef52fd3f0bef7059d2c926767b1022b/cachi2/core/resolver.py#L41) to avoid any potential changes to the repository
  - Determine whether to process the request with yarn v1 or yarn v2+
  - Read the project files
    - Read/Require package.json

diff --git a/docs/usage.md b/docs/usage.md
@@ -118,7 +118,7 @@ cachi2 merge-sboms <cachi2_sbom_1.json> ... <cachi2_sbom_n.json>
 
 The subcommand expects at least two SBOMs, all produced by Cachi2, and will exit with error
 otherwise. The reason for this is that Cachi2 supports a
-[limited set](https://github.com/containerbuildsystem/cachi2/blob/main/cachi2/core/models/sbom.py#L7-L13)
+[limited set](https://github.com/hermetoproject/cachi2/blob/main/cachi2/core/models/sbom.py#L7-L13)
 of component [properties](https://cyclonedx.org/docs/1.4/json/#components_items_properties),
 and it validates that no other properties exist in the SBOM. By default the result of a merge
 will be printed to stdout. To save it to a file use `-o` option:

diff --git a/tests/unit/data/sboms/cachi2.bom.json b/tests/unit/data/sboms/cachi2.bom.json
@@ -44,7 +44,7 @@
                 }
             ],
             "version": "0.0.1",
-            "purl": "pkg:pypi/[email protected]?vcs_url=git%2Bssh://git%40github.com/containerbuildsystem/cachi2%40fc0d6079c2dc9b2a491c0848e550ad3509986110",
+            "purl": "pkg:pypi/[email protected]?vcs_url=git%2Bssh://git%40github.com/hermetoproject/cachi2%40fc0d6079c2dc9b2a491c0848e550ad3509986110",
             "type": "library"
         },
         {

diff --git a/tests/unit/data/sboms/cachi2.bom.spdx.json b/tests/unit/data/sboms/cachi2.bom.spdx.json
@@ -67,7 +67,7 @@
         {
           "referenceCategory": "PACKAGE-MANAGER",
           "referenceType": "purl",
-          "referenceLocator": "pkg:pypi/[email protected]?vcs_url=git%2Bssh://git%40github.com/containerbuildsystem/cachi2%40fc0d6079c2dc9b2a491c0848e550ad3509986110"
+          "referenceLocator": "pkg:pypi/[email protected]?vcs_url=git%2Bssh://git%40github.com/hermetoproject/cachi2%40fc0d6079c2dc9b2a491c0848e550ad3509986110"
         }
       ]
     },

diff --git a/tests/unit/data/sboms/merged.bom.spdx.json b/tests/unit/data/sboms/merged.bom.spdx.json
@@ -220,7 +220,7 @@
         {
           "referenceCategory": "PACKAGE-MANAGER",
           "referenceType": "purl",
-          "referenceLocator": "pkg:pypi/[email protected]?vcs_url=git%2Bssh://git%40github.com/containerbuildsystem/cachi2%40fc0d6079c2dc9b2a491c0848e550ad3509986110"
+          "referenceLocator": "pkg:pypi/[email protected]?vcs_url=git%2Bssh://git%40github.com/hermetoproject/cachi2%40fc0d6079c2dc9b2a491c0848e550ad3509986110"
         }
       ]
     },