Skip to content

Commit 70f64f4

Browse files
committed
Merge remote-tracking branch 'origin/master' into episode03_configuration
2 parents 3ee6ff5 + 79ae749 commit 70f64f4

File tree

10 files changed

+203
-154
lines changed

10 files changed

+203
-154
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: bug
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is. If this issue is about a specific episode, please provide its link or filename.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
name: Suggestion
3+
about: Suggest a feature for the tutorial repository
4+
title: ''
5+
labels: enhancement, feature
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature related to a problem? Please describe.**
11+
A clear and concise description of what the problem is.
12+
13+
**Would you be able to help out?**
14+
Would you have the time and skills to implement the solution yourself?
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
name: New lesson material
3+
about: Develop lessons
4+
title: ''
5+
labels: enhancement, lesson
6+
assignees: ''
7+
8+
---
9+
10+
**Short description of the material**
11+
Add a short description of the material that you would like to add.
12+
13+
**Branch and pull request**
14+
Once you've started working, add the branch (and pull request) link.

.github/ISSUE_TEMPLATE/q_and_a.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
name: Question and answer
3+
about: Ask your questions
4+
title: ''
5+
labels: question
6+
assignees: ''
7+
8+
---
9+
10+
**How can we help?**
11+
Please write your questions in this issue. We are here to answer.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,25 @@
1-
Please delete this line and the text below before submitting your contribution.
1+
# Pull Request checklist
22

3-
---
3+
We appreciate your time and effort to improve the tutorial. Please keep in mind that lesson maintainers are volunteers and it may be some time before they can respond to your contribution.
44

5-
Thanks for contributing! If this contribution is for instructor training, please send an email to [email protected] with a link to this contribution so we can record your progress. You’ve completed your contribution step for instructor checkout just by submitting this contribution.
5+
* * *
66

7-
Please keep in mind that lesson maintainers are volunteers and it may be some time before they can respond to your contribution. Although not all contributions can be incorporated into the lesson materials, we appreciate your time and effort to improve the curriculum. If you have any questions about the lesson maintenance process or would like to volunteer your time as a contribution reviewer, please contact The Carpentries Team at [email protected].
7+
## Before you start
88

9-
---
9+
- [ ] Read [CONTRIBUTING.md](https://github.com/ESMValGroup/tutorial/blob/master/CONTRIBUTING.md).
10+
- [ ] Create an [issue](https://github.com/ESMValGroup/tutorial/issues) to discuss your idea. This allows your contributions to be incorporated into the tutorial.
11+
12+
## Tasks
13+
14+
- [ ] Give this pull request a descriptive title.
15+
- [ ] If you are contributing to existing lesson materials, please make sure the content conforms to the `Lesson development` section in [CONTRIBUTING.md](https://github.com/ESMValGroup/tutorial/blob/master/CONTRIBUTING.md) and does not contain any spelling or grammatical errors.
16+
- [ ] If you are making a new episode, please make sure the content conforms to the `Lesson organization` and `Lesson formatting` sections in [CONTRIBUTING.md](https://github.com/ESMValGroup/tutorial/blob/master/CONTRIBUTING.md) and does not contain any spelling or grammatical errors.
17+
- [ ] Preferably Codacy checks pass. Status can be seen below your pull request. If there is an error, click the link to find out why.
18+
- [ ] Preview changes on your machine before pushing them to GitHub by running `make serve`, alternatively `make docker-serve`. Please see the `Previewing your changes locally` section in [CONTRIBUTING.md](https://github.com/ESMValGroup/tutorial/blob/master/CONTRIBUTING.md) for installation instructions.
19+
- [ ] All code instructions have been tested.
20+
21+
If you need help with any of the tasks above, please do not hesitate to ask by commenting in the issue or pull request.
22+
23+
* * *
24+
25+
Closes {Link to the corresponding issue}

CONTRIBUTING.md

Lines changed: 120 additions & 137 deletions
Original file line numberDiff line numberDiff line change
@@ -1,151 +1,134 @@
1-
# Contributing
1+
# Contributing to ESMValTool tutorial
22

3-
[The Carpentries][c-site] ([Software Carpentry][swc-site], [Data Carpentry][dc-site], and [Library Carpentry][lc-site]) are open source projects,
4-
and we welcome contributions of all kinds:
5-
new lessons,
6-
fixes to existing material,
7-
bug reports,
8-
and reviews of proposed changes are all welcome.
3+
[ESMValTool][tutorial-site] tutorial is an open-source project in [ESMValGroup][ESMValTool-site] and we greatly value contributions of all kinds: fixes to this tutorial, bug reports, reviews of pull requests, infrastructure improvements, community help, and outreach. We value the time you invest in contributing and strive to make the process as easy as possible. If you have suggestions for improving the process of contributing, please open an [issue][issues]. To do so, click on `New issue` in the `issues` tab of this repository and choose the `Suggestion` template.
94

10-
## Contributor Agreement
5+
## Acknowledgement
116

12-
By contributing,
13-
you agree that we may redistribute your work under [our license](LICENSE.md).
14-
In exchange,
15-
we will address your issues and/or assess your change proposal as promptly as we can,
16-
and help you become a member of our community.
17-
Everyone involved in [The Carpentries][c-site]
18-
agrees to abide by our [code of conduct](CODE_OF_CONDUCT.md).
7+
The format of this tutorial is based on the [Software Carpentry][swc-site], which is an open-source project.
8+
9+
## Agreement
10+
11+
By contributing, you agree that we may redistribute your work under [our license](LICENSE.md).
12+
In exchange, we will address your issues and/or assess your change proposal as promptly as we can, and help you become a member of our community.
13+
Everyone involved in this [tutorial](tutorial-repo) agrees to abide by our [code of conduct](CODE_OF_CONDUCT.md).
1914

2015
## How to Contribute
2116

22-
The easiest way to get started is to file an issue
23-
to tell us about a spelling mistake,
24-
some awkward wording,
25-
or a factual error.
26-
This is a good way to introduce yourself
17+
There are many ways to contribute:
18+
19+
* If you do not have a [GitHub][github] account,
20+
you can send us comments by [email][email].
21+
However,
22+
we will be able to respond more quickly when you use one of the other methods described below.
23+
24+
* If you have a [GitHub][github] account, work in this [repository][tutorial-repo],
25+
which can be viewed at the tutorial [site][tutorial-site].
26+
You can ask your questions, report problems or suggest improvements by [creating an issue][issues].
27+
This is the easiest way to tell us about your ideas, and a good way to introduce yourself
2728
and to meet some of our community members.
29+
This allows us to assign the item to someone and to respond to it in a threaded discussion.
30+
To open an issue, click on `New issue` in the `issues` tab of this repository and choose a template from the [list](https://github.com/ESMValGroup/tutorial/issues/new/choose) as described below:
31+
* for asking a question, please use `Question and answer`.
32+
* for reporting a bug, please use `Bug reports`.
33+
* for developing lesson material, please use `New lesson material`.
34+
* for adding a feature to the repository, please use `Suggestion`.
35+
36+
* If you would like to add what is already discussed in an issue,
37+
you can submit a [pull request][PR] and make use of the `pull request checklist`.
38+
Each pull request is reviewed at least by one reviewer who is a community volunteer.
39+
The [maintainers][tutorial-maintainers] have final say over what gets merged into the tutorial.
40+
41+
## Tutorial guidelines
42+
43+
This section demonstrates all the instructions for developing a lesson in the [ESMValTool tutorial][tutorial-site].
44+
The tutorial is a set of lessons (or episodes) that together teach **basic** skills needed to work with [ESMValTool][ESMValTool-doc] in climate-related domains.
45+
46+
### Lesson development
47+
48+
The content of this tutorial is mainly developed based on the [Carpentries Curriculum Development Handbook][swc-handbook]. The handbook explains why we teach the way we do, and why our lessons are designed the way they are.
49+
If you are contributing to existing lesson materials, please make sure the content conforms to the concepts provided in the handbook.
50+
51+
We recommend using software to check spelling or grammatical errors.
52+
The following link will guide you through a list of tools for several editors:
53+
<http://wiki.languagetool.org/software-that-supports-languagetool-as-a-plug-in-or-add-on>
54+
55+
### Lesson organization
56+
57+
Each lesson is made up of episodes, which are focused on a particular topic and include time for both teaching and exercises. If you are making a new episode, please make sure the content conforms to the [Carpentries lesson organization][swc-lesson-organization].
58+
59+
### Lesson formatting
60+
61+
Episodes are [Markdown](https://en.wikipedia.org/wiki/Markdown) files. If you are making a new episode or contributing to existing ones, please make sure the content conforms to the [Carpentries lesson formatting][swc-lesson-formatting].
62+
63+
We also, recommend using a linter to check errors in Markdown files.
64+
For example, a [markdownlint](https://marketplace.visualstudio.com/items?itemName=DavidAnson.vscode-markdownlint) can be installed as an extension in [Visual Studio Code](https://code.visualstudio.com/).
65+
Alternatively, a linter can be installed with:
66+
67+
```bash
68+
gem install mdl
69+
```
70+
71+
and can be used as:
72+
73+
```bash
74+
mdl your_markdown_filename
75+
```
76+
77+
### Previewing your changes locally
78+
79+
If you are making a new episode or contributing to existing ones,
80+
please preview changes on your machine before submitting a [pull request][PR].
81+
To do so, you need to install the software described below:
82+
83+
```bash
84+
# apt (Ubuntu/Devian)
85+
sudo apt install ruby-dev ruby-bundler
86+
```
87+
88+
or
89+
90+
```bash
91+
# dnf (Fedora/Redhat)
92+
sudo dnf install rubygem-bundler ruby-devel
93+
```
94+
95+
Alternatively, there is an environment file available which can be installed with:
96+
97+
```bash
98+
conda env create -f environment.yml -n esmvaltool_tutorial
99+
```
100+
101+
To install the required ruby packages, run the following command in the tutorial's
102+
main directory to build and serve the website locally:
103+
104+
```bash
105+
make serve
106+
```
107+
108+
The output on the terminal will contain a line similar to:
109+
110+
```bash
111+
Server address: http://127.0.0.1:4000
112+
```
28113

29-
1. If you do not have a [GitHub][github] account,
30-
you can [send us comments by email][email].
31-
However,
32-
we will be able to respond more quickly if you use one of the other methods described below.
33-
34-
2. If you have a [GitHub][github] account,
35-
or are willing to [create one][github-join],
36-
but do not know how to use Git,
37-
you can report problems or suggest improvements by [creating an issue][issues].
38-
This allows us to assign the item to someone
39-
and to respond to it in a threaded discussion.
40-
41-
3. If you are comfortable with Git,
42-
and would like to add or change material,
43-
you can submit a pull request (PR).
44-
Instructions for doing this are [included below](#using-github).
45-
46-
## Where to Contribute
47-
48-
1. If you wish to change this lesson,
49-
please work in <https://github.com/swcarpentry/FIXME>,
50-
which can be viewed at <https://swcarpentry.github.io/FIXME>.
51-
52-
2. If you wish to change the example lesson,
53-
please work in <https://github.com/carpentries/lesson-example>,
54-
which documents the format of our lessons
55-
and can be viewed at <https://carpentries.github.io/lesson-example>.
56-
57-
3. If you wish to change the template used for workshop websites,
58-
please work in <https://github.com/carpentries/workshop-template>.
59-
The home page of that repository explains how to set up workshop websites,
60-
while the extra pages in <https://carpentries.github.io/workshop-template>
61-
provide more background on our design choices.
62-
63-
4. If you wish to change CSS style files, tools,
64-
or HTML boilerplate for lessons or workshops stored in `_includes` or `_layouts`,
65-
please work in <https://github.com/carpentries/styles>.
66-
67-
## What to Contribute
68-
69-
There are many ways to contribute,
70-
from writing new exercises and improving existing ones
71-
to updating or filling in the documentation
72-
and submitting [bug reports][issues]
73-
about things that don't work, aren't clear, or are missing.
74-
If you are looking for ideas, please see the 'Issues' tab for
75-
a list of issues associated with this repository,
76-
or you may also look at the issues for [Data Carpentry][dc-issues],
77-
[Software Carpentry][swc-issues], and [Library Carpentry][lc-issues] projects.
78-
79-
Comments on issues and reviews of pull requests are just as welcome:
80-
we are smarter together than we are on our own.
81-
Reviews from novices and newcomers are particularly valuable:
82-
it's easy for people who have been using these lessons for a while
83-
to forget how impenetrable some of this material can be,
84-
so fresh eyes are always welcome.
85-
86-
## What *Not* to Contribute
87-
88-
Our lessons already contain more material than we can cover in a typical workshop,
89-
so we are usually *not* looking for more concepts or tools to add to them.
90-
As a rule,
91-
if you want to introduce a new idea,
92-
you must (a) estimate how long it will take to teach
93-
and (b) explain what you would take out to make room for it.
94-
The first encourages contributors to be honest about requirements;
95-
the second, to think hard about priorities.
96-
97-
We are also not looking for exercises or other material that only run on one platform.
98-
Our workshops typically contain a mixture of Windows, macOS, and Linux users;
99-
in order to be usable,
100-
our lessons must run equally well on all three.
101-
102-
## Using GitHub
103-
104-
If you choose to contribute via GitHub, you may want to look at
105-
[How to Contribute to an Open Source Project on GitHub][how-contribute].
106-
To manage changes, we follow [GitHub flow][github-flow].
107-
Each lesson has two maintainers who review issues and pull requests or encourage others to do so.
108-
The maintainers are community volunteers and have final say over what gets merged into the lesson.
109-
To use the web interface for contributing to a lesson:
110-
111-
1. Fork the originating repository to your GitHub profile.
112-
2. Within your version of the forked repository, move to the `gh-pages` branch and
113-
create a new branch for each significant change being made.
114-
3. Navigate to the file(s) you wish to change within the new branches and make revisions as required.
115-
4. Commit all changed files within the appropriate branches.
116-
5. Create individual pull requests from each of your changed branches
117-
to the `gh-pages` branch within the originating repository.
118-
6. If you receive feedback, make changes using your issue-specific branches of the forked
119-
repository and the pull requests will update automatically.
120-
7. Repeat as needed until all feedback has been addressed.
121-
122-
When starting work, please make sure your clone of the originating `gh-pages` branch is up-to-date
123-
before creating your own revision-specific branch(es) from there.
124-
Additionally, please only work from your newly-created branch(es) and *not*
125-
your clone of the originating `gh-pages` branch.
126-
Lastly, published copies of all the lessons are available in the `gh-pages` branch of the originating
127-
repository for reference while revising.
114+
This address can be opened in your browser to preview the tutorial website.
128115

129116
## Other Resources
130117

131-
General discussion of [Software Carpentry][swc-site] and [Data Carpentry][dc-site]
132-
happens on the [discussion mailing list][discuss-list],
133-
which everyone is welcome to join.
134-
You can also [reach us by email][email].
118+
General discussion of the tutorial happens in `User Engagement Team`.
119+
You can reach us by [email][email].
135120

136-
[email]: mailto:[email protected]
137-
[dc-issues]: https://github.com/issues?q=user%3Adatacarpentry
138-
[dc-lessons]: http://datacarpentry.org/lessons/
139-
[dc-site]: http://datacarpentry.org/
140-
[discuss-list]: http://lists.software-carpentry.org/listinfo/discuss
121+
[email]: mailto:TODO_FIX_ME
122+
[ESMValTool-site]: https://www.esmvaltool.org/
123+
[ESMValTool-doc]: https://esmvaltool.readthedocs.io/en/latest/
124+
[tutorial-repo]: https://esmvalgroup.github.io/tutorial/
125+
[tutorial-site]: https://esmvalgroup.github.io/tutorial
126+
[tutorial-maintainers]: https://github.com/ESMValGroup/tutorial#maintainers
141127
[github]: https://github.com
142-
[github-flow]: https://guides.github.com/introduction/flow/
143-
[github-join]: https://github.com/join
144-
[how-contribute]: https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github
145-
[issues]: https://guides.github.com/features/issues/
146-
[swc-issues]: https://github.com/issues?q=user%3Aswcarpentry
147-
[swc-lessons]: https://software-carpentry.org/lessons/
128+
[issues]: https://github.com/ESMValGroup/tutorial/issues
129+
[PR]: https://github.com/ESMValGroup/tutorial/pulls
148130
[swc-site]: https://software-carpentry.org/
149-
[c-site]: https://carpentries.org/
150-
[lc-site]: https://librarycarpentry.org/
151-
[lc-issues]: https://github.com/issues?q=user%3Alibrarycarpentry
131+
[swc-handbook]: https://carpentries.github.io/curriculum-development/
132+
[swc-lesson-organization]: https://carpentries.github.io/lesson-example/03-organization/index.html
133+
[swc-lesson-formatting]: https://carpentries.github.io/lesson-example/04-formatting/index.html
134+
[ea-site]: https://github.com/escience-academy

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# FIXME Lesson title
22

3-
[![Create a Slack Account with us](https://img.shields.io/badge/Create_Slack_Account-The_Carpentries-071159.svg)](https://swc-slack-invite.herokuapp.com/)
3+
[![Create a Slack Account with us](https://img.shields.io/badge/Create_Slack_Account-The_Carpentries-071159.svg)](https://swc-slack-invite.herokuapp.com/) [![Join the chat at https://gitter.im/ESMValGroup/Tutorial](https://badges.gitter.im/ESMValGroup/Tutorial.svg)](https://gitter.im/ESMValGroup/Tutorial?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
44

55
This repository generates the corresponding lesson website from [The Carpentries](https://carpentries.org/) repertoire of lessons.
66

_episodes/06-creating-a-diagnostic-script.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,7 @@ FIXME
1313

1414
{% include links.md %}
1515

16+
Important part here is to introduce the standard tools that allow users to access ESMValTool settings configs.
17+
18+
19+
This file should be renamed to advanced: creating a diagnostic

environment.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
name: esmvaltool_tutorial
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
- gxx_linux-64
6+
- rb-nokogiri
7+
- ruby

0 commit comments

Comments
 (0)