Deeper uv integration

Emrys-Merlin · Nov 1, 2024 · d9bcb0a · d9bcb0a
1 parent 03633f6
commit d9bcb0a
Show file tree

Hide file tree

Showing 7 changed files with 398 additions and 366 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,6 +26,9 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
+    - name: Install uv
+      uses: astral-sh/setup-uv@v3
+
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v5
       with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -37,8 +37,7 @@ jobs:
           make publish
         shell: bash
         env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+          UV_PUBLISH_TOKEN: ${{ secrets.PYPI_PASSWORD }}
 
       - name: Create release
         uses: actions/create-release@v1

diff --git a/Makefile b/Makefile
@@ -2,28 +2,24 @@ SHELL := /bin/bash
 
 .PHONY: setup
 setup:
-	pip install uv
-	uv pip install -e ".[dev,docs]"
-	pre-commit install
+	uv sync
+	uv run pre-commit install
 
 .PHONY: test
 test:
-	pytest --cov=web_watchr --cov-report term-missing
+	uv run pytest --cov=web_watchr --cov-report term-missing
 
 .PHONY: setup-ci
 setup-ci:
-	pip install --upgrade pip
-	pip install uv
-	uv venv
-	uv pip install -e ".[dev]"
+	uv sync
 
 .PHONY: run-ci
 run-ci: setup-ci
 	uv run pytest --cov=web_watchr --cov-report term-missing --cov-report xml:coverage.xml --junit-xml=report.xml
 
 .PHONY: docs
 docs:
-	mkdocs gh-deploy
+	uv run mkdocs gh-deploy
 
 .PHONY: clean
 clean:
@@ -41,4 +37,4 @@ build:
 
 .PHONY: publish
 publish:
-	uvx twine upload dist/*
+	uv publish
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 | 3.10 | 3.11 | 3.12 | 3.13 |
 |------|------|------|------|
 |![tests](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2FEmrys-Merlin%2Fec2e4e339a048ca0f0b996517d282a4a%2Fraw%2Fweb_watchr_3.10-junit-tests.json)|![tests](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2FEmrys-Merlin%2Fec2e4e339a048ca0f0b996517d282a4a%2Fraw%2Fweb_watchr_3.11-junit-tests.json)|![tests](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2FEmrys-Merlin%2Fec2e4e339a048ca0f0b996517d282a4a%2Fraw%2Fweb_watchr_3.12-junit-tests.json)|![tests](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2FEmrys-Merlin%2Fec2e4e339a048ca0f0b996517d282a4a%2Fraw%2Fweb_watchr_3.13-junit-tests.json)|
-|![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2FEmrys-Merlin%2Fec2e4e339a048ca0f0b996517d282a4a%2Fraw%2F272263ce795e0ca0adf06fa6d8aa2fe496a778dd%2Fweb_watchr_3.10-cobertura-coverage.json)|![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2FEmrys-Merlin%2Fec2e4e339a048ca0f0b996517d282a4a%2Fraw%2F272263ce795e0ca0adf06fa6d8aa2fe496a778dd%2Fweb_watchr_3.11-cobertura-coverage.json)|![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2FEmrys-Merlin%2Fec2e4e339a048ca0f0b996517d282a4a%2Fraw%2F272263ce795e0ca0adf06fa6d8aa2fe496a778dd%2Fweb_watchr_3.12-cobertura-coverage.json)|![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2FEmrys-Merlin%2Fec2e4e339a048ca0f0b996517d282a4a%2Fraw%2F272263ce795e0ca0adf06fa6d8aa2fe496a778dd%2Fweb_watchr_3.13-cobertura-coverage.json)|
+|![Endpoint Badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/Emrys-Merlin/ec2e4e339a048ca0f0b996517d282a4a/raw/7bb08f823be14242b40466aed324de8bff518364/web_watchr_3.10-cobertura-coverage.json)|![Endpoint Badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/Emrys-Merlin/ec2e4e339a048ca0f0b996517d282a4a/raw/7bb08f823be14242b40466aed324de8bff518364/web_watchr_3.11-cobertura-coverage.json)|![Endpoint Badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/Emrys-Merlin/ec2e4e339a048ca0f0b996517d282a4a/raw/7bb08f823be14242b40466aed324de8bff518364/web_watchr_3.12-cobertura-coverage.json)|![Endpoint Badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/Emrys-Merlin/ec2e4e339a048ca0f0b996517d282a4a/raw/7bb08f823be14242b40466aed324de8bff518364/web_watchr_3.13-cobertura-coverage.json)|
 
 # WebWatchr
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -28,20 +28,7 @@ dependencies = [
 ]
 dynamic = ["version"]
 
-[project.optional-dependencies]
-dev = [
-    "pytest",
-    "pytest-cov",
-    "ruff",
-    "pre-commit",
-    "mypy",
-    "ipdb",
-]
-docs = [
-    "mkdocs",
-    "mkdocstrings[python]",
-]
-all = ["web_watchr[dev,docs]"]
+# [project.optional-dependencies]
 
 [tool.hatch.version]
 path = "src/web_watchr/__init__.py"
@@ -61,12 +48,19 @@ Repository = "https://github.com/Emrys-Merlin/web_watchr.git"
 "Bug Tracker" = "https://github.com/Emrys-Merlin/web_watchr/issues"
 # Changelog = "https://github.com/me/spam/blob/master/CHANGELOG.md"
 
-[tool.semantic_release]
-version_variable = [
-    "src/web_watchr/__init__.py:__version__"
+[tool.uv]
+default-groups = ["dev", "docs"]
+
+[dependency-groups]
+dev = [
+    "pytest",
+    "pytest-cov",
+    "ruff",
+    "pre-commit",
+    "mypy",
+    "ipdb",
+]
+docs = [
+    "mkdocs",
+    "mkdocstrings[python]",
 ]
-major_on_zero = true
-branch = "main"
-upload_to_PyPI = true
-upload_to_release = true
-build_command = "make setup-ci && make build"
diff --git a/src/web_watchr/__init__.py b/src/web_watchr/__init__.py
@@ -3,6 +3,6 @@
 from .watchr import Watchr
 
 __all__ = ["Watchr"]
-__version__ = "0.3.0"
+__version__ = "0.4.0"
 
 logger.disable("website_monitoring_bot")