Skip to content

Commit 2b8b095

Browse files
authored
Merge branch 'main' into perf-sharding-coord-cache
2 parents 6e02c8f + 8932bbe commit 2b8b095

5 files changed

Lines changed: 28 additions & 15 deletions

File tree

‎.github/workflows/gpu_test.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ on:
1212

1313
env:
1414
LD_LIBRARY_PATH: /usr/local/cuda/extras/CUPTI/lib64:/usr/local/cuda/lib64
15+
# Use the uv from astral-sh/setup-uv instead of hatch's bundled (pyapp) uv.
16+
HATCH_ENV_TYPE_VIRTUAL_UV_PATH: uv
1517

1618
permissions:
1719
contents: read
@@ -59,6 +61,8 @@ jobs:
5961
with:
6062
python-version: ${{ matrix.python-version }}
6163
cache: 'pip'
64+
- name: Install uv
65+
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
6266
- name: Install Hatch
6367
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc
6468
with:

‎.github/workflows/hypothesis.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ concurrency:
1818

1919
env:
2020
FORCE_COLOR: 3
21+
# Use the uv from astral-sh/setup-uv instead of hatch's bundled (pyapp) uv.
22+
HATCH_ENV_TYPE_VIRTUAL_UV_PATH: uv
2123

2224
jobs:
2325

@@ -54,6 +56,8 @@ jobs:
5456
with:
5557
python-version: ${{ matrix.python-version }}
5658
cache: 'pip'
59+
- name: Install uv
60+
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
5761
- name: Install Hatch
5862
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc
5963
with:

‎.github/workflows/test.yml‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ on:
1313
permissions:
1414
contents: read
1515

16+
env:
17+
# Use the uv from astral-sh/setup-uv; without an explicit path hatch
18+
# bootstraps its own (pyapp) uv, which fails on non-3.12 runners.
19+
HATCH_ENV_TYPE_VIRTUAL_UV_PATH: uv
20+
1621
concurrency:
1722
group: ${{ github.workflow }}-${{ github.ref }}
1823
cancel-in-progress: true
@@ -60,10 +65,10 @@ jobs:
6065
with:
6166
python-version: ${{ matrix.python-version }}
6267
cache: 'pip'
68+
- name: Install uv
69+
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
6370
- name: Install Hatch
64-
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc
65-
with:
66-
version: '1.16.5'
71+
run: python -m pip install hatch==1.16.5
6772
- name: Set Up Hatch Env
6873
env:
6974
HATCH_ENV: test.py${{ matrix.python-version }}-${{ matrix.dependency-set }}
@@ -109,10 +114,10 @@ jobs:
109114
with:
110115
python-version: ${{ matrix.python-version }}
111116
cache: 'pip'
117+
- name: Install uv
118+
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
112119
- name: Install Hatch
113-
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc
114-
with:
115-
version: '1.16.5'
120+
run: python -m pip install hatch==1.16.5
116121
- name: Set Up Hatch Env
117122
env:
118123
HATCH_ENV: ${{ matrix.dependency-set }}
@@ -144,10 +149,10 @@ jobs:
144149
with:
145150
python-version: '3.13'
146151
cache: 'pip'
152+
- name: Install uv
153+
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
147154
- name: Install Hatch
148-
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc
149-
with:
150-
version: '1.16.5'
155+
run: python -m pip install hatch==1.16.5
151156
- name: Set Up Hatch Env
152157
run: |
153158
hatch run doctest:pip list
@@ -168,10 +173,10 @@ jobs:
168173
with:
169174
python-version: '3.13'
170175
cache: 'pip'
176+
- name: Install uv
177+
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
171178
- name: Install Hatch
172-
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc
173-
with:
174-
version: '1.16.5'
179+
run: python -m pip install hatch==1.16.5
175180
- name: Run Benchmarks
176181
run: |
177182
hatch env run --env "test.py3.13-minimal" run-benchmark

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ default_language_version:
1515

1616
repos:
1717
- repo: https://github.com/astral-sh/ruff-pre-commit
18-
rev: v0.15.12
18+
rev: v0.15.15
1919
hooks:
2020
- id: ruff-check
2121
args: ["--fix", "--show-fixes"]
@@ -58,7 +58,7 @@ repos:
5858
types: [python]
5959
files: ^(src|tests)/
6060
- repo: https://github.com/zizmorcore/zizmor-pre-commit
61-
rev: v1.24.1
61+
rev: v1.25.2
6262
hooks:
6363
- id: zizmor
6464
- repo: https://github.com/twisted/towncrier

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ extra-dependencies = [
257257
'obstore==0.5.*',
258258
]
259259

260-
[tool.hatch.envs.defaults]
260+
[tool.hatch.envs.default]
261261
installer = "uv"
262262

263263
[tool.hatch.envs.docs]

0 commit comments

Comments
 (0)