fetchcode 0.7.1__tar.gz → 0.8.1__tar.gz

{fetchcode-0.7.1 → fetchcode-0.8.1}/.github/workflows/docs-ci.yml

@@ -2,21 +2,22 @@ name: CI Documentation
 
 on: [push, pull_request]
 
+
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.9]
+        python-version: [3.12]
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -30,5 +31,3 @@ jobs:
       - name: Check for documentation style errors
         working-directory: ./docs
         run: ./scripts/doc8_style_check.sh
-
-

{fetchcode-0.7.1 → fetchcode-0.8.1}/.github/workflows/pypi-release.yml

@@ -21,14 +21,14 @@ on:
 jobs:
   build-pypi-distribs:
     name: Build and publish library to PyPI
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: 3.13
 
       - name: Install pypa/build
         run: python -m pip install build --user
@@ -37,7 +37,7 @@ jobs:
         run: python -m build --sdist --wheel --outdir dist/
 
       - name: Upload built archives
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: pypi_archives
           path: dist/*
@@ -47,19 +47,20 @@ jobs:
     name: Create GH release
     needs:
       - build-pypi-distribs
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Download built archives
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: pypi_archives
           path: dist
 
       - name: Create GH release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
-          draft: true
+          draft: false
+          generate_release_notes: true
           files: dist/*
 
 
@@ -67,17 +68,18 @@ jobs:
     name: Create PyPI release
     needs:
       - create-gh-release
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
+    environment: pypi-publish
+    permissions:
+      id-token: write
 
     steps:
       - name: Download built archives
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: pypi_archives
-          path: dist
+          path: dist/
 
       - name: Publish to PyPI
-        if: startsWith(github.ref, 'refs/tags')
+        if: startsWith(github.ref, 'refs/tags/')
         uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          password: ${{ secrets.PYPI_API_TOKEN }}

fetchcode-0.8.1/.github/workflows/run-unit-tests.yml

@@ -0,0 +1,35 @@
+name: Run unit tests
+
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-24.04
+
+    strategy:
+      max-parallel: 4
+      matrix:
+        python-version: [ "3.10", "3.11", "3.12", "3.13", "3.14" ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: make dev
+
+      - name: Validate code format
+        run: make check
+
+      - name: Run tests
+        run: make test

{fetchcode-0.7.1 → fetchcode-0.8.1}/AUTHORS.rst

@@ -5,4 +5,4 @@ The following organizations or individuals have contributed to this repo:
 - Philippe Ombredanne @ pombredanne
 - Steven Esser @ majurg
 - Tushar Goel @ TG1999
-
+- Thomas Druez @ tdruez

{fetchcode-0.7.1 → fetchcode-0.8.1}/CHANGELOG.rst

@@ -1,6 +1,18 @@
 Changelog
 =========
 
+v0.8.1
+--------
+- Fix package versions for scoped npm packages (https://github.com/aboutcode-org/fetchcode/pull/194)
+- Publish to pypi using trusted publisher (https://github.com/aboutcode-org/fetchcode/pull/195)
+
+v0.8.0
+--------
+- Do not create GH release as draft
+- Add a GitHub workflow to run unit tests
+- Refactor Pypi fetcher class for re-usability
+- Add support for Python 3.13 and 3.14 
+
 v0.7.1
 ------
 - Update artifact upload version.

{fetchcode-0.7.1 → fetchcode-0.8.1}/Makefile

@@ -23,7 +23,7 @@ isort:
 
 black:
 	@echo "-> Apply black code formatter"
-	${VENV}/bin/black -l 100 --exclude=src/fetchcode/vcs/pip src tests setup.py  
+	${VENV}/bin/black -l 100 --extend-exclude=src/fetchcode/vcs/pip/* .
 
 doc8:
 	@echo "-> Run doc8 validation"
@@ -33,11 +33,11 @@ valid: isort black
 
 check:
 	@echo "-> Run pycodestyle (PEP8) validation"
-	@${ACTIVATE} pycodestyle --max-line-length=100 --exclude=.eggs,venv,lib,thirdparty,docs,migrations,settings.py,.cache,etc,src/fetchcode/vcs/pip,tests/data/ .
+	@${ACTIVATE} pycodestyle --max-line-length=100 --exclude=.eggs,venv,lib,thirdparty,docs,migrations,settings.py,.cache,etc,src/fetchcode/vcs/pip,tests/ .
 	@echo "-> Run isort imports ordering validation"
-	@${ACTIVATE} isort --sl --check-only -l 100 --skip=src/fetchcode/vcs/pip setup.py src tests
+	@${ACTIVATE} isort --sl --check-only -l 100 --skip=src/fetchcode/vcs/pip setup.py tests
 	@echo "-> Run black validation"
-	@${ACTIVATE} black --check --check -l 100 --exclude=src/fetchcode/vcs/pip src tests setup.py 
+	@${ACTIVATE} black --check -l 100 --extend-exclude=src/fetchcode/vcs/pip/* .
 
 clean:
 	@echo "-> Clean the Python env"

{fetchcode-0.7.1 → fetchcode-0.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fetchcode
-Version: 0.7.1
+Version: 0.8.1
 Summary: fetchcode is a library to reliably fetch code via HTTP, FTP and version control systems.
 Home-page: https://github.com/aboutcode-org/fetchcode
 Author: nexB. Inc. and others
@@ -11,14 +11,14 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development
 Classifier: Topic :: Utilities
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: apache-2.0.LICENSE
 License-File: NOTICE
@@ -33,7 +33,7 @@ Requires-Dist: requests
 Requires-Dist: python-dateutil
 Requires-Dist: python-dotenv
 Provides-Extra: testing
-Requires-Dist: pytest!=7.0.0,>=6; extra == "testing"
+Requires-Dist: pytest>=8.0.0; extra == "testing"
 Requires-Dist: pytest-xdist>=2; extra == "testing"
 Requires-Dist: aboutcode-toolkit>=7.0.2; extra == "testing"
 Requires-Dist: pycodestyle>=2.8.0; extra == "testing"

{fetchcode-0.7.1 → fetchcode-0.8.1}/azure-pipelines.yml

@@ -9,8 +9,8 @@ jobs:
     - template: etc/ci/azure-posix.yml
       parameters:
           job_name: ubuntu22_cpython
-          image_name: ubuntu-22.04
-          python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
+          image_name: ubuntu-24.04
+          python_versions: ['3.10', '3.11', '3.12', '3.13', '3.14']
           test_suites:
               all: venv/bin/pytest -n 2 -vvs
 
@@ -18,7 +18,7 @@ jobs:
       parameters:
           job_name: macos13_cpython
           image_name: macOS-13
-          python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
+          python_versions: ['3.10', '3.11', '3.12', '3.13', '3.14']
           test_suites:
               all: venv/bin/pytest -n 2 -vvs
 
@@ -26,7 +26,7 @@ jobs:
       parameters:
           job_name: macos14_cpython_arm64
           image_name: macOS-14
-          python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
+          python_versions: ['3.10', '3.11', '3.12', '3.13', '3.14']
           test_suites:
               all: venv/bin/pytest -n 2 -vvs
 
@@ -34,7 +34,7 @@ jobs:
       parameters:
           job_name: win2019_cpython
           image_name: windows-2019
-          python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
+          python_versions: ['3.10', '3.11', '3.12', '3.13', '3.14']
           test_suites:
               all: venv\Scripts\pytest -n 2 -vvs
 
@@ -42,6 +42,6 @@ jobs:
       parameters:
           job_name: win2022_cpython
           image_name: windows-2022
-          python_versions: ['3.8', '3.9', '3.10', '3.11', '3.12']
+          python_versions: ['3.10', '3.11', '3.12', '3.13', '3.14']
           test_suites:
               all: venv\Scripts\pytest -n 2 -vvs

{fetchcode-0.7.1 → fetchcode-0.8.1}/configure

@@ -28,9 +28,9 @@ CLI_ARGS=$1
 ################################
 
 # Requirement arguments passed to pip and used by default or with --dev.
-REQUIREMENTS="--editable . --constraint requirements.txt"
-DEV_REQUIREMENTS="--editable .[testing] --constraint requirements.txt --constraint requirements-dev.txt"
-DOCS_REQUIREMENTS="--editable .[docs] --constraint requirements.txt"
+REQUIREMENTS="--editable ."
+DEV_REQUIREMENTS="--editable .[testing]"
+DOCS_REQUIREMENTS="--editable .[docs]"
 
 # where we create a virtualenv
 VIRTUALENV_DIR=venv

{fetchcode-0.7.1 → fetchcode-0.8.1}/etc/scripts/check_thirdparty.py

@@ -17,8 +17,7 @@ import utils_thirdparty
 @click.option(
     "-d",
     "--dest",
-    type=click.Path(exists=True, readable=True,
-                    path_type=str, file_okay=False),
+    type=click.Path(exists=True, readable=True, path_type=str, file_okay=False),
     required=True,
     help="Path to the thirdparty directory to check.",
 )

{fetchcode-0.7.1 → fetchcode-0.8.1}/etc/scripts/fetch_thirdparty.py

@@ -55,8 +55,7 @@ TRACE_DEEP = False
     "-d",
     "--dest",
     "dest_dir",
-    type=click.Path(exists=True, readable=True,
-                    path_type=str, file_okay=False),
+    type=click.Path(exists=True, readable=True, path_type=str, file_okay=False),
     metavar="DIR",
     default=utils_thirdparty.THIRDPARTY_DIR,
     show_default=True,
@@ -121,7 +120,7 @@ TRACE_DEEP = False
     show_default=False,
     multiple=True,
     help="Package name(s) that come only in sdist format (no wheels). "
-         "The command will not fail and exit if no wheel exists for these names",
+    "The command will not fail and exit if no wheel exists for these names",
 )
 @click.option(
     "--wheel-only",
@@ -132,7 +131,7 @@ TRACE_DEEP = False
     show_default=False,
     multiple=True,
     help="Package name(s) that come only in wheel format (no sdist). "
-         "The command will not fail and exit if no sdist exists for these names",
+    "The command will not fail and exit if no sdist exists for these names",
 )
 @click.option(
     "--no-dist",
@@ -143,7 +142,7 @@ TRACE_DEEP = False
     show_default=False,
     multiple=True,
     help="Package name(s) that do not come either in wheel or sdist format. "
-         "The command will not fail and exit if no distribution exists for these names",
+    "The command will not fail and exit if no distribution exists for these names",
 )
 @click.help_option("-h", "--help")
 def fetch_thirdparty(
@@ -225,8 +224,7 @@ def fetch_thirdparty(
     environments = None
     if wheels:
         evts = itertools.product(python_versions, operating_systems)
-        environments = [utils_thirdparty.Environment.from_pyver_and_os(
-            pyv, os) for pyv, os in evts]
+        environments = [utils_thirdparty.Environment.from_pyver_and_os(pyv, os) for pyv, os in evts]
 
     # Collect PyPI repos
     repos = []
@@ -262,14 +260,11 @@ def fetch_thirdparty(
                     repos=repos,
                 )
                 if not fetched:
-                    wheels_or_sdist_not_found[f"{name}=={version}"].append(
-                        environment)
+                    wheels_or_sdist_not_found[f"{name}=={version}"].append(environment)
                     if TRACE:
                         print(f"      NOT FOUND")
 
-        if (sdists or
-            (f"{name}=={version}" in wheels_or_sdist_not_found and name in sdist_only)
-            ):
+        if sdists or (f"{name}=={version}" in wheels_or_sdist_not_found and name in sdist_only):
             if TRACE:
                 print(f"  ==> Fetching sdist: {name}=={version}")
 
@@ -292,8 +287,7 @@ def fetch_thirdparty(
         sdist_missing = sdists and "sdist" in dists and not name in wheel_only
         if sdist_missing:
             mia.append(f"SDist missing: {nv} {dists}")
-        wheels_missing = wheels and any(
-            d for d in dists if d != "sdist") and not name in sdist_only
+        wheels_missing = wheels and any(d for d in dists if d != "sdist") and not name in sdist_only
         if wheels_missing:
             mia.append(f"Wheels missing: {nv} {dists}")
 
@@ -303,8 +297,7 @@ def fetch_thirdparty(
         raise Exception(mia)
 
     print(f"==> FETCHING OR CREATING ABOUT AND LICENSE FILES")
-    utils_thirdparty.fetch_abouts_and_licenses(
-        dest_dir=dest_dir, use_cached_index=use_cached_index)
+    utils_thirdparty.fetch_abouts_and_licenses(dest_dir=dest_dir, use_cached_index=use_cached_index)
     utils_thirdparty.clean_about_files(dest_dir=dest_dir)
 
     # check for problems

{fetchcode-0.7.1 → fetchcode-0.8.1}/etc/scripts/utils_dejacode.py

@@ -33,8 +33,7 @@ DEJACODE_API_HEADERS = {
 
 def can_do_api_calls():
     if not DEJACODE_API_KEY and DEJACODE_API_URL:
-        print(
-            "DejaCode DEJACODE_API_KEY and DEJACODE_API_URL not configured. Doing nothing")
+        print("DejaCode DEJACODE_API_KEY and DEJACODE_API_URL not configured. Doing nothing")
         return False
     else:
         return True
@@ -69,8 +68,7 @@ def get_package_data(distribution):
         return results[0]
 
     elif len_results > 1:
-        print(
-            f"More than 1 entry exists, review at: {DEJACODE_API_URL_PACKAGES}")
+        print(f"More than 1 entry exists, review at: {DEJACODE_API_URL_PACKAGES}")
     else:
         print("Could not find package:", distribution.download_url)
 
@@ -151,8 +149,7 @@ def find_latest_dejacode_package(distribution):
     # there was no exact match, find the latest version
     # TODO: consider the closest version rather than the latest
     # or the version that has the best data
-    with_versions = [(packaging_version.parse(p["version"]), p)
-                     for p in packages]
+    with_versions = [(packaging_version.parse(p["version"]), p) for p in packages]
     with_versions = sorted(with_versions)
     latest_version, latest_package_version = sorted(with_versions)[-1]
     print(

{fetchcode-0.7.1 → fetchcode-0.8.1}/etc/scripts/utils_requirements.py

@@ -102,8 +102,7 @@ def lock_dev_requirements(
     all_req_nvs = get_required_name_versions(all_req_lines)
     dev_only_req_nvs = {n: v for n, v in all_req_nvs if n not in main_names}
 
-    new_reqs = "\n".join(
-        f"{n}=={v}" for n, v in sorted(dev_only_req_nvs.items()))
+    new_reqs = "\n".join(f"{n}=={v}" for n, v in sorted(dev_only_req_nvs.items()))
     with open(dev_requirements_file, "w") as fo:
         fo.write(new_reqs)
 
@@ -114,12 +113,10 @@ def get_installed_reqs(site_packages_dir):
     as a text.
     """
     if not os.path.exists(site_packages_dir):
-        raise Exception(
-            f"site_packages directory: {site_packages_dir!r} does not exists")
+        raise Exception(f"site_packages directory: {site_packages_dir!r} does not exists")
     # Also include these packages in the output with --all: wheel, distribute,
     # setuptools, pip
-    args = ["pip", "freeze", "--exclude-editable",
-            "--all", "--path", site_packages_dir]
+    args = ["pip", "freeze", "--exclude-editable", "--all", "--path", site_packages_dir]
     return subprocess.check_output(args, encoding="utf-8")