Commit 40495d69 authored by Zebedee Nicholls's avatar Zebedee Nicholls
Browse files

Merge branch 'tweaks' into 'main' 

Tweaks

See merge request !16
parents 27691bef b089efcb

.gitlab-ci.yml

+15 −14
Changes for .gitlab-ci.yml: 15 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -25,11 +25,11 @@ cache: 
before_script:

  - python -V

  # Install uv

  - pip install uv

  - pip install 'uv==0.11.16'

  - uv --version

  # Install pixi for generated-project tests.

  - curl -fsSL https://pixi.sh/install.sh | bash

  - source ~/.bashrc

  - uv --version



test:linting:

  stage: test
@@ -41,18 +41,19 @@ test:linting: 
      - .cache/uv

      - ${PRE_COMMIT_HOME}

  script:

    - uv sync --all-groups

    # Needed for copier to be able to do its thing

    - git config --global user.email "copier.placeholder@gitlab.com" && git config --global user.name "copier-placeholder"

    - uv run pre-commit run --all-files

    - uv sync --group dev

    - uv run --group dev pre-commit run --all-files



test:ctt:

  stage: test

  script:

    - uv sync --group dev

    - uv run ctt

    - uv run --group dev ctt

    - git add .

    - git diff --exit-code --staged

    # Just in case, undo the staged changes

    - git restore --staged . && git restore .





test:docs:

  stage: test
@@ -63,8 +64,8 @@ test:docs: 
test:tests:

  stage: test

  script:

    - uv sync --group tests

    - uv run pytest -r a -v

    - uv sync --group tests --all-extras

    - uv run --group tests pytest -r a -v



# This job must be run manually

# Defaults to a patch release,
@@ -103,17 +104,17 @@ bump:version: 
    - NEW_VERSION=`uv version --bump $BUMP_RULE --short --no-sync`

    - echo "Bumping version $BASE_VERSION > $NEW_VERSION"

    - uv sync --group dev

    - uv run pre-commit install

    - uv run towncrier build --yes --version v$NEW_VERSION

    - 'git commit -a --no-verify -m "bump: version $BASE_VERSION > $NEW_VERSION"'

    - uv run --group dev towncrier build --yes --version v$NEW_VERSION

    # Commit and tag (no verify to avoid pre-commit)

    - 'git commit --no-verify -a -m "bump: version $BASE_VERSION > $NEW_VERSION"'

    - git tag v$NEW_VERSION

    # Bump to post

    # (so that future commits do not have the same version as the tagged commit)

    - BASE_VERSION=`uv version --short`

    - NEW_VERSION=`uv version --bump post --short --no-sync`

    - echo "Bumping version $BASE_VERSION > $NEW_VERSION"

    # Need no verify in this repo to avoid re-running ctt which causes headaches

    - 'git commit -a --no-verify -m "bump(pre-release): version $BASE_VERSION > $NEW_VERSION"'

    # Commit (no verify to avoid pre-commit)

    - 'git commit --no-verify -a -m "bump(pre-release): version $BASE_VERSION > $NEW_VERSION"'

    # Push commits and tags

    - git fetch origin

    - git push origin $CI_COMMIT_REF_NAME

.pre-commit-config.yaml

+1 −1
Changes for .pre-commit-config.yaml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# See https://pre-commit.com/hooks.html for more hooks

repos:

  - repo: https://github.com/pre-commit/pre-commit-hooks

    rev: "v4.4.0"

    rev: "v6.0.0"

    hooks:

      - id: check-added-large-files

      - id: check-ast

.readthedocs.yaml

+0 −1
Changes for .readthedocs.yaml: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ build: 
    install:

      # For simplicity, use requirements files and pip directly.

      - python -m pip install -r requirements-docs-locked.txt

      - python -m pip install --no-deps .

      - python -m pip list

    build:

      html:

Makefile

+2 −2
Changes for Makefile: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ ctt: ## run ctt (copier-template-tester) to generate output from running this t 


.PHONY: test

test:  ## run the tests

	uv run --group tests pytest src tests -r a -v --doctest-modules --cov=src

	uv run --group tests pytest tests --ignore=tests/regression/ctt -r a -v



.PHONY: docs

docs:  ## build the docs
@@ -58,5 +58,5 @@ licence-check: ## Check that licences of the dependencies are suitable 


.PHONY: virtual-environment

virtual-environment:  ## update virtual environment, create a new one if it doesn't already exist

	uv sync --all-groups

	uv sync --group all-dev --all-extras

	uv run --group dev pre-commit install

changelog/16.breaking.md

0 → 100644
+1 −0
Changes for changelog/16.breaking.md: 1 added line, 0 removed lines.
Original line number Diff line number Diff line 
Upgraded the minimum supported Python version to 3.10