Skip to content

Commit 9332038

Browse files
committed
Merge remote-tracking branch 'origin/main' into kaushik-oct-2018
and apply suggestions from @tobyhodges
2 parents a055aa9 + 22e056d commit 9332038

File tree

439 files changed

+5685
-14989
lines changed

Some content is hidden

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

439 files changed

+5685
-14989
lines changed
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# https://github.com/readthedocs/actions/tree/v1/preview#how-to-use-it
2+
name: Read the Docs Pull Request Preview
3+
on:
4+
pull_request_target:
5+
types:
6+
- opened
7+
8+
permissions:
9+
pull-requests: write
10+
11+
jobs:
12+
documentation-links:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: readthedocs/actions/preview@v1
16+
with:
17+
project-slug: "common-workflow-languageuser-guide"
18+
project-language: "en"
19+
# message-template: ?
20+
platform: "community"

.github/workflows/gh-pages.yaml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: GitHub Pages sphinx deployment
2+
3+
on:
4+
push:
5+
branches:
6+
- release
7+
workflow_dispatch:
8+
9+
# NOTE: If you modify this file to install a package with pip or apt, please
10+
# verify if we need the same package added to our readthedocs build.
11+
jobs:
12+
# Ref: https://stackoverflow.com/questions/57989790/using-github-actions-to-publish-documentation
13+
deploy:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v3
17+
18+
- name: Install apt packages
19+
run: |
20+
sudo apt-get install -y graphviz tree
21+
22+
- name: Set up Python
23+
uses: actions/setup-python@v4
24+
with:
25+
python-version: '3.9'
26+
27+
- name: Upgrade pip
28+
run: |
29+
# pip >= 20.1 so we can use ``pip cache dir``
30+
python3 -m pip install --upgrade pip
31+
- name: Get pip cache dir
32+
id: pip-cache
33+
run: echo "::set-output name=dir::$(pip cache dir)"
34+
35+
- name: Cache dependencies
36+
uses: actions/cache@v3
37+
with:
38+
path: ${{ steps.pip-cache.outputs.dir }}
39+
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
40+
restore-keys: |
41+
${{ runner.os }}-pip-
42+
- name: Install dependencies
43+
run: python3 -m pip install -U -e .[all]
44+
45+
- name: pre-pull container images
46+
run: make container-pull
47+
48+
- name: Build documentation
49+
run: make html
50+
51+
- name: Deploy
52+
uses: peaceiris/actions-gh-pages@v3
53+
with:
54+
github_token: ${{ secrets.GITHUB_TOKEN }}
55+
publish_dir: ./_build/html/
56+
publish_branch: gh-pages

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@
33
.DS_Store
44
.ipynb_checkpoints
55
.sass-cache
6+
.jekyll-cache/
67
__pycache__
78
_site
89
.Rproj.user
910
.Rhistory
1011
.RData
12+
_build/
13+
build/
14+
*.egg-info/
1115

16+
src/_includes/cwl/**/output.txt
17+
venv/

.readthedocs.yaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
version: 2
2+
3+
# NOTE: If you modify this file to install a package with pip or apt, please
4+
# verify if we need the same package added to our CI.
5+
build:
6+
os: ubuntu-22.04
7+
tools:
8+
python: "3.9"
9+
nodejs: "16"
10+
apt_packages:
11+
- graphviz
12+
- tree
13+
14+
sphinx:
15+
configuration: src/conf.py
16+
builder: html
17+
18+
python:
19+
install:
20+
- method: pip
21+
path: .
22+
extra_requirements:
23+
- all

.travis.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1-
sudo: required
21
services:
32
- docker
43

54
language: python
65
python:
7-
- 2.7
8-
- 3.6
6+
- 3.8
7+
8+
cache:
9+
pip: true
910

1011
branches:
1112
only:
12-
- gh-pages
13+
- main
1314
- /.*/
1415

15-
before_script:
16-
- pip install cwltool cwltest html5lib
16+
install:
17+
- pip install -U pip setuptools wheel typing
18+
- pip install -e .[all]
1719

1820
script:
1921
- make RUNNER=cwltool unittest-examples
File renamed without changes.

CITATION

Lines changed: 0 additions & 34 deletions
This file was deleted.

CITATION.md

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
# Citation
2+
3+
To cite the Common Workflow Language project in a scholary work, please use:
4+
5+
Michael R. Crusoe, Sanne Abeln, Alexandru Iosup, Peter Amstutz, John Chilton, Nebojša Tijanić,
6+
Hervé Ménager, Stian Soiland-Reyes, Bogdan Gavrilović, Carole Goble, and The CWL Community. 2022.
7+
Methods Included: Standardizing Computational Reuse and Portability with the Common Workflow Language.
8+
Commun. ACM 65, 6 (June 2022), 54–63. https://doi.org/10.1145/3486897
9+
10+
```
11+
@article{10.1145/3486897,
12+
author = {Crusoe, Michael R. and Abeln, Sanne and Iosup, Alexandru and Amstutz, Peter and Chilton, John and Tijani\'{c}, Neboj\v{s}a and M\'{e}nager, Herv\'{e} and Soiland-Reyes, Stian and Gavrilovi\'{c}, Bogdan and Goble, Carole and Community, The CWL},
13+
title = {Methods Included: Standardizing Computational Reuse and Portability with the Common Workflow Language},
14+
year = {2022},
15+
issue_date = {June 2022},
16+
publisher = {Association for Computing Machinery},
17+
address = {New York, NY, USA},
18+
volume = {65},
19+
number = {6},
20+
issn = {0001-0782},
21+
url = {https://doi.org/10.1145/3486897},
22+
doi = {10.1145/3486897},
23+
abstract = {Standardizing computational reuse and portability with the Common Workflow Language.},
24+
journal = {Commun. ACM},
25+
month = {may},
26+
pages = {54–63},
27+
numpages = {10}
28+
}
29+
```
30+
31+
To cite just the CWL standards themselves, please use the following inclusive of the DOI:
32+
33+
Amstutz, Peter; Crusoe, Michael R; Tijanić, Nebojša; Chapman, Brad;
34+
Chilton, John; Heuer, Michael; Kartashov, Andrey; Kern, John; Leehr, Dan;
35+
Ménager, Hervé; Nedeljkovich, Maya; Scales, Matt; Soiland-Reyes, Stian;
36+
Stojanovic, Luka (2016): Common Workflow Language, v1.0. Specification,
37+
Common Workflow Language working group. https://w3id.org/cwl/v1.0/
38+
https://dx.doi.org/10.6084/m9.figshare.3115156.v2
39+
40+
```
41+
@data{cwl,
42+
doi = {10.6084/m9.figshare.3115156.v2},
43+
url = {https://doi.org/10.6084/m9.figshare.3115156.v2},
44+
author = {Peter Amstutz; Michael R. Crusoe; Nebojša Tijanić; Brad Chapman;
45+
John Chilton; Michael Heuer; Andrey Kartashov; John Kern; Dan Leehr;
46+
Hervé Ménager; Maya Nedeljkovich; Matt Scales; Stian Soiland-Reyes;
47+
Luka Stojanovic
48+
},
49+
publisher = {Figshare},
50+
institution = {Common Workflow Language working group},
51+
title = {Common Workflow Language, v1.0},
52+
year = {2016}
53+
}
54+
```
55+
56+
[//]: # (the above is from https://github.com/common-workflow-language/common-workflow-language/blob/main/CITATION.cff)
57+
58+
Our preferred DOI for the "CWL User Guide" is http://doi.org/10.5281/zenodo.840129
59+
60+
The latest DOI for the "CWL User Guide" is:
61+
[![DOI](https://zenodo.org/badge/89621457.svg)](https://zenodo.org/badge/latestdoi/89621457)

CODE_OF_CONDUCT.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
---
2-
layout: page
3-
title: "Contributor Code of Conduct"
4-
---
1+
# Code of Conduct
2+
53
As contributors and maintainers of this project,
64
we pledge to respect all people who contribute through reporting issues,
75
posting feature requests,
@@ -20,5 +18,3 @@ Anyone who violates this code of conduct may be sanctioned or expelled from
2018
these spaces at the discretion of the leadership team.
2119

2220
For more details, see the [complete CWL project code of conduct](https://github.com/common-workflow-language/common-workflow-language/blob/master/CODE_OF_CONDUCT.md).
23-
24-
{% include links.md %}

0 commit comments

Comments
 (0)