Use pdm to get a list of dependencies for pip-check-reqs

Author: adamtheturtle

.github/workflows/ci.yml

@@ -32,10 +32,7 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          # This is like the example but we use ``*requirements.txt`` rather
-          # than ``requirements.txt`` because we have multiple requirements
-          # files.
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt') }}
+          key: ${{ runner.os }}-pip-${{ hashFiles('pyproject.toml') }}
           restore-keys: |
             ${{ runner.os }}-pip-
 

.github/workflows/windows-ci.yml

@@ -32,10 +32,7 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: ~\AppData\Local\pip\Cache
-          # This is like the example but we use ``*requirements.txt`` rather
-          # than ``requirements.txt`` because we have multiple requirements
-          # files.
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt') }}
+          key: ${{ runner.os }}-pip-${{ hashFiles('pyproject.toml') }}
           restore-keys: |
             ${{ runner.os }}-pip-
 

MANIFEST.in

@@ -1,3 +1,2 @@
 include src/vws/py.typed
-include requirements/*.txt
 include pyproject.toml

lint.mk

@@ -32,10 +32,12 @@ fix-ruff:
 
 .PHONY: pip-extra-reqs
 pip-extra-reqs:
+	pdm export --pyproject > requirements/requirements.txt
 	pip-extra-reqs --requirements-file=requirements/requirements.txt src/
 
 .PHONY: pip-missing-reqs
 pip-missing-reqs:
+	pdm export --pyproject > requirements/requirements.txt
 	pip-missing-reqs --requirements-file=requirements/requirements.txt src/
 
 .PHONY: pylint

requirements/dev-requirements.txt

@@ -11,6 +11,7 @@ dodgy==0.2.1  # Look for uploaded secrets
 freezegun==1.2.2
 furo==2022.12.7
 mypy==1.1.1  # Type checking
+pdm==2.4.8
 pip_check_reqs==2.4.4
 pydocstyle==6.3.0  # Lint docstrings
 pyenchant==3.2.2  # Bindings for a spellchecking sytem
@@ -24,5 +25,4 @@ sphinx-prompt==1.5.0
 sphinxcontrib-spelling==8.0.0
 types-freezegun==1.1.10
 types-requests==2.28.11.15
-types-setuptools==67.6.0.0
 vulture==2.7

requirements/requirements.txt

@@ -1,28 +1,7 @@
 """Setup script for VWS Python, a wrapper for Vuforia's Web Services APIs."""
 
-from pathlib import Path
-
 from setuptools import setup
 
-
-def _get_dependencies(requirements_file: Path) -> list[str]:
-    """
-    Return requirements from a requirements file.
-
-    This expects a requirements file with no ``--find-links`` lines.
-    """
-    lines = requirements_file.read_text().strip().split("\n")
-    return [line for line in lines if not line.startswith("#")]
-
-
-DEV_REQUIRES = _get_dependencies(
-    requirements_file=Path("requirements/dev-requirements.txt"),
-)
-
-SETUP_REQUIRES = _get_dependencies(
-    requirements_file=Path("requirements/setup-requirements.txt"),
-)
-
 setup(
     setup_requires=SETUP_REQUIRES,
     extras_require={"dev": DEV_REQUIRES},