Skip to content

Commit e9b9228

Browse files
authored
Merge branch 'galaxyproject:main' into main
2 parents 17d296c + 80b0c7b commit e9b9228

1,684 files changed

Lines changed: 660453 additions & 4480 deletions

File tree

Some content is hidden

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

.github/workflows/ci-main.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,20 @@ jobs:
6666
python bin/mergeyaml.py --nondocker > /dev/null
6767
6868
- name: Check Tutorial Formatting
69+
if: always()
6970
run: |
70-
find topics/ -name tutorial.md | xargs -n 1 python bin/check-broken-boxes.py | reviewdog -efm="%f:%l: %m" -filter-mode=file -reporter=github-pr-review -fail-level=any
71+
mkdir -p ./pr
72+
find topics/ -name tutorial.md | xargs -n 1 python bin/check-broken-boxes.py | reviewdog -efm="%f:%l: %m" -filter-mode=file -reporter=local -fail-level=error -diff='git diff main' > ./pr/reviewdog.txt
7173
set -e
7274
set -o pipefail
73-
bundle exec ruby bin/lint.rb --format rdjson | reviewdog -filter-mode=file -reporter=github-pr-review -f=rdjsonl -fail-level=any
74-
env:
75-
REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
75+
bundle exec ruby bin/lint.rb --format rdjson | reviewdog -filter-mode=file -f=rdjsonl -reporter=local -fail-level=error -diff='git diff main' > ./pr/reviewdog.json
76+
77+
- uses: actions/upload-artifact@v4
78+
if: always()
79+
with:
80+
name: reviewdog
81+
path: pr/
82+
7683

7784
# - name: rubocop
7885
# uses: reviewdog/action-rubocop@v2
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: "Review comments"
2+
3+
on:
4+
workflow_run:
5+
workflows: ["[CI] GTN Tutorial Linting"]
6+
types: [completed]
7+
8+
jobs:
9+
comment:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v4
13+
with:
14+
fetch-depth: 1
15+
persist-credentials: false
16+
17+
- uses: reviewdog/action-setup@v1
18+
with:
19+
reviewdog_version: latest
20+
21+
- name: 'Download artifact'
22+
uses: actions/github-script@v7
23+
with:
24+
script: |
25+
let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
26+
owner: context.repo.owner,
27+
repo: context.repo.repo,
28+
run_id: context.payload.workflow_run.id,
29+
});
30+
let matchArtifact = allArtifacts.data.artifacts.filter((artifact) => {
31+
return artifact.name == "reviewdog"
32+
})[0];
33+
let download = await github.rest.actions.downloadArtifact({
34+
owner: context.repo.owner,
35+
repo: context.repo.repo,
36+
artifact_id: matchArtifact.id,
37+
archive_format: 'zip',
38+
});
39+
const fs = require('fs');
40+
const path = require('path');
41+
const temp = '${{ runner.temp }}/artifacts';
42+
if (!fs.existsSync(temp)){
43+
fs.mkdirSync(temp);
44+
}
45+
fs.writeFileSync(path.join(temp, 'reviewdog.zip'), Buffer.from(download.data));
46+
47+
- name: 'Unzip artifact'
48+
run: unzip reviewdog.zip -d "${{ runner.temp }}/artifacts"
49+
50+
- name: Add review comments
51+
run: |
52+
cat "${{ runner.temp }}/artifacts/reviewdog.txt" | reviewdog -efm="%f:%l: %m" -reporter=github-pr-review
53+
54+
cat "${{ runner.temp }}/artifacts/reviewdog.json" | reviewdog -reporter=github-pr-review -f=rdjsonl
55+
env:
56+
REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.REVIEW_BOT_TOKEN }}
57+

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.DS_Store
22
.bundle
3+
.env
34
_site
45
_pdf
56
.directory

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ _plugins/ @bebatut @hexylena
1414

1515
# Topic Editorial Board members
1616
topics/introduction/ @jennaj @delphine-l @teresa-m
17-
topics/admin/ @hexylena @natefoo @bgruening @martenson
17+
topics/admin/ @hexylena @natefoo @bgruening @martenson @mira-miracoli
1818
topics/ai4life/ @beatrizserrano
1919
topics/assembly/ @nekrut @delphine-l
2020
topics/climate/ @annefou

CONTRIBUTORS.yaml

Lines changed: 46 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,6 +1085,9 @@ guillaume-gricourt:
10851085
hvelab:
10861086
name: Helena Vela
10871087
joined: 2024-09
1088+
contact_for_training: true
1089+
affiliations:
1090+
- biont
10881091

10891092
hannahkimincompbio:
10901093
name: Hannah Kim
@@ -1340,6 +1343,7 @@ jkreplak:
13401343

13411344
jochenblom:
13421345
name: Jochen Blom
1346+
elixir_node: de
13431347
joined: 2025-04
13441348

13451349
joelvdavies:
@@ -1593,15 +1597,17 @@ lgallegovillar:
15931597

15941598
lldelisle:
15951599
name: Lucille Delisle
1596-
email: lucille.delisle@epfl.ch
1600+
email: lucille.delisle@unige.ch
15971601
orcid: 0000-0002-1964-4960
15981602
joined: 2019-08
15991603
elixir_node: ch
1604+
matrix: 'lldelisle:matrix.org'
16001605
contact_for_training: true
1606+
maintainer_contact: matrix
16011607
location:
16021608
country: CH
1603-
lat: 46.52
1604-
lon: 6.56
1609+
lat: 46.19
1610+
lon: 6.15
16051611
affiliations:
16061612
- elixir-europe
16071613

@@ -1610,6 +1616,8 @@ lisanna:
16101616
joined: 2023-09
16111617
email: lisanna.paladin@gmail.com
16121618
orcid: 0000-0003-0011-9397
1619+
elixir_node: de
1620+
contact_for_training: true
16131621
affiliations:
16141622
- elixir-europe
16151623
- embl-ebi
@@ -1945,6 +1953,12 @@ mirelaminkova:
19451953
affiliations:
19461954
- surf
19471955

1956+
mittler-works:
1957+
name: Nils Mittler
1958+
joined: 2025-06
1959+
affiliations:
1960+
- deKCD
1961+
19481962
moffmade:
19491963
name: Cory Maughmer
19501964
joined: 2018-06
@@ -1955,6 +1969,10 @@ moheydarian:
19551969
orcid: 0000-0001-9449-9364
19561970
joined: 2017-09
19571971

1972+
Morphy427:
1973+
name: Elouan Le Mestric
1974+
joined: 2025-05
1975+
19581976
mritchie:
19591977
name: Matt Ritchie
19601978
joined: 2018-09
@@ -2159,6 +2177,11 @@ odoppelt:
21592177
affiliations:
21602178
- elixir-europe
21612179

2180+
ogerdfx:
2181+
name: Christine Oger
2182+
joined: 2025-06
2183+
elixir_node: fr
2184+
21622185
olanag1:
21632186
name: Olha Nahorna
21642187
joined: 2019-07
@@ -2517,6 +2540,12 @@ sanjaysrikakulam:
25172540
- elixir-europe
25182541
- eurosciencegateway
25192542

2543+
santamccloud:
2544+
name: Santino Faack
2545+
joined: 2025-07
2546+
affiliations:
2547+
- uni-freiburg
2548+
25202549
saramorsy:
25212550
name: Sara Morsy
25222551
joined: 2021-10
@@ -2609,6 +2638,9 @@ shiltemann:
26092638
silviadg87:
26102639
name: Silvia Di Giorgio
26112640
joined: 2025-05
2641+
contact_for_training: true
2642+
affiliations:
2643+
- biont
26122644

26132645
Shorla:
26142646
name: Olushola Ogunkelu
@@ -2765,6 +2797,11 @@ sunyi000:
27652797
email: yi.sun@embl.de
27662798
joined: 2021-03
27672799

2800+
maulakhan:
2801+
name: Arif UI Maula Khan
2802+
email: arif.khan@embl.de
2803+
joined: 2025-07
2804+
27682805
Swathi266:
27692806
name: Swathi Nataraj
27702807
joined: 2024-12
@@ -2918,6 +2955,12 @@ tsenapathi:
29182955
tflowers15:
29192956
name: Tristan Reynolds
29202957
joined: 2025-03
2958+
email: treynolds@unimelb.edu.au
2959+
orcid: 0000-0002-6606-5953
2960+
affiliations:
2961+
- AustralianBioCommons
2962+
- unimelb
2963+
- melbournebioinformatics
29212964

29222965
trungN:
29232966
name: Nguyen Vo Minh Trung

GRANTS.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,19 @@ nhgri-gdscn:
242242
funding_id: 75N92022P00232
243243
funding_database: highergov
244244

245+
oscars:
246+
name: "Open Science Clusters' Action for Research & Society"
247+
short_name: "OSCARS"
248+
joined: 2025-07
249+
funding_id: "101129751"
250+
funding_database: cordis
251+
funder_name: Horizon Europe
252+
funding_statement: |
253+
The OSCARS project has received funding from the European Commission’s Horizon Europe Research and Innovation programme under grant agreement No. 101129751
254+
url: https://oscars-project.eu/
255+
github: false
256+
avatar: "/training-material/shared/images/logos/OSCARS-logo-EUflag.png"
257+
245258
skills4eosc:
246259
name: Skills for European Open Science Cloud
247260
short_name: "Skills4SEOSC"

ORGANISATIONS.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,12 @@ FAIR2Adapt:
144144
url: https://eosc.eu/eu-project/fair2adapt/
145145
avatar: "/training-material/shared/images/logos/FAIR2Adapt.png"
146146

147+
fiesta:
148+
short_name: OSCARS-FIESTA
149+
name: FAIR Image Analysis across Sciences
150+
url: https://oscars-project.eu/projects/fair-image-analysis-across-sciences
151+
avatar: "/training-material/shared/images/logos/logo-FIESTA.png"
152+
147153
find:
148154
short_name: FIND
149155
name: The Foundation for Innovative New Diagnostics
@@ -229,6 +235,11 @@ madland:
229235
url: https://madland.science
230236
avatar: "/training-material/shared/images/logo-madland.jpg"
231237

238+
melbournebioinformatics:
239+
name: Melbourne Bioinformatics
240+
url: https://mdhs.unimelb.edu.au/melbournebioinformatics
241+
avatar: "/training-material/shared/images/Melbourne-Bioinformatics-logo.png"
242+
232243
moffitt:
233244
name: Moffitt Cancer Center
234245
url: https://www.moffitt.org/
@@ -421,6 +432,11 @@ uni-freiburg:
421432
github: false
422433
ror: "0245cg223"
423434

435+
unimelb:
436+
name: The University of Melbourne
437+
url: https://www.unimelb.edu.au
438+
avatar: "/training-material/shared/images/unimelb_Logo_RGB.png"
439+
424440
UTas:
425441
short_name: UTas
426442
name: University of Tasmania

_config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ abbreviate:
9292
# update invite link gxy.io link here when needed: https://github.com/galaxyproject/gxy.io/blob/main/group_vars/all.yaml
9393
slack:
9494
invite_link: http://gxy.io/gtn-slack # this points to the invite link
95-
general_channel: https://gtnsmrgsbord.slack.com/archives/C01MNM98X9V
96-
social_channel: https://gtnsmrgsbord.slack.com/archives/C01EDBVMHBQ
95+
general_channel: https://gtnsmrgsbord.slack.com/channels/general
96+
social_channel: https://gtnsmrgsbord.slack.com/channels/social
9797
single_cell_channel: https://gtnsmrgsbord.slack.com/archives/C06PBRR40D7
9898

9999

_layouts/event.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,12 @@ <h5 class="card-title">Join {{support.platform | default: "Slack" }}!</h5>
257257

258258
<ol>
259259
<li>Join {{support.platform}} via this <a href="{{support.join_link | default: site.slack.invite_link }}">Invite Link</a></li>
260-
<li>Join the event channel: <a href="{{support.link | default: site.slack.general_channel}}">#{{event.infrastructure.support.channel | default: "general"}}</a></li>
260+
{% if support.platform == "Slack" and support.channel %}
261+
{% assign channel_link = "https://gtnsmrgsbord.slack.com/channels/" | append: support.channel %}
262+
{% else %}
263+
{% assign channel_link = support.link | default: site.slack.general_channel %}
264+
{% endif %}
265+
<li>Join the event channel: <a href="{{channel_link}}">#{{event.infrastructure.support.channel | default: "general"}}</a></li>
261266
<li>Introduce yourself here!</li>
262267
</ol>
263268

_layouts/topic-maintainer.html

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,22 @@ <h2>Action Items</h2>
5858
<td>{% if topic.learning_path_cta or topic.learning_path_ctas %} Done ✅ {% else %} Pending ❌ {% endif %}</td>
5959
<td>By providing a Learning Pathway CTA, we can help guide learners to the best resources for learning about this topic.</td>
6060
</tr>
61+
<tr>
62+
<td>Review Feedback Received</td>
63+
<td> Ongoing 🔁 </td>
64+
<td> Review all <a href="https://training.galaxyproject.org/feedback#topic-{{topic.title | slugify }}" >feedback received for the {{topic.title}} topic</a> and create GitHub issues or PRs where needed. </td>
65+
</tr>
66+
<tr>
67+
<td>Review open Pull Requests</td>
68+
<td> Ongoing 🔁 </td>
69+
<td> View all <a href="https://github.com/galaxyproject/training-material/pulls?q=is%3Apr+is%3Aopen+label%3A{{topic.name}}" >open PRs in the {{topic.title}} topic</a> and review, comment and merge!</td>
70+
</tr>
71+
<tr>
72+
<td>Review open GitHub Issues</td>
73+
<td> Ongoing 🔁 </td>
74+
<td> View all <a href="https://github.com/galaxyproject/training-material/issues?q=is%3Aissue%20state%3Aopen%20label%3A{{topic.name}}" >open issues related to the {{topic.title}} topic</a> and comment, fix, or ask others for help!</td>
75+
</tr>
76+
6177
</tbody>
6278
</table>
6379

0 commit comments

Comments
 (0)