Skip to content

Commit 2cf27ac

Browse files
authored
Merge branch 'dev' into anvil-theme
2 parents 36599e0 + da98c8b commit 2cf27ac

File tree

1,837 files changed

+72755
-41306
lines changed

Some content is hidden

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

1,837 files changed

+72755
-41306
lines changed

.circleci/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ variables:
1515
jobs:
1616
get_code:
1717
docker:
18-
- image: cimg/python:3.8
18+
- image: cimg/python:3.9
1919
<<: *set_workdir
2020
steps:
2121
# Replace standard code checkout with shallow clone to speed things up.
@@ -73,7 +73,7 @@ jobs:
7373
- ~/repo
7474
validate_test_tools:
7575
docker:
76-
- image: cimg/python:3.8
76+
- image: cimg/python:3.9
7777
<<: *set_workdir
7878
steps:
7979
- *restore_repo_cache

.github/workflows/api.yaml

+8-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ on:
55
- 'client/**'
66
- 'doc/**'
77
- 'lib/galaxy_test/selenium/**'
8+
- 'packages/**'
89
pull_request:
910
paths-ignore:
1011
- 'client/**'
1112
- 'doc/**'
1213
- 'lib/galaxy_test/selenium/**'
14+
- 'packages/**'
1315
schedule:
1416
# Run at midnight UTC every Tuesday
1517
- cron: '0 0 * * 2'
@@ -29,7 +31,7 @@ jobs:
2931
strategy:
3032
fail-fast: false
3133
matrix:
32-
python-version: ['3.8']
34+
python-version: ['3.9']
3335
chunk: [0, 1]
3436
services:
3537
postgres:
@@ -48,9 +50,13 @@ jobs:
4850
- uses: actions/checkout@v4
4951
with:
5052
path: 'galaxy root'
53+
persist-credentials: false
54+
- name: Read Node.js version
55+
id: node-version
56+
run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT
5157
- uses: actions/setup-node@v4
5258
with:
53-
node-version: '18.12.1'
59+
node-version: ${{ steps.node-version.outputs.version }}
5460
cache: 'yarn'
5561
cache-dependency-path: 'galaxy root/client/yarn.lock'
5662
- uses: actions/setup-python@v5

.github/workflows/bioblend.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,20 @@ jobs:
3232
fail-fast: false
3333
matrix:
3434
tox_env: [py313]
35-
galaxy_python_version: ["3.8"]
35+
galaxy_python_version: ['3.9']
3636
steps:
3737
- name: Checkout Galaxy
3838
uses: actions/checkout@v4
3939
with:
4040
fetch-depth: 1
4141
path: galaxy
42+
persist-credentials: false
4243
- name: Checkout Bioblend
4344
uses: actions/checkout@v4
4445
with:
4546
repository: galaxyproject/bioblend
4647
path: bioblend
48+
persist-credentials: false
4749
- name: Cache pip dir
4850
uses: actions/cache@v4
4951
with:

.github/workflows/build_client.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@ jobs:
1414
- uses: actions/checkout@v4
1515
with:
1616
path: 'galaxy root'
17+
persist-credentials: false
18+
- name: Read Node.js version
19+
id: node-version
20+
run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT
1721
- uses: actions/setup-node@v4
1822
with:
19-
node-version: '18.12.1'
23+
node-version: ${{ steps.node-version.outputs.version }}
2024
cache: 'yarn'
2125
cache-dependency-path: 'galaxy root/client/yarn.lock'
2226
- name: get client commit

.github/workflows/build_container_image.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- uses: actions/checkout@v4
18+
with:
19+
persist-credentials: false
1820
# https://stackoverflow.com/questions/59810838/how-to-get-the-short-sha-for-the-github-workflow
1921
- name: Set outputs
2022
id: commit
@@ -75,6 +77,8 @@ jobs:
7577
if: github.repository_owner == 'galaxyproject'
7678
steps:
7779
- uses: actions/checkout@v4
80+
with:
81+
persist-credentials: false
7882
# https://stackoverflow.com/questions/59810838/how-to-get-the-short-sha-for-the-github-workflow
7983
- name: Set outputs
8084
id: commit

.github/workflows/check_test_class_names.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ jobs:
1414
runs-on: ubuntu-latest
1515
strategy:
1616
matrix:
17-
python-version: ['3.8']
17+
python-version: ['3.9']
1818
steps:
1919
- uses: actions/checkout@v4
20+
with:
21+
persist-credentials: false
2022
- uses: actions/setup-python@v5
2123
with:
2224
python-version: ${{ matrix.python-version }}

.github/workflows/codeql-analysis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ jobs:
4141
steps:
4242
- name: Checkout repository
4343
uses: actions/checkout@v4
44+
with:
45+
persist-credentials: false
4446

4547
# Initializes the CodeQL tools for scanning.
4648
- name: Initialize CodeQL

.github/workflows/converter_tests.yaml

+10-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ on:
44
paths-ignore:
55
- 'client/**'
66
- 'doc/**'
7+
- 'packages/**'
78
pull_request:
89
paths-ignore:
910
- 'client/**'
1011
- 'doc/**'
12+
- 'packages/**'
1113
schedule:
1214
# Run at midnight UTC every Tuesday
1315
- cron: '0 0 * * 2'
@@ -22,7 +24,7 @@ jobs:
2224
runs-on: ubuntu-latest
2325
strategy:
2426
matrix:
25-
python-version: ['3.8']
27+
python-version: ['3.9']
2628
steps:
2729
- if: github.event_name == 'schedule'
2830
run: |
@@ -31,16 +33,21 @@ jobs:
3133
- uses: actions/checkout@v4
3234
with:
3335
path: 'galaxy root'
36+
persist-credentials: false
37+
- name: Read Node.js version
38+
id: node-version
39+
run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT
3440
- uses: actions/setup-node@v4
3541
with:
36-
node-version: '18.12.1'
42+
node-version: ${{ steps.node-version.outputs.version }}
3743
cache: 'yarn'
3844
cache-dependency-path: 'galaxy root/client/yarn.lock'
3945
- name: Clone galaxyproject/galaxy-test-data
4046
uses: actions/checkout@v4
4147
with:
4248
repository: galaxyproject/galaxy-test-data
4349
path: galaxy-test-data
50+
persist-credentials: false
4451
- uses: actions/setup-python@v5
4552
with:
4653
python-version: ${{ matrix.python-version }}
@@ -60,7 +67,7 @@ jobs:
6067
- name: Lint converters
6168
run: |
6269
mapfile -t TOOL_ARRAY < tool_list.txt
63-
planemo lint --skip citations,stdio,help --report_level warn "${TOOL_ARRAY[@]}"
70+
planemo lint --skip CitationsMissing,HelpEmpty,HelpMissing --report_level warn "${TOOL_ARRAY[@]}"
6471
- name: Run tests
6572
run: |
6673
mapfile -t TOOL_ARRAY < tool_list.txt

.github/workflows/cwl_conformance.yaml

+8-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ on:
55
- 'client/**'
66
- 'doc/**'
77
- 'lib/galaxy_test/selenium/**'
8+
- 'packages/**'
89
pull_request:
910
paths-ignore:
1011
- 'client/**'
1112
- 'doc/**'
1213
- 'lib/galaxy_test/selenium/**'
14+
- 'packages/**'
1315
env:
1416
GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
1517
concurrency:
@@ -24,7 +26,7 @@ jobs:
2426
strategy:
2527
fail-fast: false
2628
matrix:
27-
python-version: ['3.8']
29+
python-version: ['3.9']
2830
marker: ['green', 'red and required', 'red and not required']
2931
conformance-version: ['cwl_conformance_v1_0'] #, 'cwl_conformance_v1_1', 'cwl_conformance_v1_2']
3032
services:
@@ -40,9 +42,13 @@ jobs:
4042
- uses: actions/checkout@v4
4143
with:
4244
path: 'galaxy root'
45+
persist-credentials: false
46+
- name: Read Node.js version
47+
id: node-version
48+
run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT
4349
- uses: actions/setup-node@v4
4450
with:
45-
node-version: '18.12.1'
51+
node-version: ${{ steps.node-version.outputs.version }}
4652
cache: 'yarn'
4753
cache-dependency-path: 'galaxy root/client/yarn.lock'
4854
- uses: actions/setup-python@v5

.github/workflows/db_indexes.yaml

+5-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ on:
55
- 'client/**'
66
- 'doc/**'
77
- 'lib/galaxy_test/selenium/**'
8+
- 'packages/**'
89
pull_request:
910
paths-ignore:
1011
- 'client/**'
1112
- 'doc/**'
1213
- 'lib/galaxy_test/selenium/**'
14+
- 'packages/**'
1315
concurrency:
1416
group: ${{ github.workflow }}-${{ github.ref }}
1517
cancel-in-progress: true
@@ -24,11 +26,11 @@ jobs:
2426
matrix:
2527
db: ['postgresql', 'sqlite']
2628
postgresql-version: ['13']
27-
python-version: ['3.8']
29+
python-version: ['3.9']
2830
include:
2931
- db: postgresql
3032
postgresql-version: '9.6'
31-
python-version: '3.8'
33+
python-version: '3.9'
3234
services:
3335
postgres:
3436
image: postgres:${{ matrix.postgresql-version }}
@@ -42,6 +44,7 @@ jobs:
4244
- uses: actions/checkout@v4
4345
with:
4446
path: 'galaxy root'
47+
persist-credentials: false
4548
- uses: actions/setup-python@v5
4649
with:
4750
python-version: ${{ matrix.python-version }}

.github/workflows/dependencies.yaml

+3-5
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v4
13-
# Install Python 3.8 for update_lint_requirements.sh
14-
# Install Python 3.9 (as default) to allow `uv lock` to generate metadata for rucio-clients
13+
with:
14+
persist-credentials: false
1515
- uses: actions/setup-python@v5
1616
with:
17-
python-version: |
18-
3.8
19-
3.9
17+
python-version: '3.9'
2018
- name: Update dependencies
2119
run: make update-dependencies
2220
- name: Create pull request

.github/workflows/deployment.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,12 @@ jobs:
2929
runs-on: ubuntu-latest
3030
strategy:
3131
matrix:
32-
python-version: ['3.8']
32+
python-version: ['3.9']
3333
steps:
3434
- uses: actions/checkout@v4
3535
with:
3636
fetch-depth: 0
37+
persist-credentials: false
3738
- uses: actions/setup-python@v5
3839
with:
3940
python-version: ${{ matrix.python-version }}

.github/workflows/docs.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ on:
44
paths-ignore:
55
- 'client/**'
66
- 'lib/galaxy_test/selenium/**'
7+
- 'packages/**'
78
pull_request:
89
paths-ignore:
910
- 'client/**'
1011
- 'lib/galaxy_test/selenium/**'
12+
- 'packages/**'
1113
concurrency:
1214
group: ${{ github.workflow }}-${{ github.ref }}
1315
cancel-in-progress: true
@@ -16,7 +18,7 @@ jobs:
1618
runs-on: ubuntu-latest
1719
strategy:
1820
matrix:
19-
python-version: ['3.8']
21+
python-version: ['3.9']
2022
steps:
2123
- name: Get target branch name (push)
2224
if: github.event_name == 'push'
@@ -29,6 +31,7 @@ jobs:
2931
- uses: actions/checkout@v4
3032
with:
3133
fetch-depth: 0
34+
persist-credentials: false
3235
- uses: actions/setup-python@v5
3336
with:
3437
python-version: ${{ matrix.python-version }}

.github/workflows/first_startup.yaml

+8-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ on:
44
paths-ignore:
55
- 'doc/**'
66
- 'lib/galaxy_test/selenium/**'
7+
- 'packages/**'
78
pull_request:
89
paths-ignore:
910
- 'doc/**'
1011
- 'lib/galaxy_test/selenium/**'
12+
- 'packages/**'
1113
env:
1214
YARN_INSTALL_OPTS: --frozen-lockfile
1315
concurrency:
@@ -23,17 +25,21 @@ jobs:
2325
strategy:
2426
fail-fast: false
2527
matrix:
26-
python-version: ['3.8', '3.13']
28+
python-version: ['3.9', '3.13']
2729
defaults:
2830
run:
2931
shell: bash -l {0}
3032
steps:
3133
- uses: actions/checkout@v4
3234
with:
3335
path: 'galaxy root'
36+
persist-credentials: false
37+
- name: Read Node.js version
38+
id: node-version
39+
run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT
3440
- uses: actions/setup-node@v4
3541
with:
36-
node-version: '18.12.1'
42+
node-version: ${{ steps.node-version.outputs.version }}
3743
cache: 'yarn'
3844
cache-dependency-path: 'galaxy root/client/yarn.lock'
3945
- name: Set up Python

.github/workflows/framework_tools.yaml

+8-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ on:
55
- 'client/**'
66
- 'doc/**'
77
- 'lib/galaxy_test/selenium/**'
8+
- 'packages/**'
89
pull_request:
910
paths-ignore:
1011
- 'client/**'
1112
- 'doc/**'
1213
- 'lib/galaxy_test/selenium/**'
14+
- 'packages/**'
1315
schedule:
1416
# Run at midnight UTC every Tuesday
1517
- cron: '0 0 * * 2'
@@ -25,7 +27,7 @@ jobs:
2527
runs-on: ubuntu-latest
2628
strategy:
2729
matrix:
28-
python-version: ['3.8']
30+
python-version: ['3.9']
2931
services:
3032
postgres:
3133
image: postgres:13
@@ -43,9 +45,13 @@ jobs:
4345
- uses: actions/checkout@v4
4446
with:
4547
path: 'galaxy root'
48+
persist-credentials: false
49+
- name: Read Node.js version
50+
id: node-version
51+
run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT
4652
- uses: actions/setup-node@v4
4753
with:
48-
node-version: '18.12.1'
54+
node-version: ${{ steps.node-version.outputs.version }}
4955
cache: 'yarn'
5056
cache-dependency-path: 'galaxy root/client/yarn.lock'
5157
- uses: actions/setup-python@v5

0 commit comments

Comments
 (0)