Skip to content

Commit

Permalink
Merge pull request #2543 from MatthiasZepper/Download_bugfix_absoluteURI
Browse files Browse the repository at this point in the history
Download: Bugfix for AttributeError: 'ContainerError' object has no attribute 'absoluteURI'
  • Loading branch information
mashehu authored Dec 9, 2023
2 parents 854fa9f + 13edd4f commit c007a5e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
- Use closure for multiqc ext.args ([#2509](https://github.com/nf-core/tools/pull/2509))
- Fix how the modules template references the conda environment file ([#2540](https://github.com/nf-core/tools/pull/2540))

### Download

- Bugfix for AttributeError: 'ContainerError' object has no attribute 'absoluteURI' ([#2543](https://github.com/nf-core/tools/pull/2543)).

### Linting

- Fix incorrectly failing linting if 'modules' was not found in meta.yml ([#2447](https://github.com/nf-core/tools/pull/2447))
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ If the download speeds are much slower than your internet connection is capable
Subsequently, the `*.git` folder can be moved to it's final destination and linked with a pipeline in _Tower_ using the `file:/` prefix.

:::tip
Also without access to Tower, pipelines downloaded with the `--tower` flag can be run: `nextflow run -r 2.5 file:/path/to/pipelinedownload.git`. Downloads in this format allow you to include multiple revisions of a pipeline in a single file, but require that the revision (e.g. `-r 2.5`) is always explicitly specified.
Also without access to Tower, pipelines downloaded with the `--tower` flag can be run if the _absolute_ path is specified: `nextflow run -r 2.5 file:/path/to/pipelinedownload.git`. Downloads in this format allow you to include multiple revisions of a pipeline in a single file, but require that the revision (e.g. `-r 2.5`) is always explicitly specified.
:::

## Pipeline software licences
Expand Down
4 changes: 2 additions & 2 deletions nf_core/download.py
Original file line number Diff line number Diff line change
Expand Up @@ -1081,7 +1081,7 @@ def get_singularity_images(self, current_revision=""):
continue
except ContainerError.ImageNotFound as e:
# Try other registries
if e.error_log.absoluteURI:
if e.error_log.absolute_URI:
break # there no point in trying other registries if absolute URI was specified.
else:
continue
Expand All @@ -1092,7 +1092,7 @@ def get_singularity_images(self, current_revision=""):
# Try other registries
log.error(e.message)
log.error(e.helpmessage)
if e.error_log.absoluteURI:
if e.error_log.absolute_URI:
break # there no point in trying other registries if absolute URI was specified.
else:
continue
Expand Down

0 comments on commit c007a5e

Please sign in to comment.