Skip to content

Commit

Permalink
Merge branch 'master' into tkp/extras
Browse files Browse the repository at this point in the history
  • Loading branch information
timkpaine authored Dec 31, 2024
2 parents 5219e46 + 64031c1 commit 26619ec
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-distributions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ jobs:
- target: aarch64-apple-darwin
os: macos-14
- target: x86_64-apple-darwin
os: macos-12
os: macos-13

steps:
- name: Checkout code
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-hatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
path: dist

- name: Push Python artifacts to PyPI
uses: pypa/gh-action-pypi-publish@v1.11.0
uses: pypa/gh-action-pypi-publish@v1.12.3
with:
skip-existing: true

Expand Down Expand Up @@ -128,10 +128,10 @@ jobs:
os: windows-2022
# macOS
- target: aarch64-apple-darwin
os: macos-12
os: macos-13
use-dist: true
- target: x86_64-apple-darwin
os: macos-12
os: macos-13
use-dist: true

env:
Expand Down Expand Up @@ -357,7 +357,7 @@ jobs:
needs:
- binaries
- python-artifacts
runs-on: macos-12
runs-on: macos-13

env:
VERSION: ${{ needs.python-artifacts.outputs.version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-hatchling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,6 @@ jobs:
path: dist

- name: Push build artifacts to PyPI
uses: pypa/gh-action-pypi-publish@v1.11.0
uses: pypa/gh-action-pypi-publish@v1.12.3
with:
skip-existing: true
3 changes: 1 addition & 2 deletions hatch.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ dependencies = [
# Necessary for syntax highlighting in code blocks
"pygments~=2.18.0",
# Validation
# https://github.com/linkchecker/linkchecker/pull/669#issuecomment-1267236287
"linkchecker @ git+https://github.com/linkchecker/linkchecker.git@d9265bb71c2054bf57b8c5734a4825d62505c779",
"linkchecker~=10.5.0",
"griffe<1.0",
]
pre-install-commands = [
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ dependencies = [
"tomlkit>=0.11.1",
"userpath~=1.7",
"uv>=0.1.35",
"virtualenv>=20.26.1",
"virtualenv>=20.26.6",
"zstandard<1",
]
dynamic = ["version"]
Expand Down

0 comments on commit 26619ec

Please sign in to comment.