#56 - Update link references of ownership from nexB to aboutcode-org

Signed-off-by: Chin Yeung Li <[email protected]>

Author: chinyeungli

CHANGELOG.rst

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+v33.0.1
+--------
+
+This is a minor release with reference link updated.
+
+ - Update link references of ownership from nexB to aboutcode-org
+
 v33.0.0
 --------
 

NOTICE

@@ -2,7 +2,7 @@
 # Copyright (c) nexB Inc. and others.
 # SPDX-License-Identifier: Apache-2.0
 #
-# Visit https://aboutcode.org and https://github.com/nexB/container-inspector
+# Visit https://aboutcode.org and https://github.com/aboutcode-org/container-inspector
 # for support and download.
 # ScanCode is a trademark of nexB Inc.
 #

configure

@@ -3,7 +3,7 @@
 # Copyright (c) nexB Inc. and others. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 # See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
-# See https://github.com/nexB/ for support or download.
+# See https://github.com/aboutcode-org/ for support or download.
 # See https://aboutcode.org for more information about nexB OSS projects.
 #
 

configure.bat

@@ -4,7 +4,7 @@
 @rem Copyright (c) nexB Inc. and others. All rights reserved.
 @rem SPDX-License-Identifier: Apache-2.0
 @rem See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
-@rem See https://github.com/nexB/ for support or download.
+@rem See https://github.com/aboutcode-org/ for support or download.
 @rem See https://aboutcode.org for more information about nexB OSS projects.
 
 

container-inspector.ABOUT

@@ -3,7 +3,7 @@ name: container-inspector
 owner: nexB Inc.
 home_url: http://nexb.com
 vcs_tool: git
-vcs_repository: https://github.com/nexB/container_inspector.git
+vcs_repository: https://github.com/aboutcode-org/container_inspector.git
 description: Docker utilities
 license: apache-2.0
 license_text_file: apache-2.0.LICENSE

setup.cfg

@@ -6,7 +6,7 @@ license = Apache-2.0
 description = Docker, containers, rootfs and virtual machine related software composition analysis (SCA) utilities.
 long_description = file:README.rst
 long_description_content_type = text/x-rst
-url = https://github.com/nexB/container-inspector
+url = https://github.com/aboutcode-org/container-inspector
 
 author = nexB. Inc. and others
 author_email = [email protected]

src/container_inspector/__init__.py

@@ -2,7 +2,7 @@
 # Copyright (c) nexB Inc. and others. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 # See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
-# See https://github.com/nexB/container-inspector for support or download.
+# See https://github.com/aboutcode-org/container-inspector for support or download.
 # See https://aboutcode.org for more information about nexB OSS projects.
 #
 
@@ -21,4 +21,3 @@ def is_image_or_layer_id(s):
     Return True if the string `s` looks like a layer ID e.g. a SHA256-like id.
     """
     return re(r'^[a-f0-9]{64}$', re.IGNORECASE).match(s)
-

src/container_inspector/cli.py

@@ -2,7 +2,7 @@
 # Copyright (c) nexB Inc. and others. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 # See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
-# See https://github.com/nexB/container-inspector for support or download.
+# See https://github.com/aboutcode-org/container-inspector for support or download.
 # See https://aboutcode.org for more information about nexB OSS projects.
 #
 
@@ -68,7 +68,8 @@ def _container_inspector_dockerfile(directory, json=False, csv=False):
     if not dockerfiles:
         return
     if json:
-        click.echo(json_module.dumps([df for _loc, df in dockerfiles.items()], indent=2))
+        click.echo(json_module.dumps(
+            [df for _loc, df in dockerfiles.items()], indent=2))
 
     if csv:
         dockerfiles = list(dockerfile.flatten_dockerfiles(dockerfiles))
@@ -100,7 +101,8 @@ def _container_inspector(image_path, extract_to=None, csv=False, _layer_path_seg
     as_json = not csv
 
     if as_json:
-        images = [i.to_dict(layer_path_segments=_layer_path_segments) for i in images]
+        images = [i.to_dict(layer_path_segments=_layer_path_segments)
+                  for i in images]
         return json_module.dumps(images, indent=2)
     else:
         from io import StringIO

src/container_inspector/distro.py

@@ -2,7 +2,7 @@
 # Copyright (c) nexB Inc. and others. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 # See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
-# See https://github.com/nexB/container-inspector for support or download.
+# See https://github.com/aboutcode-org/container-inspector for support or download.
 # See https://aboutcode.org for more information about nexB OSS projects.
 #
 
@@ -296,7 +296,9 @@ def from_os_release_file(cls, location):
         parsed
         """
         if not location or not os.path.exists(location):
-            if TRACE: logger.debug(f'from_os_release_file: {location!r} does not exists')
+            if TRACE:
+                logger.debug(
+                    f'from_os_release_file: {location!r} does not exists')
             return
 
         data = parse_os_release(location) or {}
@@ -333,7 +335,8 @@ def from_os_release_file(cls, location):
         if data:
             new_data['extra_data'] = data
 
-        if TRACE: logger.debug(f'from_os_release_file: new_data: {new_data!r}')
+        if TRACE:
+            logger.debug(f'from_os_release_file: new_data: {new_data!r}')
 
         return cls(**new_data)
 
@@ -356,10 +359,13 @@ def from_rootfs(cls, location, base_distro=None):
         manifest) and may be missing from the rootfs proper (for instance of an
         /etc/os-release is missing in the rootfs for a Linux-based image).
         """
-        if TRACE: logger.debug(f'from_rootfs: {location!r} base_distro: {base_distro!r}')
+        if TRACE:
+            logger.debug(
+                f'from_rootfs: {location!r} base_distro: {base_distro!r}')
 
         if not location or not os.path.exists(location):
-            if TRACE: logger.debug(f'from_rootfs: {location!r} does not exists')
+            if TRACE:
+                logger.debug(f'from_rootfs: {location!r} does not exists')
             return
 
         finders = {
@@ -369,10 +375,12 @@ def from_rootfs(cls, location, base_distro=None):
         }
 
         for finder_os, finder in finders.items():
-            if TRACE: logger.debug(f'from_rootfs: trying finder_os: {finder_os!r}')
+            if TRACE:
+                logger.debug(f'from_rootfs: trying finder_os: {finder_os!r}')
 
             found = finder(location)
-            if TRACE: logger.debug(f'from_rootfs: trying found: {found!r}')
+            if TRACE:
+                logger.debug(f'from_rootfs: trying found: {found!r}')
             if found:
                 if base_distro:
                     if base_distro.os != finder_os:
@@ -382,11 +390,15 @@ def from_rootfs(cls, location, base_distro=None):
                         )
 
                     merged = base_distro.merge(found)
-                    if TRACE: logger.debug(f'from_rootfs: returning merged: {merged!r}')
+                    if TRACE:
+                        logger.debug(
+                            f'from_rootfs: returning merged: {merged!r}')
                     return merged
 
                 else:
-                    if TRACE: logger.debug(f'from_rootfs: returning found: {found!r}')
+                    if TRACE:
+                        logger.debug(
+                            f'from_rootfs: returning found: {found!r}')
                     return found
 
     @classmethod
@@ -431,8 +443,10 @@ def categories(self):
         """
         return dict(
             rpm=dict(
-                redhat=('fedora', 'centos', 'rhel', 'amazon', 'scientific', 'oraclelinux',),
-                suse=('opensuse', 'suse', 'sles', 'sled', 'sles_sap', 'opensuse-leap', 'opensuse-tumbleweed',),
+                redhat=('fedora', 'centos', 'rhel', 'amazon',
+                        'scientific', 'oraclelinux',),
+                suse=('opensuse', 'suse', 'sles', 'sled', 'sles_sap',
+                      'opensuse-leap', 'opensuse-tumbleweed',),
                 altlinux=('altlinux',),
                 photon=('photon',),
                 mandriva=('mandriva', 'mageia', 'mandrake', 'open-mandriva'),
@@ -456,7 +470,8 @@ def merge(self, other_distro):
         Return a new distro based on this Distro data updated with non-empty
         values from the ``other_distro`` Distro object.
         """
-        if TRACE: logger.debug(f'merge: {self!r} with: {other_distro!r}')
+        if TRACE:
+            logger.debug(f'merge: {self!r} with: {other_distro!r}')
 
         existing = self.to_dict()
         if other_distro:
@@ -465,9 +480,11 @@ def merge(self, other_distro):
                 if v
             }
             existing.update(other_non_empty)
-            if TRACE: logger.debug(f'merge: updated data: {existing!r}')
+            if TRACE:
+                logger.debug(f'merge: updated data: {existing!r}')
 
-        if TRACE: logger.debug(f'merge: merged data: {existing!r}')
+        if TRACE:
+            logger.debug(f'merge: merged data: {existing!r}')
 
         return type(self)(**existing)
 

src/container_inspector/dockerfile.py

@@ -2,7 +2,7 @@
 # Copyright (c) nexB Inc. and others. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 # See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
-# See https://github.com/nexB/container-inspector for support or download.
+# See https://github.com/aboutcode-org/container-inspector for support or download.
 # See https://aboutcode.org for more information about nexB OSS projects.
 #