Merge pull request #55 from nexB/update-commoncode

Update commoncode

Author: JonoYang

CHANGELOG.rst

@@ -1,6 +1,16 @@
 Changelog
 =========
 
+v33.0.0
+--------
+
+This is a major release with an API change.
+
+- ``container_inspector.distro.parse_os_release`` and its tests have been moved
+  to ``commoncode.distro.parse_os_release``. container-inspector has been
+  updated to use ``commoncode.distro.parse_os_release``.
+
+
 v32.0.1
 --------
 
@@ -12,7 +22,7 @@ This is a minor release with bug fixes.
 Thank you to AJ Arena @sig-aarena
 
 
-v32.0.0 
+v32.0.0
 --------
 
 This is a minor release with bug fixes and an output change.

requirements.txt

@@ -9,7 +9,7 @@ chardet==5.0.0
 charset-normalizer==2.1.0
 click==8.1.3
 colorama==0.4.5
-commoncode==31.0.0b4
+commoncode==31.2.1
 construct==2.10.68
 cryptography==37.0.4
 debian-inspector==31.0.0b1

setup.cfg

@@ -60,7 +60,7 @@ install_requires =
     click >= 6.7, !=7.0, !=8.0.3
     attrs >= 18.1, !=20.1.0
     dockerfile_parse
-    commoncode >= 30.2.0
+    commoncode >= 31.2.1
 
 
 [options.packages.find]

src/container_inspector/distro.py

@@ -8,13 +8,14 @@
 
 import logging
 import os
-import shlex
 from os import path
 
 import attr
+from commoncode.distro import parse_os_release
 
 from container_inspector import rootfs
 
+
 TRACE = False
 logger = logging.getLogger(__name__)
 
@@ -471,39 +472,6 @@ def merge(self, other_distro):
         return type(self)(**existing)
 
 
-def parse_os_release(location):
-    """
-    Return a mapping built from an os-release-like file at `location`.
-
-    See https://www.linux.org/docs/man5/os-release.html
-
-    $ cat /etc/os-release
-    NAME="Ubuntu"
-    VERSION="16.04.6 LTS (Xenial Xerus)"
-    ID=ubuntu
-    ID_LIKE=debian
-    PRETTY_NAME="Ubuntu 16.04.6 LTS"
-    VERSION_ID="16.04"
-    HOME_URL="http://www.ubuntu.com/"
-    SUPPORT_URL="http://help.ubuntu.com/"
-    BUG_REPORT_URL="http://bugs.launchpad.net/ubuntu/"
-    VERSION_CODENAME=xenial
-    UBUNTU_CODENAME=xenial
-
-    Note the /etc/lsb-release file has the same format, but different tags.
-    """
-    with open(location) as osrl:
-        lines = (line.strip() for line in osrl)
-        lines = (
-            line.partition('=') for line in lines
-            if line and not line.startswith('#')
-        )
-        return {
-            key.strip(): ''.join(shlex.split(value))
-            for key, _, value in lines
-        }
-
-
 def get_debian_details():
     """
     See /etc/dpkg/origins/ for Debian distro.