Skip to content

Commit d15969d

Browse files
authored
ci: update Hatch; do not pin virtualenv (#10749)
1 parent b95f643 commit d15969d

6 files changed

Lines changed: 18 additions & 30 deletions

File tree

.github/workflows/docusaurus_sync.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
- ".github/workflows/docusaurus_sync.yml"
1212

1313
env:
14-
HATCH_VERSION: "1.16.4"
14+
HATCH_VERSION: "1.16.5"
1515
PYTHON_VERSION: "3.11"
1616

1717
jobs:
@@ -30,8 +30,7 @@ jobs:
3030
python-version: "${{ env.PYTHON_VERSION }}"
3131

3232
- name: Install Hatch
33-
# https://github.com/pypa/hatch/issues/2193
34-
run: pip install hatch==${{ env.HATCH_VERSION }} "virtualenv<21.0.0"
33+
run: pip install hatch==${{ env.HATCH_VERSION }}
3534

3635
- name: Generate API reference for Docusaurus
3736
run: hatch run docs

.github/workflows/e2e.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
env:
1818
PYTHON_VERSION: "3.10"
1919
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
20-
HATCH_VERSION: "1.16.4"
20+
HATCH_VERSION: "1.16.5"
2121
# we use HF_TOKEN instead of HF_API_TOKEN to work around a Hugging Face bug
2222
# see https://github.com/deepset-ai/haystack/issues/9552
2323
HF_TOKEN: ${{ secrets.HUGGINGFACE_API_KEY }}
@@ -34,8 +34,7 @@ jobs:
3434
python-version: "${{ env.PYTHON_VERSION }}"
3535

3636
- name: Install Hatch
37-
# https://github.com/pypa/hatch/issues/2193
38-
run: pip install hatch==${{ env.HATCH_VERSION }} "virtualenv<21.0.0"
37+
run: pip install hatch==${{ env.HATCH_VERSION }}
3938

4039
- name: Run tests
4140
run: hatch run e2e:test

.github/workflows/nightly_testpypi_release.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
workflow_dispatch:
88

99
env:
10-
HATCH_VERSION: "1.16.4"
10+
HATCH_VERSION: "1.16.5"
1111

1212
jobs:
1313
nightly-release:
@@ -33,8 +33,7 @@ jobs:
3333
echo "Building haystack-ai version: ${NIGHTLY_VERSION}"
3434
3535
- name: Install Hatch
36-
# https://github.com/pypa/hatch/issues/2193
37-
run: pip install hatch==${{ env.HATCH_VERSION }} "virtualenv<21.0.0"
36+
run: pip install hatch==${{ env.HATCH_VERSION }}
3837

3938
- name: Build Haystack
4039
run: hatch build

.github/workflows/pypi_release.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- "!v[0-9]+.[0-9]+.[0-9]-rc0"
99

1010
env:
11-
HATCH_VERSION: "1.16.4"
11+
HATCH_VERSION: "1.16.5"
1212

1313
jobs:
1414
release-on-pypi:
@@ -19,8 +19,7 @@ jobs:
1919
uses: actions/checkout@v6
2020

2121
- name: Install Hatch
22-
# https://github.com/pypa/hatch/issues/2193
23-
run: pip install hatch==${{ env.HATCH_VERSION }} "virtualenv<21.0.0"
22+
run: pip install hatch==${{ env.HATCH_VERSION }}
2423

2524
- name: Build Haystack
2625
run: hatch build

.github/workflows/slow.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1515
HF_API_TOKEN: ${{ secrets.HUGGINGFACE_API_KEY }}
1616
PYTHON_VERSION: "3.10"
17-
HATCH_VERSION: "1.16.4"
17+
HATCH_VERSION: "1.16.5"
1818
HAYSTACK_MPS_ENABLED: false
1919
HAYSTACK_XPU_ENABLED: false
2020

@@ -139,8 +139,7 @@ jobs:
139139
id: hatch
140140
shell: bash
141141
run: |
142-
# https://github.com/pypa/hatch/issues/2193
143-
pip install hatch==${{ env.HATCH_VERSION }} "virtualenv<21.0.0"
142+
pip install hatch==${{ env.HATCH_VERSION }}
144143
145144
- name: Run Tika
146145
if: matrix.os == 'ubuntu-latest'

.github/workflows/tests.yml

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ env:
3434
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3535
HF_API_TOKEN: ${{ secrets.HUGGINGFACE_API_KEY }}
3636
PYTHON_VERSION: "3.10"
37-
HATCH_VERSION: "1.16.4"
37+
HATCH_VERSION: "1.16.5"
3838

3939
jobs:
4040
format:
@@ -47,8 +47,7 @@ jobs:
4747
python-version: "${{ env.PYTHON_VERSION }}"
4848

4949
- name: Install Hatch
50-
# https://github.com/pypa/hatch/issues/2193
51-
run: pip install hatch==${{ env.HATCH_VERSION }} "virtualenv<21.0.0"
50+
run: pip install hatch==${{ env.HATCH_VERSION }}
5251

5352
- name: Ruff - check format and linting
5453
run: hatch run fmt-check
@@ -98,8 +97,7 @@ jobs:
9897
python-version: "${{ env.PYTHON_VERSION }}"
9998

10099
- name: Install Hatch
101-
# https://github.com/pypa/hatch/issues/2193
102-
run: pip install hatch==${{ env.HATCH_VERSION }} "virtualenv<21.0.0"
100+
run: pip install hatch==${{ env.HATCH_VERSION }}
103101

104102
- name: Check imports
105103
run: hatch run python .github/utils/check_imports.py
@@ -158,8 +156,7 @@ jobs:
158156
id: hatch
159157
shell: bash
160158
run: |
161-
# https://github.com/pypa/hatch/issues/2193
162-
pip install hatch==${{ env.HATCH_VERSION }} "virtualenv<21.0.0"
159+
pip install hatch==${{ env.HATCH_VERSION }}
163160
echo "env=$(hatch env find test)" >> "$GITHUB_OUTPUT"
164161
165162
- name: Run
@@ -243,8 +240,7 @@ jobs:
243240
id: hatch
244241
if: steps.files.outputs.any_changed == 'true'
245242
run: |
246-
# https://github.com/pypa/hatch/issues/2193
247-
pip install hatch==${{ env.HATCH_VERSION }} "virtualenv<21.0.0"
243+
pip install hatch==${{ env.HATCH_VERSION }}
248244
echo "env=$(hatch env find test)" >> "$GITHUB_OUTPUT"
249245
250246
- name: Mypy
@@ -300,8 +296,7 @@ jobs:
300296
id: hatch
301297
shell: bash
302298
run: |
303-
# https://github.com/pypa/hatch/issues/2193
304-
pip install hatch==${{ env.HATCH_VERSION }} "virtualenv<21.0.0"
299+
pip install hatch==${{ env.HATCH_VERSION }}
305300
echo "env=$(hatch env find test)" >> "$GITHUB_OUTPUT"
306301
307302
@@ -358,8 +353,7 @@ jobs:
358353
id: hatch
359354
shell: bash
360355
run: |
361-
# https://github.com/pypa/hatch/issues/2193
362-
pip install hatch==${{ env.HATCH_VERSION }} "virtualenv<21.0.0"
356+
pip install hatch==${{ env.HATCH_VERSION }}
363357
echo "env=$(hatch env find test)" >> "$GITHUB_OUTPUT"
364358
365359
- uses: actions/cache/restore@v5
@@ -422,8 +416,7 @@ jobs:
422416
id: hatch
423417
shell: bash
424418
run: |
425-
# https://github.com/pypa/hatch/issues/2193
426-
pip install hatch==${{ env.HATCH_VERSION }} "virtualenv<21.0.0"
419+
pip install hatch==${{ env.HATCH_VERSION }}
427420
echo "env=$(hatch env find test)" >> "$GITHUB_OUTPUT"
428421
429422
- name: Run

0 commit comments

Comments
 (0)