Skip to content

Commit f23a469

Browse files
authored
Merge pull request #21002 from arash77/replace-pip-with-uv
Integrate 'uv' for enhanced package management
2 parents b744384 + f20306b commit f23a469

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+312
-280
lines changed

.github/workflows/api.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ jobs:
5454
- uses: actions/setup-python@v6
5555
with:
5656
python-version: ${{ matrix.python-version }}
57-
cache: 'pip'
58-
cache-dependency-path: 'galaxy root/requirements.txt'
57+
- name: Install uv
58+
uses: astral-sh/setup-uv@v7
5959
- name: Get full Python version
6060
id: full-python-version
6161
shell: bash

.github/workflows/bioblend.yaml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,22 +46,17 @@ jobs:
4646
repository: galaxyproject/bioblend
4747
path: bioblend
4848
persist-credentials: false
49-
- name: Cache pip dir
50-
uses: actions/cache@v4
51-
with:
52-
path: ~/.cache/pip
53-
key: pip-cache-${{ matrix.tox_env }}
5449
- name: Calculate Python version for BioBlend from tox_env
5550
id: get_bioblend_python_version
5651
run: echo "bioblend_python_version=$(echo "${{ matrix.tox_env }}" | sed -e 's/^py\([3-9]\)\([0-9]\+\)/\1.\2/')" >> $GITHUB_OUTPUT
5752
- name: Set up Python for BioBlend
5853
uses: actions/setup-python@v6
5954
with:
6055
python-version: ${{ steps.get_bioblend_python_version.outputs.bioblend_python_version }}
56+
- name: Install uv
57+
uses: astral-sh/setup-uv@v7
6158
- name: Install tox
62-
run: |
63-
python3 -m pip install --upgrade pip setuptools
64-
python3 -m pip install 'tox>=1.8.0'
59+
run: uv tool install tox --with tox-uv
6560
- name: Set up Python for Galaxy
6661
uses: actions/setup-python@v6
6762
with:

.github/workflows/check_test_class_names.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
- uses: actions/setup-python@v6
2323
with:
2424
python-version: ${{ matrix.python-version }}
25-
cache: 'pip'
26-
cache-dependency-path: 'requirements.txt'
25+
- name: Install uv
26+
uses: astral-sh/setup-uv@v7
2727
- name: Install Python dependencies
28-
run: pip install -r requirements.txt -r lib/galaxy/dependencies/pinned-test-requirements.txt
28+
run: uv pip install --system -r requirements.txt -r lib/galaxy/dependencies/pinned-test-requirements.txt
2929
- name: Run tests
3030
run: .ci/check_test_class_names.sh

.github/workflows/converter_tests.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ jobs:
4343
- uses: actions/setup-python@v6
4444
with:
4545
python-version: ${{ matrix.python-version }}
46-
cache: 'pip'
47-
cache-dependency-path: 'galaxy root/requirements.txt'
46+
- name: Install uv
47+
uses: astral-sh/setup-uv@v7
4848
- name: Move test data
4949
run: rsync -av --remove-source-files --exclude .git galaxy-test-data/ 'galaxy root/test-data/'
5050
- name: Install planemo
51-
run: pip install planemo
51+
run: uv tool install planemo
5252
- name: Determine converters to check
5353
run: |
5454
ls 'galaxy root'/lib/galaxy/datatypes/converters/*xml | grep -v -f 'galaxy root'/lib/galaxy/datatypes/converters/.tt_skip > tool_list.txt

.github/workflows/cwl_conformance.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ jobs:
4646
- uses: actions/setup-python@v6
4747
with:
4848
python-version: ${{ matrix.python-version }}
49-
cache: 'pip'
50-
cache-dependency-path: 'galaxy root/requirements.txt'
49+
- name: Install uv
50+
uses: astral-sh/setup-uv@v7
5151
- name: Get full Python version
5252
id: full-python-version
5353
shell: bash

.github/workflows/db_indexes.yaml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,14 @@ jobs:
4848
- uses: actions/setup-python@v6
4949
with:
5050
python-version: ${{ matrix.python-version }}
51-
cache: 'pip'
52-
cache-dependency-path: 'galaxy root/requirements.txt'
51+
- name: Install uv
52+
uses: astral-sh/setup-uv@v7
5353
- name: Get full Python version
5454
id: full-python-version
5555
shell: bash
5656
run: echo "version=$(python -c 'import sys; print("-".join(str(v) for v in sys.version_info))')" >> $GITHUB_OUTPUT
57-
- name: Cache tox env
58-
uses: actions/cache@v4
59-
with:
60-
path: .tox
61-
key: tox-cache-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-check-indexes
6257
- name: Install tox
63-
run: pip install tox
58+
run: uv tool install tox --with tox-uv
6459
- name: Set database connection on PostgreSQL
6560
if: matrix.db == 'postgresql'
6661
run: echo 'GALAXY_CONFIG_OVERRIDE_DATABASE_CONNECTION=postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8' >> $GITHUB_ENV

.github/workflows/dependencies.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ jobs:
1515
- uses: actions/setup-python@v6
1616
with:
1717
python-version: '3.9'
18+
- name: Install uv
19+
uses: astral-sh/setup-uv@v7
1820
- name: Update dependencies
1921
run: make update-dependencies
2022
- name: Create pull request

.github/workflows/deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ jobs:
3838
- uses: actions/setup-python@v6
3939
with:
4040
python-version: ${{ matrix.python-version }}
41-
cache: 'pip'
42-
cache-dependency-path: 'requirements.txt'
41+
- name: Install uv
42+
uses: astral-sh/setup-uv@v7
4343
- uses: nanasess/setup-chromedriver@v2
4444
- name: Run tests
4545
run: bash ./test/deployment/usegalaxystar.bash

.github/workflows/docs.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ jobs:
3535
- uses: actions/setup-python@v6
3636
with:
3737
python-version: ${{ matrix.python-version }}
38-
cache: 'pip'
39-
cache-dependency-path: 'requirements.txt'
38+
- name: Install uv
39+
uses: astral-sh/setup-uv@v7
4040
- name: Install Python dependencies
41-
run: pip install -r requirements.txt -r lib/galaxy/dependencies/dev-requirements.txt sphinxcontrib-simpleversioning
41+
run: uv pip install --system -r requirements.txt -r lib/galaxy/dependencies/dev-requirements.txt sphinxcontrib-simpleversioning
4242
- name: Add Google Analytics to doc/source/conf.py
4343
run: |
4444
sed -i -e "/html_theme_options = {/a\
@@ -73,5 +73,5 @@ jobs:
7373
exit 0
7474
;;
7575
esac
76-
pip install awscli
76+
uv tool install awscli
7777
aws s3 sync doc/build/html/ "s3://galaxy-docs/en/$UPLOAD_DIR" --region us-east-2 --size-only --delete

.github/workflows/first_startup.yaml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,24 +38,19 @@ jobs:
3838
uses: actions/setup-python@v6
3939
with:
4040
python-version: ${{ matrix.python-version }}
41-
cache: 'pip'
42-
cache-dependency-path: 'galaxy root/requirements.txt'
41+
- name: Install uv
42+
uses: astral-sh/setup-uv@v7
4343
- name: Get full Python version
4444
id: full-python-version
4545
shell: bash
4646
run: echo "version=$(python -c 'import sys; print("-".join(str(v) for v in sys.version_info))')" >> $GITHUB_OUTPUT
47-
- name: Cache tox env
48-
uses: actions/cache@v4
49-
with:
50-
path: .tox
51-
key: tox-cache-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-first-startup
5247
- name: Restore client cache
5348
uses: actions/cache@v4
5449
with:
5550
key: galaxy-static-${{ needs.build-client.outputs.commit-id }}
5651
path: 'galaxy root/static'
5752
- name: Install tox
58-
run: pip install tox
53+
run: uv tool install tox --with tox-uv
5954
- name: run tests
6055
run: tox -e first_startup
6156
working-directory: 'galaxy root'

0 commit comments

Comments
 (0)