Skip to content

Commit f0f07b5

Browse files
davepdavep
authored
🔀 Merge pull request #126 from davep/revert-123-migrate
Revert "Migrate from Rye to uv"
2 parents c323af0 + 9b1e454 commit f0f07b5

6 files changed

Lines changed: 266 additions & 1623 deletions

File tree

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

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

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

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

29-
- name: Install uv
30-
uses: astral-sh/setup-uv@v6
29+
- name: Install Rye
30+
uses: eifinger/setup-rye@v4
3131
with:
3232
version: "latest"
3333

‎Makefile‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ app := hike
22
src := src/
33
tests := tests/
44
docs := docs/
5-
run := uv run
6-
test := uv run pytest
5+
run := rye run
6+
test := rye test
77
python := $(run) python
8-
lint := uv run ruff check --select I
9-
fmt := uv run ruff format
8+
lint := rye lint -- --select I
9+
fmt := rye fmt
1010
mypy := $(run) mypy
1111
mkdocs := $(run) mkdocs
1212
spell := $(run) codespell
@@ -33,12 +33,12 @@ console: # Run the textual console
3333
# Setup/update packages the system requires.
3434
.PHONY: setup
3535
setup: # Set up the repository for development
36-
uv sync
36+
rye sync
3737
$(run) pre-commit install
3838

3939
.PHONY: update
4040
update: # Update all dependencies
41-
uv sync --update-all
41+
rye sync --update-all
4242

4343
.PHONY: resetup
4444
resetup: realclean # Recreate the virtual environment from scratch
@@ -91,19 +91,19 @@ publishdocs: clean-docs # Set up the docs for publishing
9191
# Package/publish.
9292
.PHONY: package
9393
package: # Package the library
94-
uv build
94+
rye build
9595

9696
.PHONY: spackage
9797
spackage: # Create a source package for the library
98-
uv build --sdist
98+
rye build --sdist
9999

100100
.PHONY: testdist
101101
testdist: package # Perform a test distribution
102-
uv publish --yes --skip-existing --repository testpypi --repository-url https://test.pypi.org/legacy/
102+
rye publish --yes --skip-existing --repository testpypi --repository-url https://test.pypi.org/legacy/
103103

104104
.PHONY: dist
105105
dist: package # Upload to pypi
106-
uv publish --yes --skip-existing
106+
rye publish --yes --skip-existing
107107

108108
##############################################################################
109109
# Utility.

‎pyproject.toml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ requires = ["hatchling==1.26.3", "hatch-vcs"]
6969
# requires = ["hatchling"]
7070
build-backend = "hatchling.build"
7171

72-
[tool.uv]
72+
[tool.rye]
7373
managed = true
7474
dev-dependencies = [
7575
"mypy>=1.15.0",
@@ -79,7 +79,6 @@ dev-dependencies = [
7979
"mkdocs-material>=9.6.11",
8080
"markdown-exec>=1.10.3",
8181
"codespell>=2.4.1",
82-
"ruff>=0.12.9",
8382
]
8483

8584
[tool.hatch.metadata]

‎requirements-dev.lock‎

Lines changed: 189 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,189 @@
1+
# generated by rye
2+
# use `rye lock` or `rye sync` to update this lockfile
3+
#
4+
# last locked with the following flags:
5+
# pre: false
6+
# features: []
7+
# all-features: false
8+
# with-sources: false
9+
# generate-hashes: false
10+
# universal: false
11+
12+
-e file:.
13+
aiohappyeyeballs==2.6.1
14+
# via aiohttp
15+
aiohttp==3.12.15
16+
# via aiohttp-jinja2
17+
# via textual-dev
18+
# via textual-serve
19+
aiohttp-jinja2==1.6
20+
# via textual-serve
21+
aiosignal==1.4.0
22+
# via aiohttp
23+
anyio==4.9.0
24+
# via httpx
25+
attrs==25.3.0
26+
# via aiohttp
27+
babel==2.17.0
28+
# via mkdocs-material
29+
backrefs==5.9
30+
# via mkdocs-material
31+
certifi==2025.8.3
32+
# via httpcore
33+
# via httpx
34+
# via requests
35+
cfgv==3.4.0
36+
# via pre-commit
37+
charset-normalizer==3.4.2
38+
# via requests
39+
click==8.2.1
40+
# via mkdocs
41+
# via textual-dev
42+
codespell==2.4.1
43+
colorama==0.4.6
44+
# via mkdocs-material
45+
distlib==0.4.0
46+
# via virtualenv
47+
filelock==3.18.0
48+
# via virtualenv
49+
frozenlist==1.7.0
50+
# via aiohttp
51+
# via aiosignal
52+
ghp-import==2.1.0
53+
# via mkdocs
54+
h11==0.16.0
55+
# via httpcore
56+
httpcore==1.0.9
57+
# via httpx
58+
httpx==0.28.1
59+
# via hike
60+
identify==2.6.12
61+
# via pre-commit
62+
idna==3.10
63+
# via anyio
64+
# via httpx
65+
# via requests
66+
# via yarl
67+
iniconfig==2.1.0
68+
# via pytest
69+
jinja2==3.1.6
70+
# via aiohttp-jinja2
71+
# via mkdocs
72+
# via mkdocs-material
73+
# via textual-serve
74+
linkify-it-py==2.0.3
75+
# via markdown-it-py
76+
markdown==3.8.2
77+
# via mkdocs
78+
# via mkdocs-material
79+
# via pymdown-extensions
80+
markdown-exec==1.11.0
81+
markdown-it-py==3.0.0
82+
# via mdit-py-plugins
83+
# via rich
84+
# via textual
85+
markupsafe==3.0.2
86+
# via jinja2
87+
# via mkdocs
88+
mdit-py-plugins==0.4.2
89+
# via markdown-it-py
90+
mdurl==0.1.2
91+
# via markdown-it-py
92+
mergedeep==1.3.4
93+
# via mkdocs
94+
# via mkdocs-get-deps
95+
mkdocs==1.6.1
96+
# via mkdocs-material
97+
mkdocs-get-deps==0.2.0
98+
# via mkdocs
99+
mkdocs-material==9.6.16
100+
mkdocs-material-extensions==1.3.1
101+
# via mkdocs-material
102+
msgpack==1.1.1
103+
# via textual-dev
104+
multidict==6.6.3
105+
# via aiohttp
106+
# via yarl
107+
mypy==1.17.1
108+
mypy-extensions==1.1.0
109+
# via mypy
110+
nodeenv==1.9.1
111+
# via pre-commit
112+
packaging==25.0
113+
# via mkdocs
114+
# via pytest
115+
paginate==0.5.7
116+
# via mkdocs-material
117+
pathspec==0.12.1
118+
# via mkdocs
119+
# via mypy
120+
platformdirs==4.3.8
121+
# via mkdocs-get-deps
122+
# via textual
123+
# via virtualenv
124+
pluggy==1.6.0
125+
# via pytest
126+
pre-commit==4.2.0
127+
propcache==0.3.2
128+
# via aiohttp
129+
# via yarl
130+
pygments==2.19.2
131+
# via mkdocs-material
132+
# via pytest
133+
# via rich
134+
# via textual
135+
pymdown-extensions==10.16.1
136+
# via markdown-exec
137+
# via mkdocs-material
138+
pyperclip==1.9.0
139+
# via hike
140+
pytest==8.4.1
141+
python-dateutil==2.9.0.post0
142+
# via ghp-import
143+
pyyaml==6.0.2
144+
# via mkdocs
145+
# via mkdocs-get-deps
146+
# via pre-commit
147+
# via pymdown-extensions
148+
# via pyyaml-env-tag
149+
pyyaml-env-tag==1.1
150+
# via mkdocs
151+
requests==2.32.4
152+
# via mkdocs-material
153+
rich==14.1.0
154+
# via textual
155+
# via textual-serve
156+
six==1.17.0
157+
# via python-dateutil
158+
sniffio==1.3.1
159+
# via anyio
160+
textual==5.3.0
161+
# via hike
162+
# via textual-dev
163+
# via textual-enhanced
164+
# via textual-fspicker
165+
# via textual-serve
166+
textual-dev==1.7.0
167+
textual-enhanced==0.13.0
168+
# via hike
169+
textual-fspicker==0.4.1
170+
# via hike
171+
textual-serve==1.1.2
172+
# via textual-dev
173+
typing-extensions==4.14.1
174+
# via hike
175+
# via mypy
176+
# via textual
177+
# via textual-dev
178+
uc-micro-py==1.0.3
179+
# via linkify-it-py
180+
urllib3==2.5.0
181+
# via requests
182+
virtualenv==20.33.0
183+
# via pre-commit
184+
watchdog==6.0.0
185+
# via mkdocs
186+
xdg-base-dirs==6.0.2
187+
# via hike
188+
yarl==1.20.1
189+
# via aiohttp

‎requirements.lock‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# generated by rye
2+
# use `rye lock` or `rye sync` to update this lockfile
3+
#
4+
# last locked with the following flags:
5+
# pre: false
6+
# features: []
7+
# all-features: false
8+
# with-sources: false
9+
# generate-hashes: false
10+
# universal: false
11+
12+
-e file:.
13+
anyio==4.9.0
14+
# via httpx
15+
certifi==2025.8.3
16+
# via httpcore
17+
# via httpx
18+
h11==0.16.0
19+
# via httpcore
20+
httpcore==1.0.9
21+
# via httpx
22+
httpx==0.28.1
23+
# via hike
24+
idna==3.10
25+
# via anyio
26+
# via httpx
27+
linkify-it-py==2.0.3
28+
# via markdown-it-py
29+
markdown-it-py==3.0.0
30+
# via mdit-py-plugins
31+
# via rich
32+
# via textual
33+
mdit-py-plugins==0.4.2
34+
# via markdown-it-py
35+
mdurl==0.1.2
36+
# via markdown-it-py
37+
platformdirs==4.3.8
38+
# via textual
39+
pygments==2.19.2
40+
# via rich
41+
# via textual
42+
pyperclip==1.9.0
43+
# via hike
44+
rich==14.1.0
45+
# via textual
46+
sniffio==1.3.1
47+
# via anyio
48+
textual==5.3.0
49+
# via hike
50+
# via textual-enhanced
51+
# via textual-fspicker
52+
textual-enhanced==0.13.0
53+
# via hike
54+
textual-fspicker==0.4.1
55+
# via hike
56+
typing-extensions==4.14.1
57+
# via hike
58+
# via textual
59+
uc-micro-py==1.0.3
60+
# via linkify-it-py
61+
xdg-base-dirs==6.0.2
62+
# via hike

0 commit comments

Comments
 (0)