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
19 changes: 9 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ name: CI
on:
push:
branches:
- main
pull_request: {}
- master
pull_request:
branches:
- '*'

jobs:
tests:
Expand All @@ -23,20 +25,17 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Install poetry
run: pipx install poetry

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
- name: Install the latest version of uv
uses: astral-sh/setup-uv@v6
with:
enable-cache: true
python-version: ${{ matrix.python-version }}
cache: poetry

- name: Install dependencies
run: poetry install
run: uv sync --all-extras

- name: Lint with pysen
run: make lint

- name: Test with pytest
run: make test
run: make test
10 changes: 6 additions & 4 deletions .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: deploy
name: publish

on:
release:
Expand All @@ -11,7 +11,9 @@ jobs:
if: github.event_name == 'release'
steps:
- uses: actions/checkout@v4

- name: Install the latest version of uv
uses: astral-sh/setup-uv@v6

- name: Build and publish to pypi
uses: JRubics/poetry-publish@v2.1
with:
pypi_token: ${{ secrets.PYPI_TOKEN }}
run: uv build && uv publish --token ${{ secrets.PYPI_TOKEN }}
13 changes: 8 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
PWD := $(shell pwd)
PYTHON := poetry run python
PYTEST := poetry run pytest
PYSEN := poetry run pysen
PYTHON := uv run python
PYTEST := uv run pytest
PYRIGHT := uv run pyright
RUFF := uv run ruff
MODULE := collatable

.PHONY: all
Expand All @@ -13,11 +14,13 @@ test:

.PHONY: lint
lint:
PYTHONPATH=$(PWD) $(PYSEN) run lint
PYTHONPATH=$(PWD) $(RUFF) check
PYTHONPATH=$(PWD) $(PYRIGHT)

.PHONY: format
format:
PYTHONPATH=$(PWD) $(PYSEN) run format
PYTHONPATH=$(PWD) $(RUFF) check --select I --fix
PYTHONPATH=$(PWD) $(RUFF) format

.PHONY: clean
clean: clean-pyc clean-build
Expand Down
10 changes: 0 additions & 10 deletions collatable/extras/__init__.py

This file was deleted.

13 changes: 0 additions & 13 deletions collatable/fields/__init__.py

This file was deleted.

49 changes: 0 additions & 49 deletions collatable/fields/mapping_field.py

This file was deleted.

Loading