Use uv

Author: mdellweg

.ci/container_setup.d/10-install-signing-service.sh

@@ -6,9 +6,9 @@ pulp --config "${PULP_CLI_CONFIG}" debug has-plugin --name "deb" && HAS_DEB=true
 pulp --config "${PULP_CLI_CONFIG}" debug has-plugin --name "ansible" && HAS_ANSIBLE=true || HAS_ANSIBLE=""
 if [ "$HAS_DEB" ] || [ "$HAS_ANSIBLE" ]
 then
-  if [ ! -f pytest_pulp_cli/GPG-PRIVATE-KEY-fixture-signing ]
+  if [ ! -f src/pytest_pulp_cli/GPG-PRIVATE-KEY-fixture-signing ]
   then
-    curl -L https://github.com/pulp/pulp-fixtures/raw/master/common/GPG-PRIVATE-KEY-fixture-signing > pytest_pulp_cli/GPG-PRIVATE-KEY-fixture-signing
+    curl -L https://github.com/pulp/pulp-fixtures/raw/master/common/GPG-PRIVATE-KEY-fixture-signing > src/pytest_pulp_cli/GPG-PRIVATE-KEY-fixture-signing
   fi
   echo "Setup the signing services"
   if "${CONTAINER_RUNTIME}" exec "pulp-ephemeral" id pulp
@@ -20,7 +20,7 @@ then
   "${CONTAINER_RUNTIME}" exec "pulp-ephemeral" mkdir -p /var/lib/pulp/scripts/
   # Setup key on the Pulp container
   echo "0C1A894EBB86AFAE218424CADDEF3019C2D4A8CF:6:" | "${CONTAINER_RUNTIME}" exec -i "pulp-ephemeral" su "${PULP_USER}" -c "gpg --import-ownertrust"
-  "${CONTAINER_RUNTIME}" exec -i "pulp-ephemeral" su "${PULP_USER}" -c "gpg --import" < pytest_pulp_cli/GPG-PRIVATE-KEY-fixture-signing
+  "${CONTAINER_RUNTIME}" exec -i "pulp-ephemeral" su "${PULP_USER}" -c "gpg --import" < src/pytest_pulp_cli/GPG-PRIVATE-KEY-fixture-signing
   if [ "$HAS_DEB" ]
   then
     echo "Setup deb release signing service"

.ci/scripts/validate_commit_message.py

@@ -1,7 +1,7 @@
 # /// script
 # requires-python = ">=3.11"
 # dependencies = [
-#     "gitpython>=3.1.46,<3.2.0",
+#     "pygithub>=2.8.1,<3.0.0",
 # ]
 # ///
 

.github/workflows/build.yml

@@ -9,20 +9,14 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
       - uses: "actions/checkout@v5"
-      - uses: "actions/cache@v4"
-        with:
-          path: "~/.cache/pip"
-          key: "${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/*constraints.lock', '**/setup.py', '**/pyproject.toml') }}"
-          restore-keys: |
-            ${{ runner.os }}-pip-
-
       - name: "Set up Python"
         uses: "actions/setup-python@v6"
         with:
           python-version: "3.14"
-      - name: "Install python dependencies"
-        run: |
-          pip install build setuptools wheel
+      - name: "Install uv"
+        uses: "astral-sh/setup-uv@v7"
+        with:
+          enable-cache: true
       - name: "Build wheels"
         run: |
           make build
@@ -31,7 +25,7 @@ jobs:
         with:
           name: "pulp_cli_packages"
           path: |
-            pulp-glue/dist/
+            README.md
             dist/
           if-no-files-found: "error"
           retention-days: 5

.github/workflows/lint.yml

@@ -15,25 +15,15 @@ jobs:
           - "3.14"
     steps:
       - uses: "actions/checkout@v5"
-      - uses: "actions/cache@v4"
-        with:
-          path: "~/.cache/pip"
-          key: "${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/*constraints.lock', '**/setup.py', '**/pyproject.toml') }}"
-          restore-keys: |
-            ${{ runner.os }}-pip-
-
-      - name: "Download wheels"
-        uses: "actions/download-artifact@v5"
-        with:
-          name: "pulp_cli_packages"
       - name: "Set up Python"
         uses: "actions/setup-python@v6"
         with:
           python-version: "${{ matrix.python }}"
-      - name: "Install python dependencies"
-        run: |
-          pip install dist/pulp_cli-*.whl pulp-glue/dist/pulp_glue-*.whl -r lint_requirements.txt
+      - name: "Install uv"
+        uses: "astral-sh/setup-uv@v7"
+        with:
+          enable-cache: true
       - name: "Lint code"
         run: |
-          make lint
+          make uv-lint
 ...

.github/workflows/pr.yml

@@ -9,15 +9,15 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
-    uses: "./.github/workflows/build.yml"
   lint:
-    needs:
-      - "build"
     uses: "./.github/workflows/lint.yml"
-  test:
+  build:
     needs:
       - "lint"
+    uses: "./.github/workflows/build.yml"
+  test:
+    needs:
+      - "build"
     uses: "./.github/workflows/test.yml"
   docs:
     needs:
@@ -40,17 +40,18 @@ jobs:
         uses: "actions/setup-python@v6"
         with:
           python-version: "3.x"
-      - name: "Install python dependencies"
-        run: |
-          pip install toml pygithub
+      - name: "Install uv"
+        uses: "astral-sh/setup-uv@v7"
+        with:
+          enable-cache: true
       - name: "Check commit message"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           GITHUB_CONTEXT: "${{ github.event.pull_request.commits_url }}"
         run: |
           for SHA in $(curl -H "Authorization: token $GITHUB_TOKEN" "$GITHUB_CONTEXT" | jq -r '.[].sha')
           do
-            python .ci/scripts/validate_commit_message.py "$SHA"
+            uv run -q .ci/scripts/validate_commit_message.py "$SHA"
             VALUE=$?
             if [ "$VALUE" -gt 0 ]; then
               exit "$VALUE"

.github/workflows/pr_checks.yml

@@ -19,19 +19,24 @@ jobs:
     permissions:
       pull-requests: "write"
     steps:
-      - uses: "actions/checkout@v5"
+      - name: "Fetch Repository"
+        uses: "actions/checkout@v5"
         with:
           fetch-depth: 0
-      - uses: "actions/setup-python@v6"
+      - name: "Set up Python"
+        uses: "actions/setup-python@v6"
         with:
           python-version: "3.x"
+      - name: "Install uv"
+        uses: "astral-sh/setup-uv@v7"
+        with:
+          enable-cache: true
       - name: "Determine PR labels"
         run: |
-          pip install GitPython==3.1.42
           git fetch origin ${{ github.event.pull_request.head.sha }}
-          python .ci/scripts/pr_labels.py "origin/${{ github.base_ref }}" "${{ github.event.pull_request.head.sha }}" >> "$GITHUB_ENV"
-      - uses: "actions/github-script@v8"
-        name: "Apply PR Labels"
+          uv run -q .ci/scripts/pr_labels.py "origin/${{ github.base_ref }}" "${{ github.event.pull_request.head.sha }}" >> "$GITHUB_ENV"
+      - name: "Apply PR Labels"
+        uses: "actions/github-script@v8"
         with:
           script: |
             const { ADD_LABELS, REMOVE_LABELS } = process.env;

.github/workflows/test.yml

@@ -15,13 +15,6 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
       - uses: "actions/checkout@v5"
-      - uses: "actions/cache@v4"
-        with:
-          path: "~/.cache/pip"
-          key: "${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/*constraints.lock', '**/setup.py', '**/pyproject.toml') }}"
-          restore-keys: |
-            ${{ runner.os }}-pip-
-
       - name: "Download wheels"
         uses: "actions/download-artifact@v5"
         with:
@@ -30,12 +23,13 @@ jobs:
         uses: "actions/setup-python@v6"
         with:
           python-version: "3.14"
-      - name: "Install Python Test Dependencies"
-        run: |
-          pip install dist/pulp_cli-*.whl pulp-glue/dist/pulp_glue-*.whl -r test_requirements.txt
+      - name: "Install uv"
+        uses: "astral-sh/setup-uv@v7"
+        with:
+          enable-cache: true
       - name: "Run tests"
         run: |
-          make unittest
+          uv run --isolated --with dist/pulp_glue*.whl --with dist/pulp_cli*.whl --only-group test make unittest
   test:
     runs-on: "ubuntu-24.04"
     needs:
@@ -74,13 +68,6 @@ jobs:
             python: "3.13"
     steps:
       - uses: "actions/checkout@v5"
-      - uses: "actions/cache@v4"
-        with:
-          path: "~/.cache/pip"
-          key: "${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/*constraints.lock', '**/setup.py', '**/pyproject.toml') }}"
-          restore-keys: |
-            ${{ runner.os }}-pip-
-
       - name: "Download wheels"
         uses: "actions/download-artifact@v5"
         with:
@@ -90,18 +77,10 @@ jobs:
         with:
           python-version: "${{ matrix.python }}"
           allow-prereleases: true
-      - name: "Install Python Test Dependencies"
-        run: |
-          if [ "${{matrix.lower_bounds}}" ]
-          then
-            pip install dist/pulp_cli-*.whl pulp-glue/dist/pulp_glue-*.whl -r test_requirements.txt -c lower_bounds_constraints.lock
-          elif [ "${{matrix.upper_bounds}}" ]
-          then
-            .ci/scripts/calc_constraints.py pyproject.toml pulp-glue/pyproject.toml  --upper > upper_bounds_constraints.lock
-            pip install dist/pulp_cli-*.whl pulp-glue/dist/pulp_glue-*.whl -r test_requirements.txt -c upper_bounds_constraints.lock
-          else
-            pip install dist/pulp_cli-*.whl pulp-glue/dist/pulp_glue-*.whl -r test_requirements.txt
-          fi
+      - name: "Install uv"
+        uses: "astral-sh/setup-uv@v7"
+        with:
+          enable-cache: true
       - name: "Run tests"
         env:
           CONTAINER_RUNTIME: "${{ matrix.container_runtime }}"
@@ -115,5 +94,15 @@ jobs:
           PULP_ENABLED_PLUGINS: "${{ matrix.pulp_enabled_plugins }}"
           OAS_VERSION: "${{ matrix.oas_version }}"
         run: |
-          .ci/run_container.sh make livetest
+          if [ "${{matrix.lower_bounds}}" ]
+          then
+            RESOLUTION=("--resolution" "lowest-direct")
+          elif [ "${{matrix.upper_bounds}}" ]
+          then
+            RESOLUTION=("--resolution" "highest")
+          else
+            RESOLUTION=()
+          fi
+
+          uv run "${RESOLUTION[@]}" --isolated --with dist/pulp_glue*.whl --with dist/pulp_cli*.whl --only-group test .ci/run_container.sh make livetest
 ...

.gitignore

@@ -2,7 +2,7 @@
 __pycache__/
 build/
 tests/cli.toml
-pytest_pulp_cli/GPG-PRIVATE-KEY-fixture-signing
+GPG-PRIVATE-KEY-fixture-signing
 site/
 dist/
 *.po~

Makefile

@@ -12,24 +12,33 @@ info:
 
 .PHONY: build
 build:
-	cd pulp-glue; pyproject-build -n
-	pyproject-build -n
+	uv build --all
 
 .PHONY: format
 format:
 	ruff format
 	ruff check --fix
 
+.PHONY: uv-format
+uv-format:
+	uv lock
+	uv run --isolated --group lint $(MAKE) format
+
 .PHONY: lint
 lint:
 	find tests .ci -name '*.sh' -print0 | xargs -0 shellcheck -x
 	ruff format --check --diff
 	ruff check --diff
 	.ci/scripts/check_click_for_mypy.py
-	MYPYPATH=pulp-glue mypy
+	mypy
 	cd pulp-glue; mypy
 	@echo "🙊 Code 🙈 LGTM 🙉 !"
 
+.PHONY: uv-lint
+uv-lint:
+	uv lock --check
+	uv run --isolated --group lint $(MAKE) lint
+
 tests/cli.toml:
 	cp $@.example $@
 	@echo "In order to configure the tests to talk to your test server, you might need to edit $@ ."

pulp-glue/pyproject.toml

@@ -1,6 +1,6 @@
 [build-system]
-requires = ["setuptools<81"]
-build-backend = "setuptools.build_meta"
+requires = ["uv_build>=0.9.21,<0.10.0"]
+build-backend = "uv_build"
 
 [project]
 name = "pulp-glue"
@@ -25,7 +25,8 @@ classifiers = [
 dependencies = [
   "multidict>=6.0.5,<6.8",
   "packaging>=20.0,<=25.0",  # CalVer
-  "requests>=2.24.0,<2.33",
+  "requests>=2.24.0,<2.33;python_version<'3.12'",
+  "requests>=2.25.1,<2.33;python_version>='3.12'",
   "tomli>=2.0.0,<2.1;python_version<'3.11'",
 ]
 
@@ -34,9 +35,14 @@ documentation = "https://pulpproject.org/pulp-glue/docs/dev/"
 repository = "https://github.com/pulp/pulp-cli"
 changelog = "https://pulpproject.org/pulp-cli/changes/"
 
+[tool.uv.build-backend]
+package-name = ["pulp_glue"]
+namespace = true
+source-exclude = ["*.pot", "*.po", "**/*\\~"]
+
 [tool.setuptools.packages.find]
 # This section is managed by the cookiecutter templates.
-where = ["."]
+where = ["src"]
 include = ["pulp_glue.*"]
 namespaces = true
 
@@ -47,10 +53,11 @@ namespaces = true
 
 [tool.mypy]
 # This section is managed by the cookiecutter templates.
+mypy_path = ["src"]
 strict = true
 warn_unused_ignores = false
 show_error_codes = true
-files = "pulp_glue/**/*.py, tests/**/*.py"
+files = "src/**/*.py, tests/**/*.py"
 namespace_packages = true
 explicit_package_bases = true