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: 8 additions & 11 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,21 @@ jobs:
fail-fast: false
matrix:
python-version: ["3.10", "3.11", "3.12"]
poetry-version: ["2.1.3"]

steps:
- uses: actions/checkout@v6
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
- name: install poetry
uses: abatilo/actions-poetry@0dd19c9498c3dc8728967849d0d2eae428a8a3d8 # v4
with:
poetry-version: ${{ matrix.poetry-version }}
- name: install dependencies
- name: Install uv
uses: astral-sh/setup-uv@v4
- name: Install dependencies
run: |
poetry install
- name: lint
uv sync
- name: Lint
run: |
poetry run pre-commit run --all
- name: test
uv run pre-commit run --all
- name: Test
run: |
poetry run pytest tests
uv run pytest tests
3 changes: 1 addition & 2 deletions .github/workflows/nix-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ permissions:
jobs:
check:
name: "Nix Checks"
if: false # skip for now
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
Expand All @@ -24,7 +23,7 @@ jobs:
# Catch most downloads and dependency issues in a separate step to make the
# nix checks logs cleaner.
- name: Populate nix cache
run: nix build -L .#poetryEnv
run: nix build -L .#venv

# Run the tests
- name: Run nix checks
Expand Down
16 changes: 7 additions & 9 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,8 @@ jobs:
with:
python-version: "3.10"

- name: Install Poetry
uses: abatilo/actions-poetry@v4
with:
poetry-version: 2.1.3
- name: Install uv
uses: astral-sh/setup-uv@v4

- name: Bump version from tag
run: |
Expand All @@ -44,17 +42,17 @@ jobs:
exit 1
fi
echo "VERSION=$VERSION" >> "$GITHUB_ENV"
poetry run python scripts/bump_version.py "$VERSION"
uv run python scripts/bump_version.py "$VERSION"

- name: Test
run: |
poetry install
poetry run pytest tests
uv sync
uv run pytest tests

- name: Build the package
run: |
rm -rf dist
poetry build
uv build

- name: Commit version bump
env:
Expand All @@ -67,7 +65,7 @@ jobs:
git remote set-url origin https://x-access-token:${GH_TOKEN}@github.com/${{ github.repository }}.git

# Add changed files
git add pyproject.toml poetry.lock novem/version.py
git add pyproject.toml uv.lock novem/version.py

# Only commit if there are changes
if ! git diff --cached --quiet; then
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -159,3 +159,7 @@ cython_debug/
CLAUDE.md

**/.claude/settings.local.json

# Direnv
.envrc
.direnv
7 changes: 3 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,15 @@ development. To get started simply clone the repository and run the below
commands.

```bash
poetry install
poetry shell
pre-commit run --all-files
uv sync
uv run pre-commit run --all-files
```

## Before commiting
Please make sure that all files confirm to the style guidelines

```bash
pre-commit run --all-files
uv run pre-commit run --all-files
```

## Pull requests
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
.PHONY: test bump-version pre-commit

test:
@poetry run pytest
@uv run pytest

bump-version:
@poetry run python scripts/bump_version.py
@uv run python scripts/bump_version.py

pre-commit:
@poetry run pre-commit run --all
@uv run pre-commit run --all
134 changes: 46 additions & 88 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading