fetchcode 0.5.0__tar.gz → 0.5.2__tar.gz

{fetchcode-0.5.0 → fetchcode-0.5.2}/.gitignore

@@ -72,3 +72,6 @@ tcl
 
 # Ignore Jupyter Notebook related temp files
 .ipynb_checkpoints/
+
+# Env Files
+.env

{fetchcode-0.5.0 → fetchcode-0.5.2}/CHANGELOG.rst

@@ -1,10 +1,19 @@
 Changelog
 =========
 
+v0.5.2
+------
+- Update link references of ownership from nexB to aboutcode-org
+
+
+v0.5.1
+-------
+- Use authenticated requests for GitHub REST API calls
+
 
 v0.5.0
 -------
-- FetchCode now supports retrieving package info for following generic packages: 
+- FetchCode now supports retrieving package info for following generic packages:
     * pkg:generic/linux
     * pkg:generic/mtd-utils
     * pkg:generic/barebox
@@ -37,7 +46,7 @@ v0.5.0
 
 v0.4.0
 -------
-- FetchCode now supports retrieving package info for following generic packages: 
+- FetchCode now supports retrieving package info for following generic packages:
     ``busybox``, ``bzip2``, ``dnsmasq``, ``dropbear``, ``ebtables``, ``hostapd``, ``ipkg``,
     ``iproute2``, ``iptables``, ``libnl``, ``lighttpd``, ``nftables``, ``openssh``, ``samba``,
     ``syslinux``, ``toybox``, ``uclibc``, ``uclibc-ng``, ``util-linux`` and ``wpa_supplicant``.
@@ -58,4 +67,3 @@ v0.1.0
 ---------
 
 First, initial release.
- 

{fetchcode-0.5.0 → fetchcode-0.5.2}/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/ for support and download.
+# Visit https://aboutcode.org and https://github.com/aboutcode-org/ for support and download.
 # ScanCode is a trademark of nexB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

{fetchcode-0.5.0 → fetchcode-0.5.2}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: fetchcode
-Version: 0.5.0
+Version: 0.5.2
 Summary: fetchcode is a library to reliably fetch code via HTTP, FTP and version control systems.
-Home-page: https://github.com/nexB/fetchcode
+Home-page: https://github.com/aboutcode-org/fetchcode
 Author: nexB. Inc. and others
 Author-email: info@aboutcode.org
 License: Apache-2.0
@@ -55,7 +55,7 @@ systems. It can work using plain HTTP and FTP URLs, as well as
 as used in Python pip and as specified in `SPDX Package Download Location
 <https://spdx.github.io/spdx-spec/3-package-information/#37-package-download-location>`_
 
-Homepage and support: https://github.com/nexB/fetchcode
+Homepage and support: https://github.com/aboutcode-org/fetchcode
 
 
 Why FetchCode?
@@ -72,11 +72,11 @@ Development installation
 
 Clone the repo::
 
-    git clone https://github.com/nexB/fetchcode
+    git clone https://github.com/aboutcode-org/fetchcode
 
-Then install all the requirements using::
+Then install all the requirements using this command (on POSIX)::
 
-    configure --dev
+    ./configure --dev
 
 
 Running tests
@@ -93,13 +93,13 @@ Usage
 Fetch a code archive and get a ``fetchcode.fetch.Response`` object back::
 
     >>> from fetchcode import fetch
-    >>> f = fetch('https://github.com/nexB/fetchcode/archive/ab65b2e645c889887227ea49eb3332d885fd0a54.zip')
+    >>> f = fetch('https://github.com/aboutcode-org/fetchcode/archive/ab65b2e645c889887227ea49eb3332d885fd0a54.zip')
     >>> f.location
     '/tmp/tmp_cm02xsg'
     >>> f.content_type
     'application/zip'
     >>> f.url
-    'https://github.com/nexB/fetchcode/archive/ab65b2e645c889887227ea49eb3332d885fd0a54.zip'
+    'https://github.com/aboutcode-org/fetchcode/archive/ab65b2e645c889887227ea49eb3332d885fd0a54.zip'
 
 Fetch some package metadata and get a ``fetchcode.packagedcode_models.Package`` object back::
 

{fetchcode-0.5.0 → fetchcode-0.5.2}/README.rst

@@ -7,7 +7,7 @@ systems. It can work using plain HTTP and FTP URLs, as well as
 as used in Python pip and as specified in `SPDX Package Download Location
 <https://spdx.github.io/spdx-spec/3-package-information/#37-package-download-location>`_
 
-Homepage and support: https://github.com/nexB/fetchcode
+Homepage and support: https://github.com/aboutcode-org/fetchcode
 
 
 Why FetchCode?
@@ -24,11 +24,11 @@ Development installation
 
 Clone the repo::
 
-    git clone https://github.com/nexB/fetchcode
+    git clone https://github.com/aboutcode-org/fetchcode
 
-Then install all the requirements using::
+Then install all the requirements using this command (on POSIX)::
 
-    configure --dev
+    ./configure --dev
 
 
 Running tests
@@ -45,13 +45,13 @@ Usage
 Fetch a code archive and get a ``fetchcode.fetch.Response`` object back::
 
     >>> from fetchcode import fetch
-    >>> f = fetch('https://github.com/nexB/fetchcode/archive/ab65b2e645c889887227ea49eb3332d885fd0a54.zip')
+    >>> f = fetch('https://github.com/aboutcode-org/fetchcode/archive/ab65b2e645c889887227ea49eb3332d885fd0a54.zip')
     >>> f.location
     '/tmp/tmp_cm02xsg'
     >>> f.content_type
     'application/zip'
     >>> f.url
-    'https://github.com/nexB/fetchcode/archive/ab65b2e645c889887227ea49eb3332d885fd0a54.zip'
+    'https://github.com/aboutcode-org/fetchcode/archive/ab65b2e645c889887227ea49eb3332d885fd0a54.zip'
 
 Fetch some package metadata and get a ``fetchcode.packagedcode_models.Package`` object back::
 

fetchcode-0.5.2/azure-pipelines.yml

@@ -0,0 +1,54 @@
+################################################################################
+# We use Azure to run the full tests suites on multiple Python 3.x
+# on multiple Windows, macOS and Linux versions all on 64 bits
+# These jobs are using VMs with Azure-provided Python builds
+################################################################################
+
+jobs:
+  - template: etc/ci/azure-posix.yml
+    parameters:
+      job_name: ubuntu20_cpython
+      image_name: ubuntu-20.04
+      python_versions: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+      test_suites:
+        all: venv/bin/pytest -n 2 -vvs
+
+  - template: etc/ci/azure-posix.yml
+    parameters:
+      job_name: ubuntu22_cpython
+      image_name: ubuntu-22.04
+      python_versions: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+      test_suites:
+        all: venv/bin/pytest -n 2 -vvs
+
+  - template: etc/ci/azure-posix.yml
+    parameters:
+      job_name: macos12_cpython
+      image_name: macOS-12
+      python_versions: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+      test_suites:
+        all: venv/bin/pytest -n 2 -vvs
+
+  - template: etc/ci/azure-posix.yml
+    parameters:
+      job_name: macos13_cpython
+      image_name: macOS-13
+      python_versions: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+      test_suites:
+        all: venv/bin/pytest -n 2 -vvs
+
+  - template: etc/ci/azure-win.yml
+    parameters:
+      job_name: win2019_cpython
+      image_name: windows-2019
+      python_versions: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+      test_suites:
+        all: venv\Scripts\pytest -n 2 -vvs
+
+  - template: etc/ci/azure-win.yml
+    parameters:
+      job_name: win2022_cpython
+      image_name: windows-2022
+      python_versions: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+      test_suites:
+        all: venv\Scripts\pytest -n 2 -vvs

{fetchcode-0.5.0 → fetchcode-0.5.2}/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.
 #
 

{fetchcode-0.5.0 → fetchcode-0.5.2}/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.
 
 

{fetchcode-0.5.0 → fetchcode-0.5.2}/setup.cfg

@@ -4,7 +4,7 @@ license = Apache-2.0
 description = fetchcode is a library to reliably fetch code via HTTP, FTP and version control systems.
 long_description = file:README.rst
 long_description_content_type = text/x-rst
-url = https://github.com/nexB/fetchcode
+url = https://github.com/aboutcode-org/fetchcode
 author = nexB. Inc. and others
 author_email = info@aboutcode.org
 classifiers = 

{fetchcode-0.5.0 → fetchcode-0.5.2}/src/fetchcode/__init__.py

@@ -1,5 +1,5 @@
 # fetchcode is a free software tool from nexB Inc. and others.
-# Visit https://github.com/nexB/fetchcode for support and download.
+# Visit https://github.com/aboutcode-org/fetchcode for support and download.
 #
 # Copyright (c) nexB Inc. and others. All rights reserved.
 # http://nexb.com and http://aboutcode.org
@@ -41,7 +41,7 @@ class Response:
 def fetch_http(url, location):
     """
     Return a `Response` object built from fetching the content at a HTTP/HTTPS based `url` URL string
-    saving the content in a file at `location`   
+    saving the content in a file at `location`
     """
     r = requests.get(url)
     with open(location, 'wb') as f:
@@ -51,7 +51,8 @@ def fetch_http(url, location):
     size = r.headers.get('content-length')
     size = int(size) if size else None
 
-    resp = Response(location=location, content_type=content_type, size=size, url=url)
+    resp = Response(location=location,
+                    content_type=content_type, size=size, url=url)
 
     return resp
 
@@ -59,7 +60,7 @@ def fetch_http(url, location):
 def fetch_ftp(url, location):
     """
     Return a `Response` object built from fetching the content at a FTP based `url` URL string
-    saving the content in a file at `location`  
+    saving the content in a file at `location`
     """
     url_parts = urlparse(url)
 
@@ -84,7 +85,8 @@ def fetch_ftp(url, location):
         ftp.retrbinary(file, f.write)
     ftp.close()
 
-    resp = Response(location=location, content_type=content_type, size=size, url=url)
+    resp = Response(location=location,
+                    content_type=content_type, size=size, url=url)
     return resp
 
 

{fetchcode-0.5.0 → fetchcode-0.5.2}/src/fetchcode/package.py

@@ -1,5 +1,5 @@
 # fetchcode is a free software tool from nexB Inc. and others.
-# Visit https://github.com/nexB/fetchcode for support and download.
+# Visit https://github.com/aboutcode-org/fetchcode for support and download.
 #
 # Copyright (c) nexB Inc. and others. All rights reserved.
 # http://nexb.com and http://aboutcode.org
@@ -92,7 +92,8 @@ def get_cargo_data_from_purl(purl):
     )
     versions = response.get("versions", [])
     for version in versions:
-        version_purl = PackageURL(type=purl.type, name=name, version=version.get("num"))
+        version_purl = PackageURL(
+            type=purl.type, name=name, version=version.get("num"))
         dl_path = version.get("dl_path")
         if dl_path:
             download_url = f"{base_url}/{dl_path}"
@@ -355,7 +356,8 @@ def get_gnu_data_from_purl(purl):
     purl = PackageURL.from_string(purl)
     source_archive_url = f"https://ftp.gnu.org/pub/gnu/{purl.name}/"
     version_regex_template = r"^({}-)(?P<version>[\w.-]*)(.tar.gz)$"
-    version_regex = re.compile(version_regex_template.format(re.escape(purl.name)))
+    version_regex = re.compile(
+        version_regex_template.format(re.escape(purl.name)))
 
     yield from extract_packages_from_listing(
         purl, source_archive_url, version_regex, []
@@ -427,7 +429,8 @@ class UdhcpDirectoryListedSource(DirectoryListedSource):
 
         else:
             for version, data in UDHCP_RELEASES.items():
-                purl = PackageURL(type="generic", name="udhcp", version=version)
+                purl = PackageURL(
+                    type="generic", name="udhcp", version=version)
                 yield Package(
                     homepage_url=cls.source_url,
                     download_url=data["url"],
@@ -472,14 +475,17 @@ class UtilLinuxDirectoryListedSource(DirectoryListedSource):
     source_url = "https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/"
     is_nested = True
     # Source archive ex: util-linux-1.2.3.tar.gz
-    source_archive_regex = re.compile(r"^(util-linux-)(?P<version>[\w.-]*)(.tar.gz)$")
+    source_archive_regex = re.compile(
+        r"^(util-linux-|util-linux-ng-)(?P<version>[\w.-]*)(.tar.gz)$"
+    )
     ignored_files_and_dir = []
 
 
 class BusyBoxDirectoryListedSource(DirectoryListedSource):
     source_url = "https://www.busybox.net/downloads/"
     # Source archive ex: busybox-1.2.3.tar.bz2
-    source_archive_regex = re.compile(r"^(busybox-)(?P<version>[\w.-]*)(.tar.bz2)$")
+    source_archive_regex = re.compile(
+        r"^(busybox-)(?P<version>[\w.-]*)(.tar.bz2)$")
     is_nested = False
     ignored_files_and_dir = []
 
@@ -487,7 +493,8 @@ class BusyBoxDirectoryListedSource(DirectoryListedSource):
 class UclibcDirectoryListedSource(DirectoryListedSource):
     source_url = "https://www.uclibc.org/downloads/"
     # Source archive ex: uClibc-1.2.3.tar.gz
-    source_archive_regex = re.compile(r"^(uClibc-)(?P<version>[\w.-]*)(.tar.gz)$")
+    source_archive_regex = re.compile(
+        r"^(uClibc-)(?P<version>[\w.-]*)(.tar.gz)$")
     is_nested = False
     ignored_files_and_dir = []
 
@@ -495,7 +502,8 @@ class UclibcDirectoryListedSource(DirectoryListedSource):
 class UclibcNGDirectoryListedSource(DirectoryListedSource):
     source_url = "https://downloads.uclibc-ng.org/releases/"
     # Source archive ex: uClibc-ng-1.2.3.tar.gz
-    source_archive_regex = re.compile(r"^(uClibc-ng-)(?P<version>[\w.-]*)(.tar.gz)$")
+    source_archive_regex = re.compile(
+        r"^(uClibc-ng-)(?P<version>[\w.-]*)(.tar.gz)$")
     is_nested = True
     ignored_files_and_dir = []
 
@@ -503,7 +511,8 @@ class UclibcNGDirectoryListedSource(DirectoryListedSource):
 class Bzip2DirectoryListedSource(DirectoryListedSource):
     source_url = "https://sourceware.org/pub/bzip2/"
     # Source archive ex: bzip2-1.2.3.tar.gz
-    source_archive_regex = re.compile(r"^(bzip2-)(?P<version>[\w.-]*)(.tar.gz)$")
+    source_archive_regex = re.compile(
+        r"^(bzip2-)(?P<version>[\w.-]*)(.tar.gz)$")
     is_nested = False
     ignored_files_and_dir = []
 
@@ -511,7 +520,8 @@ class Bzip2DirectoryListedSource(DirectoryListedSource):
 class OpenSSHDirectoryListedSource(DirectoryListedSource):
     source_url = "https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/"
     # Source archive ex: openssh-1.2.3.tar.gz
-    source_archive_regex = re.compile(r"^(openssh-)(?P<version>[\w.-]*)(.tgz|.tar.gz)$")
+    source_archive_regex = re.compile(
+        r"^(openssh-)(?P<version>[\w.-]*)(.tgz|.tar.gz)$")
     is_nested = False
     ignored_files_and_dir = []
 
@@ -529,7 +539,8 @@ class DnsmasqDirectoryListedSource(DirectoryListedSource):
 class EbtablesDirectoryListedSource(DirectoryListedSource):
     source_url = "https://www.netfilter.org/pub/ebtables/"
     # Source archive ex: ebtables-1.2.3.tar.gz
-    source_archive_regex = re.compile(r"^(ebtables-)(?P<version>[\w.-]*)(.tar.gz)$")
+    source_archive_regex = re.compile(
+        r"^(ebtables-)(?P<version>[\w.-]*)(.tar.gz)$")
     is_nested = False
     ignored_files_and_dir = []
 
@@ -537,7 +548,8 @@ class EbtablesDirectoryListedSource(DirectoryListedSource):
 class HostapdDirectoryListedSource(DirectoryListedSource):
     source_url = "https://w1.fi/releases/"
     # Source archive ex: hostapd-1.2.3.tar.gz
-    source_archive_regex = re.compile(r"^(hostapd-)(?P<version>[\w.-]*)(.tar.gz)$")
+    source_archive_regex = re.compile(
+        r"^(hostapd-)(?P<version>[\w.-]*)(.tar.gz)$")
     is_nested = False
     ignored_files_and_dir = []
 
@@ -555,7 +567,8 @@ class Iproute2DirectoryListedSource(DirectoryListedSource):
 class IptablesDirectoryListedSource(DirectoryListedSource):
     source_url = "https://www.netfilter.org/pub/iptables/"
     # Source archive ex: iptables-1.2.3.tar.bz2
-    source_archive_regex = re.compile(r"^(iptables-)(?P<version>[\w.-]*)(.tar.bz2)$")
+    source_archive_regex = re.compile(
+        r"^(iptables-)(?P<version>[\w.-]*)(.tar.bz2)$")
     is_nested = False
     ignored_files_and_dir = []
 
@@ -563,7 +576,8 @@ class IptablesDirectoryListedSource(DirectoryListedSource):
 class LibnlDirectoryListedSource(DirectoryListedSource):
     source_url = "https://www.infradead.org/~tgr/libnl/files/"
     # Source archive ex: libnl-1.2.3.tar.gz
-    source_archive_regex = re.compile(r"^(libnl-)(?P<version>[\w.-]*)(.tar.gz)$")
+    source_archive_regex = re.compile(
+        r"^(libnl-)(?P<version>[\w.-]*)(.tar.gz)$")
     is_nested = False
     ignored_files_and_dir = []
 
@@ -571,7 +585,8 @@ class LibnlDirectoryListedSource(DirectoryListedSource):
 class LighttpdDirectoryListedSource(DirectoryListedSource):
     source_url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/"
     # Source archive ex: lighttpd-1.2.3.tar.gz
-    source_archive_regex = re.compile(r"^(lighttpd-)(?P<version>[\w.-]*)(.tar.gz)$")
+    source_archive_regex = re.compile(
+        r"^(lighttpd-)(?P<version>[\w.-]*)(.tar.gz)$")
     is_nested = False
     ignored_files_and_dir = []
 
@@ -599,7 +614,8 @@ class WpaSupplicantDirectoryListedSource(DirectoryListedSource):
 class SyslinuxDirectoryListedSource(DirectoryListedSource):
     source_url = "https://mirrors.edge.kernel.org/pub/linux/utils/boot/syslinux/"
     # Source archive ex: syslinux-1.2.3.tar.gz
-    source_archive_regex = re.compile(r"^(syslinux-)(?P<version>[\w.-]*)(.tar.gz)$")
+    source_archive_regex = re.compile(
+        r"^(syslinux-)(?P<version>[\w.-]*)(.tar.gz)$")
     is_nested = False
     ignored_files_and_dir = []
 
@@ -607,7 +623,8 @@ class SyslinuxDirectoryListedSource(DirectoryListedSource):
 class SyslinuxDirectoryListedSource(DirectoryListedSource):
     source_url = "https://mirrors.edge.kernel.org/pub/linux/utils/boot/syslinux/"
     # Source archive ex: syslinux-1.2.3.tar.gz
-    source_archive_regex = re.compile(r"^(syslinux-)(?P<version>[\w.-]*)(.tar.gz)$")
+    source_archive_regex = re.compile(
+        r"^(syslinux-)(?P<version>[\w.-]*)(.tar.gz)$")
     is_nested = False
     ignored_files_and_dir = []
 
@@ -644,7 +661,8 @@ class DropbearDirectoryListedSource(DirectoryListedSource):
 class SambaDirectoryListedSource(DirectoryListedSource):
     source_url = "https://download.samba.org/pub/samba/stable/"
     # Source archive ex: samba-1.2.3.tar.gz
-    source_archive_regex = re.compile(r"^(samba-)(?P<version>[\w.-]*)(.tar.gz)$")
+    source_archive_regex = re.compile(
+        r"^(samba-)(?P<version>[\w.-]*)(.tar.gz)$")
     is_nested = False
     ignored_files_and_dir = []
 
@@ -652,7 +670,8 @@ class SambaDirectoryListedSource(DirectoryListedSource):
 class MtdUtilsDirectoryListedSource(DirectoryListedSource):
     source_url = "https://infraroot.at/pub/mtd/"
     # Source archive ex: mtd-utils-1.2.3.tar.bz2
-    source_archive_regex = re.compile(r"^(mtd-utils-)(?P<version>[\w.-]*)(.tar.bz2)$")
+    source_archive_regex = re.compile(
+        r"^(mtd-utils-)(?P<version>[\w.-]*)(.tar.bz2)$")
     is_nested = False
     ignored_files_and_dir = []
 
@@ -660,15 +679,17 @@ class MtdUtilsDirectoryListedSource(DirectoryListedSource):
 class BareboxDirectoryListedSource(DirectoryListedSource):
     source_url = "https://www.barebox.org/download/"
     # Source archive ex: barebox-1.2.3.tar.bz2
-    source_archive_regex = re.compile(r"^(barebox-)(?P<version>[\w.-]*)(.tar.bz2)$")
+    source_archive_regex = re.compile(
+        r"^(barebox-)(?P<version>[\w.-]*)(.tar.bz2)$")
     is_nested = False
     ignored_files_and_dir = []
 
 
 class LinuxDirectoryListedSource(DirectoryListedSource):
-    source_url = "https://cdn.kernel.org/pub/linux/kernel/"
+    source_url = "https://mirrors.edge.kernel.org/pub/linux/kernel/"
     # Source archive ex: linux-1.2.3.tar.gz
-    source_archive_regex = re.compile(r"^(linux-)(?P<version>[\w.-]*)(.tar.gz)$")
+    source_archive_regex = re.compile(
+        r"^(linux-)(?P<version>[\w.-]*)(.tar.gz)$")
     is_nested = True
     ignored_files_and_dir = [
         "Historic/",
@@ -690,7 +711,8 @@ class E2fsprogsDirectoryListedSource(DirectoryListedSource):
         "https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/"
     )
     # Source archive ex: e2fsprogs-1.2.3.tar.gz
-    source_archive_regex = re.compile(r"^(e2fsprogs-)(?P<version>[\w.-]*)(.tar.gz)$")
+    source_archive_regex = re.compile(
+        r"^(e2fsprogs-)(?P<version>[\w.-]*)(.tar.gz)$")
     is_nested = True
     ignored_files_and_dir = ["testing/"]
 

{fetchcode-0.5.0 → fetchcode-0.5.2}/src/fetchcode/package_util.py

@@ -1,5 +1,5 @@
 # fetchcode is a free software tool from nexB Inc. and others.
-# Visit https://github.com/nexB/fetchcode for support and download.
+# Visit https://github.com/aboutcode-org/fetchcode for support and download.
 #
 # Copyright (c) nexB Inc. and others. All rights reserved.
 # http://nexb.com and http://aboutcode.org
@@ -55,7 +55,7 @@ class GitHubSource:
         namespace = purl.namespace
         base_path = "https://api.github.com/repos"
         api_url = f"{base_path}/{namespace}/{name}"
-        response = utils.get_response(api_url)
+        response = utils.get_github_rest(api_url)
         homepage_url = response.get("homepage")
         vcs_url = response.get("git_url")
         github_url = "https://github.com"
@@ -124,6 +124,12 @@ def _get_github_packages(purl, version_regex, ignored_tag_regex, default_package
             version = tag
 
         version = version.strip("Vv").strip()
+        if "+" in version:
+            first, last = version.split("+")
+            first.replace("_", ".")
+            version = f"{first}+{last}"
+        else:
+            version = version.replace("_", ".")
         if not version or not version[0].isdigit():
             continue
 
@@ -159,7 +165,8 @@ class SquashfsToolsGitHubSource(GitHubSource):
 
 
 class PupnpGitHubSource(GitHubSource):
-    version_regex = re.compile(r"\brelease-?(?P<version>(?:\d+(\.\d+){1,2}))\b")
+    version_regex = re.compile(
+        r"\brelease-?(?P<version>(?:\d+(\.\d+){1,2}))\b")
     ignored_tag_regex = None
 
 
@@ -174,7 +181,8 @@ class BpftoolGitHubSource(GitHubSource):
 
 
 class SqliteGitHubSource(GitHubSource):
-    version_regex = re.compile(r"\bversion-?(?P<version>(?:\d+(\.\d+){1,2}))\b")
+    version_regex = re.compile(
+        r"\bversion-?(?P<version>(?:\d+(\.\d+){1,2}))\b")
     ignored_tag_regex = None
 
 
@@ -184,7 +192,8 @@ class LlvmGitHubSource(GitHubSource):
 
 
 class RpmGitHubSource(GitHubSource):
-    version_regex = re.compile(r"rpm-(?P<version>[^-]+(?:-(?!release).*)?|-release)")
+    version_regex = re.compile(
+        r"rpm-(?P<version>[^-]+(?:-(?!release).*)?|-release)")
     ignored_tag_regex = None
 
 
@@ -227,7 +236,7 @@ class OpenSSLGitHubSource(GitHubSource):
             package_dict["type"] = "openssl"
             package_dict["namespace"] = None
             package_dict["name"] = "openssl"
-            package_dict["version"] = package_dict["version"].replace("_", ".")
+            package_dict["version"] = package_dict["version"]
 
             yield package_from_dict(package_dict)
 
@@ -251,7 +260,7 @@ class ErofsUtilsGitHubSource(GitHubSource):
             package_dict["type"] = "generic"
             package_dict["namespace"] = None
             package_dict["name"] = "erofs-utils"
-            package_dict["version"] = package_dict["version"].replace("_", ".")
+            package_dict["version"] = package_dict["version"]
 
             yield package_from_dict(package_dict)
 
@@ -279,7 +288,7 @@ class MiniupnpPackagesGitHubSource(GitHubSource):
             package_dict["type"] = "generic"
             package_dict["namespace"] = None
             package_dict["name"] = package_name
-            package_dict["version"] = package_dict["version"].replace("_", ".")
+            package_dict["version"] = package_dict["version"]
 
             yield package_from_dict(package_dict)
 

{fetchcode-0.5.0 → fetchcode-0.5.2}/src/fetchcode/package_versions.py

@@ -1,5 +1,5 @@
 # fetchcode is a free software tool from nexB Inc. and others.
-# Visit https://github.com/nexB/fetchcode for support and download.
+# Visit https://github.com/aboutcode-org/fetchcode for support and download.
 #
 # Copyright (c) nexB Inc. and others. All rights reserved.
 # http://nexb.com and http://aboutcode.org
@@ -317,7 +317,8 @@ def get_golang_versions_from_purl(purl):
         break
 
     if response is None or escaped_pkg is None or trimmed_pkg is None:
-        logger.error(f"Error while fetching versions for {package_slug!r} from goproxy")
+        logger.error(
+            f"Error while fetching versions for {package_slug!r} from goproxy")
         return
 
     for version_info in response.split("\n"):
@@ -347,7 +348,7 @@ def trim_go_url_path(url_path: str) -> Optional[str]:
     # some advisories contains this prefix in package name, e.g. https://github.com/advisories/GHSA-7h6j-2268-fhcm
     go_url_prefix = "https://pkg.go.dev/"
     if url_path.startswith(go_url_prefix):
-        url_path = url_path[len(go_url_prefix) :]
+        url_path = url_path[len(go_url_prefix):]
 
     parsed_url_path = urlparse(url_path)
     path = parsed_url_path.path
@@ -408,7 +409,8 @@ def fetch_version_info(version_info: str, escaped_pkg: str) -> Optional[PackageV
                 f"Error while fetching version info for {escaped_pkg}/{escaped_ver} "
                 f"from goproxy:\n{traceback.format_exc()}"
             )
-        release_date = dateparser.parse(response.get("Time", "")) if response else None
+        release_date = dateparser.parse(
+            response.get("Time", "")) if response else None
 
     return PackageVersion(value=version, release_date=release_date)