Skip to content

Commit feb328a

Browse files
authored
🔀 Merge pull request #21 from davep/switch-to-uv
2 parents 1cb2a91 + b7f994d commit feb328a

File tree

7 files changed

+789
-156
lines changed

7 files changed

+789
-156
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,16 @@ jobs:
1919
steps:
2020

2121
- name: Checkout Code
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@v5
2323

2424
- name: Set up Python
25-
uses: actions/setup-python@v4
25+
uses: actions/setup-python@v5
2626
with:
2727
python-version: ${{ matrix.python-version }}
28+
allow-prereleases: true
2829

29-
- name: Install Rye
30-
uses: eifinger/setup-rye@v4
30+
- name: Install uv
31+
uses: astral-sh/setup-uv@v6
3132
with:
3233
version: "latest"
3334

ChangeLog.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# ng2web ChangeLog
22

3+
## Unreleased
4+
5+
**Released: WiP**
6+
7+
- Migrated from `rye` to `uv` for development management.
8+
([#21](https://github.com/davep/ng2web/pull/21))
9+
310
## v1.0.1
411

512
**Released: 2025-05-27**

Makefile

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
app := ng2web
2-
src := src/
3-
run := rye run
4-
python := $(run) python
5-
lint := rye lint -- --select I
6-
fmt := rye fmt
7-
mypy := $(run) mypy
8-
mkdocs := $(run) mkdocs
1+
app := ng2web
2+
src := src/
3+
run := uv run
4+
sync := uv sync
5+
build := uv build
6+
publish := uv publish --username=__token__ --keyring-provider=subprocess
7+
python := $(run) python
8+
ruff := $(run) ruff
9+
lint := $(ruff) check --select I
10+
fmt := $(ruff) format
11+
mypy := $(run) mypy
12+
mkdocs := $(run) mkdocs
913

1014
##############################################################################
1115
# Local "interactive testing" of the code.
@@ -17,12 +21,12 @@ run: # Run the code in a testing context
1721
# Setup/update packages the system requires.
1822
.PHONY: setup
1923
setup: # Set up the repository for development
20-
rye sync
24+
$(sync)
2125
$(run) pre-commit install
2226

2327
.PHONY: update
2428
update: # Update all dependencies
25-
rye sync --update-all
29+
$(sync) --upgrade
2630

2731
.PHONY: resetup
2832
resetup: realclean # Recreate the virtual environment from scratch
@@ -67,19 +71,19 @@ publishdocs: # Set up the docs for publishing
6771
# Package/publish.
6872
.PHONY: package
6973
package: # Package the library
70-
rye build
74+
$(build)
7175

7276
.PHONY: spackage
7377
spackage: # Create a source package for the library
74-
rye build --sdist
78+
$(build) --sdist
7579

7680
.PHONY: testdist
7781
testdist: package # Perform a test distribution
78-
rye publish --yes --skip-existing --repository testpypi --repository-url https://test.pypi.org/legacy/
82+
$(publish) --index testpypi
7983

8084
.PHONY: dist
8185
dist: package # Upload to pypi
82-
rye publish --yes --skip-existing
86+
$(publish) --index testpypi
8387

8488
##############################################################################
8589
# Utility.

pyproject.toml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,26 +55,19 @@ Discussions = "https://github.com/davep/ng2web/discussions"
5555
ng2web = "ng2web:main"
5656

5757
[build-system]
58-
# https://github.com/astral-sh/rye/issues/1446
59-
requires = ["hatchling==1.26.3", "hatch-vcs"]
60-
# requires = ["hatchling"]
61-
build-backend = "hatchling.build"
58+
requires = ["uv_build>=0.8.11,<0.9.0"]
59+
build-backend = "uv_build"
6260

63-
[tool.rye]
61+
[tool.uv]
6462
managed = true
6563
dev-dependencies = [
6664
"pre-commit>=4.2.0",
6765
"mypy>=1.15.0",
6866
"mkdocs-material>=9.6.9",
6967
"markdown-exec>=1.10.2",
68+
"ruff>=0.12.9",
7069
]
7170

72-
[tool.hatch.metadata]
73-
allow-direct-references = true
74-
75-
[tool.hatch.build.targets.wheel]
76-
packages = ["src/ng2web"]
77-
7871
[tool.pyright]
7972
venvPath="."
8073
venv=".venv"

requirements-dev.lock

Lines changed: 0 additions & 105 deletions
This file was deleted.

requirements.lock

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)