Skip to content

Commit bc2d72b

Browse files
authored
Merge pull request #709 from bigbio/dev
Fix qpx example URL in CI and documentation
2 parents 37d1408 + e13caa8 commit bc2d72b

4 files changed

Lines changed: 12 additions & 5 deletions

File tree

.github/workflows/python-app.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,9 @@ jobs:
366366
run: pip install .
367367
- name: Test qpx dataset
368368
run: |
369-
wget -nv https://ftp.pride.ebi.ac.uk/pub/databases/pride/resources/proteomes/pmultiqc/example-projects/qpx_example.zip
369+
# Hosted as a GitHub release attachment: the PRIDE copy of this file
370+
# returns 404 (other PRIDE assets used by this workflow are unaffected).
371+
wget -nv -O qpx_example.zip https://github.com/user-attachments/files/31028778/qpx_example.zip
370372
unzip -d ./qpx_example qpx_example.zip
371373
multiqc --qpx-plugin ./qpx_example --config ./qpx_example/results/multiqc_config.yml -o ./results_qpx
372374
- uses: actions/upload-artifact@v4

docs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ You can find example reports on the [docs page](https://bigbio.github.io/pmultiq
270270
| mzIdentML with MGF | mzIdentML with MGF files | [mzIdentML with MGF Example](https://pmultiqc.quantms.org/PXD054720/multiqc_report.html) ([disable_hoverinfo](https://pmultiqc.quantms.org/PXD054720_disable_hoverinfo/multiqc_report.html)) | [PXD054720 folder](https://ftp.pride.ebi.ac.uk/pride/data/archive/2024/08/PXD054720/) |
271271
| FragPipe | FragPipe results | [FragPipe Example](https://pmultiqc.quantms.org/PXD062399/multiqc_report.html) ([disable_hoverinfo](https://pmultiqc.quantms.org/PXD062399_disable_hoverinfo/multiqc_report.html)) | [PXD062399.zip](https://ftp.pride.ebi.ac.uk/pub/databases/pride/resources/proteomes/pmultiqc/example-projects/PXD062399.zip) |
272272
| mhcquant | mhcquant results | [mhcquant Example](https://pmultiqc.quantms.org/mhcquant/multiqc_report.html) ([disable_hoverinfo](https://pmultiqc.quantms.org/mhcquant_disable_hoverinfo/multiqc_report.html)) | [mhcquant_3-1-0_results.zip](https://ftp.pride.ebi.ac.uk/pub/databases/pride/resources/proteomes/pmultiqc/mhcquant/mhcquant_3-1-0_results.zip) |
273-
| QPX | QPX results | [QPX Example](https://pmultiqc.quantms.org/qpx/multiqc_report.html) ([disable_hoverinfo](https://pmultiqc.quantms.org/qpx_disable_hoverinfo/multiqc_report.html)) | [qpx_example.zip](https://ftp.pride.ebi.ac.uk/pub/databases/pride/resources/proteomes/pmultiqc/example-projects/qpx_example.zip) |
273+
| QPX | QPX results | [QPX Example](https://pmultiqc.quantms.org/qpx/multiqc_report.html) ([disable_hoverinfo](https://pmultiqc.quantms.org/qpx_disable_hoverinfo/multiqc_report.html)) | [qpx_example.zip](https://github.com/user-attachments/files/31028778/qpx_example.zip) |
274274

275275
### 🔍 Large-Scale Dataset Reports
276276

docs/config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,15 +231,15 @@
231231
{
232232
"accession": "qpx",
233233
"urls": [
234-
"https://ftp.pride.ebi.ac.uk/pub/databases/pride/resources/proteomes/pmultiqc/example-projects/qpx_example.zip"
234+
"https://github.com/user-attachments/files/31028778/qpx_example.zip"
235235
],
236236
"path": "docs/qpx",
237237
"file_type": ["qpx", ""]
238238
},
239239
{
240240
"accession": "qpx_disable_hoverinfo",
241241
"urls": [
242-
"https://ftp.pride.ebi.ac.uk/pub/databases/pride/resources/proteomes/pmultiqc/example-projects/qpx_example.zip"
242+
"https://github.com/user-attachments/files/31028778/qpx_example.zip"
243243
],
244244
"path": "docs/qpx_disable_hoverinfo",
245245
"file_type": ["qpx", "disable_hoverinfo"]

docs/update_examples.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,13 @@ def download_file(url, save_path, max_retries=3, backoff_factor=2):
2626
ftp_host = ftp_parsed.hostname
2727
ftp_path = ftp_parsed.path
2828

29+
# Only hosts that actually serve FTP are worth trying. Without this, an HTTPS-only
30+
# host (e.g. a GitHub-hosted asset) burns three connection timeouts plus backoff
31+
# before reaching the HTTPS path that was always going to be the working one.
32+
ftp_available = bool(ftp_host) and ftp_host.startswith("ftp.")
33+
2934
# -------- Try FTP first --------
30-
for attempt in range(1, max_retries + 1):
35+
for attempt in range(1, max_retries + 1 if ftp_available else 1):
3136
try:
3237
print(f"[Attempt {attempt}] Trying FTP download: {ftp_host}{ftp_path}")
3338
ftp = FTP(ftp_host, timeout=30)

0 commit comments

Comments
 (0)