🔀 Merge pull request #71 from davep/migrate-to-uv

Migrate from rye to uv for project management

Author: davep

.github/workflows/style-lint-and-test.yaml

@@ -19,15 +19,16 @@ jobs:
     steps:
 
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
+          allow-prereleases: true
 
-      - name: Install Rye
-        uses: eifinger/setup-rye@v4
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
         with:
           version: "latest"
 

ChangeLog.md

@@ -1,5 +1,12 @@
 # Peplum ChangeLog
 
+## Unreleased
+
+**Released: WiP**
+
+- Migrated from `rye` to `uv` for development management.
+  ([#71](https://github.com/davep/dhv/pull/71))
+
 ## v1.0.1
 
 **Released: 2025-05-15**

Makefile

@@ -1,15 +1,19 @@
-app    := peplum
-src    := src/
-tests  := tests/
-docs   := docs/
-run    := rye run
-test   := rye test
-python := $(run) python
-lint   := rye lint -- --select I
-fmt    := rye fmt
-mypy   := $(run) mypy
-mkdocs := $(run) mkdocs
-spell  := $(run) codespell
+app     := peplum
+src     := src/
+tests   := tests/
+docs    := docs/
+run     := uv run
+sync    := uv sync
+build   := uv build
+publish := uv publish --username=__token__ --keyring-provider=subprocess
+test    := $(run) pytest
+python  := $(run) python
+ruff    := $(run) ruff
+lint    := $(ruff) check --select I
+fmt     := $(ruff) format
+mypy    := $(run) mypy
+mkdocs  := $(run) mkdocs
+spell   := $(run) codespell
 
 ##############################################################################
 # Local "interactive testing" of the code.
@@ -33,15 +37,15 @@ console:			# Run the textual console
 # Setup/update packages the system requires.
 .PHONY: ready
 ready:				# Make the development environment ready to go
-	rye sync
+	$(sync)
 
 .PHONY: setup
 setup: ready			# Set up the repository for development
 	$(run) pre-commit install
 
 .PHONY: update
 update:				# Update all dependencies
-	rye sync --update-all
+	$(sync) --update-all
 
 .PHONY: resetup
 resetup: realclean		# Recreate the virtual environment from scratch
@@ -94,19 +98,19 @@ publishdocs: clean-docs ready	# Set up the docs for publishing
 # Package/publish.
 .PHONY: package
 package:			# Package the library
-	rye build
+	$(build)
 
 .PHONY: spackage
 spackage:			# Create a source package for the library
-	rye build --sdist
+	$(build) --sdist
 
 .PHONY: testdist
 testdist: package			# Perform a test distribution
-	rye publish --yes --skip-existing --repository testpypi --repository-url https://test.pypi.org/legacy/
+	$(publish) --index testpypi
 
 .PHONY: dist
 dist: package			# Upload to pypi
-	rye publish --yes --skip-existing
+	$(publish)
 
 ##############################################################################
 # Utility.

pyproject.toml

@@ -61,12 +61,10 @@ Discussions = "https://github.com/davep/peplum/discussions"
 peplum = "peplum.__main__:main"
 
 [build-system]
-# https://github.com/astral-sh/rye/issues/1446
-requires = ["hatchling==1.26.3", "hatch-vcs"]
-# requires = ["hatchling"]
-build-backend = "hatchling.build"
+requires = ["uv_build>=0.8.11,<0.9.0"]
+build-backend = "uv_build"
 
-[tool.rye]
+[tool.uv]
 managed = true
 dev-dependencies = [
     "mypy>=1.14.1",
@@ -76,10 +74,14 @@ dev-dependencies = [
     "codespell>=2.4.1",
     "mkdocs-material>=9.6.11",
     "markdown-exec>=1.10.3",
+    "ruff>=0.12.9",
 ]
 
-[tool.hatch.metadata]
-allow-direct-references = true
+[[tool.uv.index]]
+name = "testpypi"
+url = "https://test.pypi.org/simple/"
+publish-url = "https://test.pypi.org/legacy/"
+explicit = true
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/peplum"]