Skip to content

Commit

Permalink
global: upgrade jupyter env tag to 2.0.0
Browse files Browse the repository at this point in the history
Back to a single notebook file with Python3 kernel.

closes reanahub/reana-env-jupyter#6
  • Loading branch information
mvidalgarcia committed Aug 25, 2021
1 parent c4a71a4 commit f7fb7cb
Show file tree
Hide file tree
Showing 12 changed files with 52 additions and 164 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Validate workflow
run: yadage-validate workflow/yadage/workflow.yaml | grep -q 'workflow validates'

- run: docker run -i --rm -v `pwd`:/workdir reanahub/reana-env-jupyter:1.0.0 bash -c '
- run: docker run -i --rm -v `pwd`:/workdir reanahub/reana-env-jupyter:2.0.0 bash -c '
cd /workdir &&
mkdir -p ./results &&
papermill ./code/worldpopulation.ipynb /dev/null
Expand All @@ -39,4 +39,3 @@ jobs:
-p year_max 2010'

- run: ls -l `pwd`/results/plot.png

2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ workflow steps and expected outputs:
type: serial
specification:
steps:
- environment: 'reanahub/reana-env-jupyter:1.0.0'
- environment: 'reanahub/reana-env-jupyter:2.0.0'
commands:
- mkdir -p results && papermill ${notebook} /dev/null -p input_file ${input_file} -p output_file ${output_file} -p region ${region} -p year_min ${year_min} -p year_max ${year_max}
outputs:
Expand Down
113 changes: 0 additions & 113 deletions code/worldpopulation-py3.ipynb

This file was deleted.

80 changes: 41 additions & 39 deletions code/worldpopulation.ipynb

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion reana-htcondorcern.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ workflow:
type: serial
specification:
steps:
- environment: 'reanahub/reana-env-jupyter:1.0.0'
- environment: 'reanahub/reana-env-jupyter:2.0.0'
compute_backend: htcondorcern
htcondor_max_runtime: espresso
commands:
Expand Down
2 changes: 1 addition & 1 deletion reana-slurmcern.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ workflow:
type: serial
specification:
steps:
- environment: 'reanahub/reana-env-jupyter:1.0.0'
- environment: 'reanahub/reana-env-jupyter:2.0.0'
compute_backend: slurmcern
commands:
- mkdir -p results && papermill ${notebook} /dev/null -p input_file ${input_file} -p output_file ${output_file} -p region ${region} -p year_min ${year_min} -p year_max ${year_max}
Expand Down
2 changes: 1 addition & 1 deletion reana.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ workflow:
type: serial
specification:
steps:
- environment: 'reanahub/reana-env-jupyter:1.0.0'
- environment: 'reanahub/reana-env-jupyter:2.0.0'
commands:
- mkdir -p results && papermill ${notebook} /dev/null -p input_file ${input_file} -p output_file ${output_file} -p region ${region} -p year_min ${year_min} -p year_max ${year_max}
outputs:
Expand Down
2 changes: 1 addition & 1 deletion workflow/cwl/worldpopulation.tool
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class: CommandLineTool
requirements:
- class: InlineJavascriptRequirement
- class: DockerRequirement
dockerPull: reanahub/reana-env-jupyter:1.0.0
dockerPull: reanahub/reana-env-jupyter:2.0.0

baseCommand: ["papermill"]

Expand Down
4 changes: 2 additions & 2 deletions workflow/snakemake/Snakefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# $ cp -a ../code ../data .
# $ snakemake -s ../workflow/snakemake/Snakefile \
# --configfile ../workflow/snakemake/inputs.yaml
# --config notebook=code/worldpopulation-py3.ipynb -p --cores 1
# --config notebook=code/worldpopulation.ipynb -p --cores 1
# $ open results/plot.png

rule all:
Expand All @@ -28,7 +28,7 @@ rule worldpopulation:
output:
output_file=config["output_file"]
container:
"docker://reanahub/reana-env-jupyter:1.0.0"
"docker://reanahub/reana-env-jupyter:2.0.0"
shell:
"mkdir -p results && papermill {input.notebook} /dev/null -p "
"input_file {input.input_file} -p output_file {output.output_file} "
Expand Down
2 changes: 1 addition & 1 deletion workflow/yadage/workflow-htcondorcern.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ stages:
environment:
environment_type: 'docker-encapsulated'
image: 'reanahub/reana-env-jupyter'
imagetag: '1.0.0'
imagetag: '2.0.0'
resources:
- compute_backend: htcondorcern
- htcondor_max_runtime: espresso
2 changes: 1 addition & 1 deletion workflow/yadage/workflow-slurmcern.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ stages:
environment:
environment_type: 'docker-encapsulated'
image: 'reanahub/reana-env-jupyter'
imagetag: '1.0.0'
imagetag: '2.0.0'
resources:
- compute_backend: slurmcern
2 changes: 1 addition & 1 deletion workflow/yadage/workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ stages:
environment:
environment_type: 'docker-encapsulated'
image: 'reanahub/reana-env-jupyter'
imagetag: '1.0.0'
imagetag: '2.0.0'

0 comments on commit f7fb7cb

Please sign in to comment.