Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/style-and-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@ 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 }}
allow-prereleases: true

- name: Install Rye
uses: eifinger/setup-rye@v4
- name: Install uv
uses: astral-sh/setup-uv@v6
with:
version: "latest"

Expand Down
2 changes: 2 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
**Released: WiP**

- Added `--theme` as a command line switch.
- Migrated from `rye` to `uv` for development management.
([#47](https://github.com/davep/aging/pull/47))

## v1.0.0

Expand Down
33 changes: 18 additions & 15 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
app := aging
src := src/
run := rye run
test := rye test
python := $(run) python
lint := rye lint -- --select I
fmt := rye fmt
mypy := $(run) mypy
spell := $(run) codespell
app := aging
src := src/
run := uv run
sync := uv sync
build := uv build
publish := uv publish --username=__token__ --keyring-provider=subprocess
python := $(run) python
ruff := $(run) ruff
lint := $(ruff) check --select I
fmt := $(ruff) format
mypy := $(run) mypy
spell := $(run) codespell

##############################################################################
# Local "interactive testing" of the code.
Expand All @@ -30,12 +33,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) --upgrade

.PHONY: resetup
resetup: realclean # Recreate the virtual environment from scratch
Expand Down Expand Up @@ -70,19 +73,19 @@ checkall: spellcheck codestyle lint stricttypecheck # Check all the things
# Package/publish.
.PHONY: package
package: # Package the library
rye build
$(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
$(publish)

##############################################################################
# Utility.
Expand Down
15 changes: 4 additions & 11 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,26 +69,19 @@ Discussions = "https://github.com/davep/aging/discussions"
aging = "aging.__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 = [
"textual-dev>=1.7.0",
"pre-commit>=4.1.0",
"mypy>=1.15.0",
"codespell>=2.4.1",
"ruff>=0.12.9",
]

[tool.hatch.metadata]
allow-direct-references = true

[tool.hatch.build.targets.wheel]
packages = ["src/aging"]

[tool.pyright]
venvPath="."
venv=".venv"
Expand Down
114 changes: 0 additions & 114 deletions requirements-dev.lock

This file was deleted.

50 changes: 0 additions & 50 deletions requirements.lock

This file was deleted.

Loading