refactor: Update tests

- Regenerated tests with REGEN_TEST_FIXTURES
- Updated tests to proper import internal code
- Added testing Ci check for Github

Signed-off-by: Helio Chissini de Castro <[email protected]>

Author: heliocastro

.github/workflows/docs-ci.yml

@@ -6,30 +6,24 @@ jobs:
   build:
     runs-on: ubuntu-20.04
 
-    strategy:
-      max-parallel: 4
-      matrix:
-        python-version: [3.9]
-
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Setup uv
+      - uses: actions/checkout@v4
+      - name: Install uv and set up Python
         uses: astral-sh/setup-uv@22695119d769bdb6f7032ad67b9bca0ef8c4a174 # v5.4.0
         with:
+          version: "latest"
+          pyproject-file: "pyrpoject.toml"
           enable-cache: true
-          pyproject-file: "pyproject.toml"
 
       - name: Install Dependencies
-        run:  pip install -e .[docs]
+        run: |
+          uv sync --all-groups
 
       - name: Check Sphinx Documentation build minimally
         working-directory: ./docs
-        run: sphinx-build -E -W source build
+        run: |
+          uv run sphinx-build -E -W source build
 
       - name: Check for documentation style errors
-        working-directory: ./docs
-        run: ./scripts/doc8_style_check.sh
-
-
+        run: |
+          uv run hatch validate-docs

.github/workflows/testing.yml

@@ -0,0 +1,26 @@
+name: Run Pytest with Astral Uv
+
+on:
+  workflow_dispatch:
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install uv and set up Python ${{ matrix.python-version }}
+        uses: astral-sh/setup-uv@22695119d769bdb6f7032ad67b9bca0ef8c4a174 # v5.4.0
+        with:
+          enable-cache: true
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          uv sync --group=test
+      - name: Run Pytest
+        run: |
+          uv run pytest -vvs

etc/scripts/__init__.py

@@ -30,7 +30,7 @@
 
 import pytest
 
-import utils_pip_compatibility_tags
+from python_inspector import utils_pip_compatibility_tags
 
 
 @pytest.mark.parametrize(

etc/scripts/test_utils_pip_compatibility_tags.py

@@ -12,7 +12,7 @@
 
 import pytest
 
-from utils_pypi_supported_tags import validate_platforms_for_pypi
+from python_inspector.utils_pypi_supported_tags import validate_platforms_for_pypi
 
 """
 Wheel platform checking tests
@@ -28,7 +28,7 @@ def validate_wheel_filename_for_pypi(filename):
     with supported platform tags. Return a list of unsupported platform tags or
     an empty list if all tags are supported.
     """
-    from utils_thirdparty import Wheel
+    from .utils_thirdparty import Wheel
 
     wheel = Wheel.from_filename(filename)
     return validate_platforms_for_pypi(wheel.platforms)

etc/scripts/test_utils_pypi_supported_tags.py

@@ -34,19 +34,23 @@
     interpreter_name,
     interpreter_version,
     mac_platforms,
+    Tag,
 )
 
+from typing import List, Optional, Tuple
+
+# Define PythonVersion as a type alias for a tuple of integers
+PythonVersion = Tuple[int, ...]
+
 _osx_arch_pat = re.compile(r"(.+)_(\d+)_(\d+)_(.+)")
 
 
-def version_info_to_nodot(version_info):
-    # type: (Tuple[int, ...]) -> str
+def version_info_to_nodot(version_info: Tuple[int]) -> str:
     # Only use up to the first two numbers.
     return "".join(map(str, version_info[:2]))
 
 
-def _mac_platforms(arch):
-    # type: (str) -> List[str]
+def _mac_platforms(arch: str) -> List[str]:
     match = _osx_arch_pat.match(arch)
     if match:
         name, major, minor, actual_arch = match.groups()
@@ -66,8 +70,7 @@ def _mac_platforms(arch):
     return arches
 
 
-def _custom_manylinux_platforms(arch):
-    # type: (str) -> List[str]
+def _custom_manylinux_platforms(arch: str) -> List[str]:
     arches = [arch]
     arch_prefix, arch_sep, arch_suffix = arch.partition("_")
     if arch_prefix == "manylinux2014":
@@ -88,8 +91,7 @@ def _custom_manylinux_platforms(arch):
     return arches
 
 
-def _get_custom_platforms(arch):
-    # type: (str) -> List[str]
+def _get_custom_platforms(arch: str) -> List[str]:
     arch_prefix, _arch_sep, _arch_suffix = arch.partition("_")
     if arch.startswith("macosx"):
         arches = _mac_platforms(arch)
@@ -100,8 +102,7 @@ def _get_custom_platforms(arch):
     return arches
 
 
-def _expand_allowed_platforms(platforms):
-    # type: (Optional[List[str]]) -> Optional[List[str]]
+def _expand_allowed_platforms(platforms: Optional[List[str]]) -> Optional[List[str]]:
     if not platforms:
         return None
 
@@ -118,16 +119,14 @@ def _expand_allowed_platforms(platforms):
     return result
 
 
-def _get_python_version(version):
-    # type: (str) -> PythonVersion
+def _get_python_version(version: str) -> PythonVersion:
     if len(version) > 1:
         return int(version[0]), int(version[1:])
     else:
         return (int(version[0]),)
 
 
-def _get_custom_interpreter(implementation=None, version=None):
-    # type: (Optional[str], Optional[str]) -> str
+def _get_custom_interpreter(implementation: Optional[str] = None, version: Optional[str] = None):
     if implementation is None:
         implementation = interpreter_name()
     if version is None:
@@ -136,12 +135,11 @@ def _get_custom_interpreter(implementation=None, version=None):
 
 
 def get_supported(
-    version=None,  # type: Optional[str]
-    platforms=None,  # type: Optional[List[str]]
-    impl=None,  # type: Optional[str]
-    abis=None,  # type: Optional[List[str]]
-):
-    # type: (...) -> List[Tag]
+    version: Optional[str] = None,
+    platforms: Optional[List[str]] = None,
+    impl: Optional[str] = None,
+    abis: Optional[List[str]] =None,
+) -> List[Tag]:
     """Return a list of supported tags for each version specified in
     `versions`.
 
@@ -154,9 +152,9 @@ def get_supported(
     :param abis: specify a list of abis you want valid
         tags for, or None. If None, use the local interpreter abi.
     """
-    supported = []  # type: List[Tag]
+    supported: List[Tag] = []
 
-    python_version = None  # type: Optional[PythonVersion]
+    python_version: Optional[PythonVersion]  = None
     if version is not None:
         python_version = _get_python_version(version)
 

etc/scripts/utils_pip_compatibility_tags.py

@@ -31,7 +31,7 @@
 from packvers import tags as packaging_tags
 from packvers import version as packaging_version
 
-import utils_pip_compatibility_tags
+from . import utils_pip_compatibility_tags
 
 """
 Utilities to manage Python thirparty libraries source, binaries and metadata in
@@ -1699,8 +1699,12 @@ def fetch_links(self, normalized_name):
         return links
 
 
-PYPI_PUBLIC_REPO = PypiSimpleRepository(index_url=PYPI_SIMPLE_URL)
-PYPI_SELFHOSTED_REPO = PypiSimpleRepository(index_url=ABOUT_PYPI_SIMPLE_URL)
+PYPI_PUBLIC_REPO = PypiSimpleRepository()
+PYPI_PUBLIC_REPO.index_url = PYPI_SIMPLE_URL
+
+PYPI_SELFHOSTED_REPO = PypiSimpleRepository()
+PYPI_SELFHOSTED_REPO.index_url=ABOUT_PYPI_SIMPLE_URL
+
 DEFAULT_PYPI_REPOS = PYPI_PUBLIC_REPO, PYPI_SELFHOSTED_REPO
 DEFAULT_PYPI_REPOS_BY_URL = {r.index_url: r for r in DEFAULT_PYPI_REPOS}
 

etc/scripts/utils_thirdparty.py

@@ -110,7 +110,11 @@ python-inspector = "python_inspector.resolve_cli:resolve_dependencies"
 
 
 [tool.pytest.ini_options]
-addopts = ["--import-mode=importlib"]
+addopts = [
+    "--import-mode=importlib",
+    "--strict-markers",
+    "-rfExXw",
+]
 log_cli = true
 log_cli_level = "INFO"
 testpaths = [

pyproject.toml

@@ -6,7 +6,7 @@
     "options": [
       "--json <file>",
       "--operating-system linux",
-      "--python-version 38",
+      "--python-version 39",
       "--specifier zipp==3.8.0",
       "--use-pypi-json-api"
     ],

tests/__init__.py

@@ -6,7 +6,7 @@
     "options": [
       "--json-pdt <file>",
       "--operating-system linux",
-      "--python-version 38",
+      "--python-version 39",
       "--requirement tests/data/pdt-requirements.txt"
     ],
     "notice": "Dependency tree generated with python-inspector.\npython-inspector is a free software tool from nexB Inc. and others.\nVisit https://github.com/aboutcode-org/python-inspector/ for support and download.",

tests/data/azure-devops.req-310-expected.json

@@ -7,7 +7,7 @@
       "--json <file>",
       "--operating-system linux",
       "--prefer-source",
-      "--python-version 38",
+      "--python-version 39",
       "--specifier zipp==3.8.0"
     ],
     "notice": "Dependency tree generated with python-inspector.\npython-inspector is a free software tool from nexB Inc. and others.\nVisit https://github.com/aboutcode-org/python-inspector/ for support and download.",