diff --git a/.copier-answers.yml b/.copier-answers.yml index b87b3bdc..b2f94c7f 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: 5.4.0 +_commit: 5.5.0 _src_path: gh:DiamondLightSource/python-copier-template author_email: oliver.copping@diamond.ac.uk author_name: Oliver Copping diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 0f5ff009..ca9999c1 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -24,4 +24,4 @@ It is recommended that developers use a [vscode devcontainer](https://code.visua This project was created using the [Diamond Light Source Copier Template](https://github.com/DiamondLightSource/python-copier-template) for Python projects. -For more information on common tasks like setting up a developer environment, running the tests, and setting a pre-commit hook, see the template's [How-to guides](https://diamondlightsource.github.io/python-copier-template/5.4.0/how-to.html). +For more information on common tasks like setting up a developer environment, running the tests, and setting a pre-commit hook, see the template's [How-to guides](https://diamondlightsource.github.io/python-copier-template/5.5.0/how-to.html). diff --git a/.github/workflows/_dist.yml b/.github/workflows/_dist.yml index 955b4aec..bf4b1a9b 100644 --- a/.github/workflows/_dist.yml +++ b/.github/workflows/_dist.yml @@ -22,7 +22,7 @@ jobs: uvx --from build pyproject-build - name: Install uv - uses: astral-sh/setup-uv@v10.0.0 + uses: astral-sh/setup-uv@v10.3.2 - name: Build sdist and wheel run: > diff --git a/.github/workflows/_release.yml b/.github/workflows/_release.yml index 4713aeee..e697477a 100644 --- a/.github/workflows/_release.yml +++ b/.github/workflows/_release.yml @@ -36,7 +36,7 @@ jobs: - name: Create GitHub Release # We pin to the SHA, not the tag, for security reasons. # https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions - uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2 + uses: softprops/action-gh-release@efb35369e0ad2afab669f228072c1b0d510eae64 # v3.0.3 with: prerelease: ${{ contains(github.ref_name, 'a') || contains(github.ref_name, 'b') || contains(github.ref_name, 'rc') }} files: | diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml index d58c2e9c..b5600be9 100644 --- a/.github/workflows/_test.yml +++ b/.github/workflows/_test.yml @@ -28,7 +28,7 @@ jobs: submodules: recursive - name: Install uv - uses: astral-sh/setup-uv@v10.0.0 + uses: astral-sh/setup-uv@v10.3.2 - name: Run tests run: uv run --locked tox -e tests diff --git a/.github/workflows/_tox.yml b/.github/workflows/_tox.yml index e7abe84c..c259f52a 100644 --- a/.github/workflows/_tox.yml +++ b/.github/workflows/_tox.yml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v7 - name: Install uv - uses: astral-sh/setup-uv@v10.0.0 + uses: astral-sh/setup-uv@v10.3.2 - name: Run tox run: uv run --locked tox -e ${{ inputs.tox }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e2ffe345..ad1b7c6a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,6 +7,7 @@ on: tags: - "*" pull_request: + merge_group: jobs: lint: diff --git a/pyproject.toml b/pyproject.toml index 02966241..b2c52556 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -52,9 +52,12 @@ dev = [ "tox-uv", "types-lxml", "types-mock", - "uv>=0.13.5,<0.14.0", ] +[tool.uv] +# Minimum uv to fix eMudhra CA cert incident (see discuss.python.org/t/109576) +required-version = ">=0.13.5" + [tool.setuptools_scm] version_file = "src/techui_builder/_version.py" diff --git a/uv.lock b/uv.lock index 69660c79..9871d950 100644 --- a/uv.lock +++ b/uv.lock @@ -1170,7 +1170,6 @@ dev = [ { name = "tox-uv" }, { name = "types-lxml" }, { name = "types-mock" }, - { name = "uv" }, ] [package.metadata] @@ -1203,7 +1202,6 @@ dev = [ { name = "tox-uv" }, { name = "types-lxml" }, { name = "types-mock" }, - { name = "uv", specifier = ">=0.13.5,<0.14.0" }, ] [[package]]