🔀 Merge pull request #128 from davep/switch-to-uv

Author: davep

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

@@ -19,15 +19,15 @@ 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 }}
 
-      - name: Install Rye
-        uses: eifinger/setup-rye@v4
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
         with:
           version: "latest"
 

Makefile

@@ -1,15 +1,19 @@
-app    := hike
-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     := hike
+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,12 +37,12 @@ console:			# Run the textual console
 # Setup/update packages the system requires.
 .PHONY: setup
 setup:				# Set up the repository for development
-	rye sync
+	$(sync)
 	$(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
@@ -90,20 +94,20 @@ publishdocs: clean-docs	# Set up the docs for publishing
 ##############################################################################
 # Package/publish.
 .PHONY: package
-package:			# Package the library
-	rye build
+package: clean-packaging		# Package the library
+	$(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
+	echo $(publish)
 
 ##############################################################################
 # Utility.

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "hike"
-version = "1.1.2"
+version = "1.1.2.6"
 description = "A Markdown browser for the terminal"
 authors = [
     { name = "Dave Pearson", email = "[email protected]" }
@@ -16,7 +16,7 @@ dependencies = [
 ]
 readme = "README.md"
 requires-python = ">= 3.10"
-license = { text = "GNU General Public License v3 or later (GPLv3+)" }
+license = "GPL-3.0-or-later"
 keywords = [
     "terminal",
     "tui",
@@ -34,7 +34,6 @@ classifiers = [
     "Intended Audience :: End Users/Desktop",
     "Intended Audience :: Information Technology",
     "Intended Audience :: Other Audience",
-    "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
     "Operating System :: MacOS",
     "Operating System :: Microsoft :: Windows :: Windows 10",
     "Operating System :: Microsoft :: Windows :: Windows 11",
@@ -64,12 +63,10 @@ Discussions = "https://github.com/davep/hike/discussions"
 hike = "hike.__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.15.0",
@@ -79,15 +76,17 @@ dev-dependencies = [
     "mkdocs-material>=9.6.11",
     "markdown-exec>=1.10.3",
     "codespell>=2.4.1",
+    "ruff>=0.12.9",
 ]
 
-[tool.hatch.metadata]
-allow-direct-references = true
-
-[tool.hatch.build.targets.wheel]
-packages = ["src/hike"]
+[[tool.uv.index]]
+name = "testpypi"
+url = "https://test.pypi.org/simple/"
+publish-url = "https://test.pypi.org/legacy/"
+explicit = true
 
 [tool.pyright]
 venvPath="."
 venv=".venv"
 exclude=[".venv"]
+