Skip to content

Commit 1564bc3

Browse files
authored
Merge pull request #119 from inab/full_circle
Merge removed JSON Schema documentation bits
2 parents c877a81 + 469324f commit 1564bc3

30 files changed

+41
-17683
lines changed

.github/workflows/schemas-doc-generator.yml

Lines changed: 0 additions & 61 deletions
This file was deleted.
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Create a pull request against readthedocs_merge branch updating the tag being pulled
2+
on:
3+
workflow_dispatch:
4+
push:
5+
tags:
6+
# Push events to every tag not containing /
7+
# based on https://stackoverflow.com/a/61892639
8+
- '[1-9]*'
9+
10+
jobs:
11+
update_wfexs_requirement_at_readthedocs_merge:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Documentation branch checkout
15+
uses: actions/checkout@v4
16+
with:
17+
ref: readthedocs_merge
18+
- name: Write requirement
19+
run: |
20+
echo "wfexs_backend @ git+${{ github.server_url }}/${{ github.repository }}.git@${{ github.ref_name }}" > docs/source/requirement-wfexs.txt
21+
- name: Create Pull Request
22+
id: cpr
23+
uses: peter-evans/create-pull-request@v7
24+
with:
25+
title: Updated WfExS-backend version being documented to ${{ github.ref_name }}
26+
add-paths: |
27+
docs/source/requirement-wfexs.txt
28+
branch: create-pull-request/patch-documented-wfexs-version
29+
delete-branch: true
30+
commit-message: "[create-pull-request] Automatically commit updated contents (changed referred WfExS version to ${{ github.ref_name }})"
31+
- name: Check outputs
32+
if: ${{ steps.cpr.outputs.pull-request-number }}
33+
run: |
34+
echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
35+
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ and [cwltool](https://github.com/common-workflow-language/cwltool)).
2727

2828
* [README_REPLICATOR.md](README_REPLICATOR.md): It briefly describes `WfExS-config-replicator.py` usage.
2929

30-
Additional present and future documentation is hosted at [development-docs](development-docs/index.md) subfolder, until it is migrated to a proper documentation service.
30+
Additional present and future documentation is hosted at [development-docs](development-docs/index.md) subfolder, until it is migrated to [WfExS-backend ReadTheDocs](https://wfexs-backend.readthedocs.io).
3131

3232
## Cite as
3333

@@ -108,7 +108,7 @@ Also, a description about the different WfExS commands is available [at the comm
108108

109109
The program uses three different types of configuration files:
110110

111-
* Local configuration file: YAML formatted file which describes the local setup of the backend (example at [workflow_examples/local_config.yaml](workflow_examples/local_config.yaml)). JSON Schema describing the format (and used for validation) is available at [wfexs_backend/schemas/config.json](wfexs_backend/schemas/config.json) and there is also automatically generated documentation (see [config_schema.md](development-docs/schemas/config_schema.md)). Relative paths in this configuration file use as reference the directory where the local configuration file is living.
111+
* Local configuration file: YAML formatted file which describes the local setup of the backend (example at [workflow_examples/local_config.yaml](workflow_examples/local_config.yaml)). JSON Schema describing the format (and used for validation) is available at [wfexs_backend/schemas/config.json](wfexs_backend/schemas/config.json) and there is also automatically generated documentation on each release (see [config.json.html](https://wfexs-backend.readthedocs.io/en/latest/schemadocs/config.json.html)). Relative paths in this configuration file use as reference the directory where the local configuration file is living.
112112

113113
- `cacheDir`: The path in this key sets up the place where all the contents which can be cached are hold. It contains downloaded RO-Crate,
114114
downloaded workflow git repositories, downloaded workflow engines. It is recommended to have it outside `/tmp` directory when
@@ -146,9 +146,9 @@ The program uses three different types of configuration files:
146146

147147
- `tools.encrypted_fs.idle`: Number of minutes of inactivity before the encrypted FUSE filesystem is automatically unmounted. The default is 5 minutes.
148148

149-
* Workflow configuration file: YAML formatted file which describes the workflow staging before being executed, like where inputs are located and can be fetched, the security contexts to be used on specific inputs to get those controlled access resources, the parameters, the outputs to capture, ... ([Nextflow example](workflow_examples/wetlab2variations_execution_nxf.wfex.stage), [CWL example](workflow_examples/wetlab2variations_execution_cwl.wfex.stage)). JSON Schema describing the format and valid keys (and used for validation), is available at [wfexs_backend/schemas/stage-definition.json](wfexs_backend/schemas/stage-definition.json) and there is also automatically generated documentation (see [stage-definition_schema.md](development-docs/schemas/stage-definition_schema.md)).
149+
* Workflow configuration file: YAML formatted file which describes the workflow staging before being executed, like where inputs are located and can be fetched, the security contexts to be used on specific inputs to get those controlled access resources, the parameters, the outputs to capture, ... ([Nextflow example](workflow_examples/wetlab2variations_execution_nxf.wfex.stage), [CWL example](workflow_examples/wetlab2variations_execution_cwl.wfex.stage)). JSON Schema describing the format and valid keys (and used for validation), is available at [wfexs_backend/schemas/stage-definition.json](wfexs_backend/schemas/stage-definition.json) and there is also automatically generated documentation on each release (see [stage-definition.json.html](https://wfexs-backend.readthedocs.io/en/latest/schemadocs/stage-definition.json.html)).
150150

151-
* Security contexts file: YAML formatted file which holds the `user`/`password` pairs, security tokens or keys needed on different steps, like input fetching. ([Nextflow example](workflow_examples/wetlab2variations_credentials_nxf.wfex.ctxt), [CWL example](workflow_examples/wetlab2variations_credentials_cwl.wfex.ctxt)). JSON Schema describing the format and valid keys (and used for validation), is available at [wfexs_backend/schemas/security-context.json](wfexs_backend/schemas/security-context.json) and there is also automatically generated documentation (see [security-context_schema.md](development-docs/schemas/security-context_schema.md)).
151+
* Security contexts file: YAML formatted file which holds the `user`/`password` pairs, security tokens or keys needed on different steps, like input fetching. ([Nextflow example](workflow_examples/wetlab2variations_credentials_nxf.wfex.ctxt), [CWL example](workflow_examples/wetlab2variations_credentials_cwl.wfex.ctxt)). JSON Schema describing the format and valid keys (and used for validation), is available at [wfexs_backend/schemas/security-context.json](wfexs_backend/schemas/security-context.json) and there is also automatically generated documentation on each release (see [security-context.json.html](https://wfexs-backend.readthedocs.io/en/latest/schemadocs/security-context.json.html)).
152152

153153
## License
154154
* © 2020-2024 Barcelona Supercomputing Center (BSC), ES

dev-requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ flake8 < 6.0.0 ; python_version < '3.8'
1313
flake8 >= 6.0.0 ; python_version >= '3.8'
1414
mccabe >= 0.7.0
1515
mypy >= 1.1.1
16-
json-schema-for-humans >= 0.45.1
16+
# This one is now managed by the ReadTheDocs documentation
17+
# json-schema-for-humans >= 0.45.1
1718
pre-commit >= 2.17.0
1819
# This is the last version of black supporting Python 3.7
1920
black == 23.3.0

0 commit comments

Comments
 (0)