Skip to content

Commit 11e15e9

Browse files
committed
1 parent 03adf56 commit 11e15e9

File tree

9 files changed

+1501
-1683
lines changed

9 files changed

+1501
-1683
lines changed

.github/workflows/docs.yml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,16 @@ jobs:
3434
if: steps.changes.outputs.docs == 'true' || steps.changes.outputs.root_docs == 'true' || steps.changes.outputs.python_files == 'true'
3535
run: echo "PUBLISH=$(echo true)" >> $GITHUB_ENV
3636

37-
- name: Install poetry
38-
if: env.PUBLISH == 'true'
39-
run: pipx install "poetry==1.8.4"
37+
- name: Install uv
38+
uses: astral-sh/setup-uv@v3
39+
with:
40+
enable-cache: true
4041

4142
- name: Set up Python ${{ matrix.python-version }}
42-
if: env.PUBLISH == 'true'
43-
uses: actions/setup-python@v5
44-
with:
45-
python-version: ${{ matrix.python-version }}
46-
cache: 'poetry'
43+
run: uv python install ${{ matrix.python-version }}
4744

48-
- name: Install dependencies [w/ docs]
49-
if: env.PUBLISH == 'true'
50-
run: poetry install --with=docs,lint
45+
- name: Install dependencies
46+
run: uv sync --all-extras --dev
5147

5248
- name: Print python versions
5349
if: env.PUBLISH == 'true'

.github/workflows/tests.yml

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,33 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v4
1515

16-
- name: Install poetry
17-
run: pipx install "poetry==1.8.4"
16+
- name: Install uv
17+
uses: astral-sh/setup-uv@v3
18+
with:
19+
enable-cache: true
1820

1921
- name: Set up Python ${{ matrix.python-version }}
20-
uses: actions/setup-python@v5
21-
with:
22-
python-version: ${{ matrix.python-version }}
23-
cache: 'poetry'
22+
run: uv python install ${{ matrix.python-version }}
2423

2524
- name: Install dependencies
26-
run: poetry install --with=docs,test,coverage,lint
25+
run: uv sync --all-extras --dev
2726

2827
- name: Print python versions
2928
run: |
3029
python -V
31-
poetry run python -V
30+
uv run python -V
3231
3332
- name: Lint with ruff check
34-
run: poetry run ruff check .
33+
run: uv run ruff check .
3534

3635
- name: Format with ruff format
37-
run: poetry run ruff format . --check
36+
run: uv run ruff format . --check
3837

3938
- name: Lint with mypy
40-
run: poetry run mypy .
39+
run: uv run mypy .
4140

4241
- name: Test with pytest
43-
run: poetry run py.test --cov=./ --cov-append --cov-report=xml
42+
run: uv run py.test --cov=./ --cov-append --cov-report=xml
4443
env:
4544
COV_CORE_SOURCE: .
4645
COV_CORE_CONFIG: pyproject.toml
@@ -62,18 +61,20 @@ jobs:
6261
steps:
6362
- uses: actions/checkout@v4
6463

65-
- name: Install poetry
66-
run: pipx install "poetry==1.8.4"
64+
- name: Install uv
65+
uses: astral-sh/setup-uv@v3
66+
with:
67+
enable-cache: true
6768

6869
- name: Set up Python ${{ matrix.python-version }}
69-
uses: actions/setup-python@v5
70-
with:
71-
python-version: ${{ matrix.python-version }}
72-
cache: 'poetry'
70+
run: uv python install ${{ matrix.python-version }}
71+
72+
- name: Install dependencies
73+
run: uv sync --all-extras --dev
7374

7475
- name: Build package
7576
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
76-
run: poetry build
77+
run: uv build
7778

7879
- name: Publish package
7980
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')

.tmuxp.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
session_name: vcspull
22
start_directory: ./ # load session relative to config location (project root).
3+
shell_command_before:
4+
- uv virtualenv shell --quiet > /dev/null 2>&1 && clear
35
windows:
46
- window_name: vcspull
57
focus: True

CHANGES

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,16 @@ $ pipx install --suffix=@next 'vcspull' --pip-args '\--pre' --force
2121

2222
<!-- Maintainers, insert changes / features for the next release here -->
2323

24+
_Maintenance only, no bug fixes, or new features_
25+
26+
### Development
27+
28+
#### Project and package management: poetry to uv (#479)
29+
30+
[uv] is the new package and project manager for the project, replacing Poetry.
31+
32+
[uv]: https://github.com/astral-sh/uv
33+
2434
#### libvcs 0.33.0 -> 0.34.0 (#456)
2535

2636
First libvcs release built with `uv` package and project manager. No changes to libvcs API itself.

Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ entr_warn:
1212
@echo "----------------------------------------------------------"
1313

1414
test:
15-
poetry run py.test $(test)
15+
uv run py.test $(test)
1616

1717
start:
18-
$(MAKE) test; poetry run ptw .
18+
$(MAKE) test; uv run ptw .
1919

2020
watch_test:
2121
if command -v entr > /dev/null; then ${PY_FILES} | entr -c $(MAKE) test; else $(MAKE) test entr_warn; fi
@@ -30,16 +30,16 @@ design_docs:
3030
$(MAKE) -C docs design
3131

3232
ruff_format:
33-
poetry run ruff format .
33+
uv run ruff format .
3434

3535
ruff:
36-
poetry run ruff check .
36+
uv run ruff check .
3737

3838
watch_ruff:
3939
if command -v entr > /dev/null; then ${PY_FILES} | entr -c $(MAKE) ruff; else $(MAKE) ruff entr_warn; fi
4040

4141
mypy:
42-
poetry run mypy `${PY_FILES}`
42+
uv run mypy `${PY_FILES}`
4343

4444
watch_mypy:
4545
if command -v entr > /dev/null; then ${PY_FILES} | entr -c $(MAKE) mypy; else $(MAKE) mypy entr_warn; fi
@@ -48,7 +48,7 @@ format_markdown:
4848
prettier --parser=markdown -w *.md docs/*.md docs/**/*.md CHANGES
4949

5050
monkeytype_create:
51-
poetry run monkeytype run `poetry run which py.test`
51+
uv run monkeytype run `uv run which py.test`
5252

5353
monkeytype_apply:
54-
poetry run monkeytype list-modules | xargs -n1 -I{} sh -c 'poetry run monkeytype apply {}'
54+
uv run monkeytype list-modules | xargs -n1 -I{} sh -c 'uv run monkeytype apply {}'

0 commit comments

Comments
 (0)