Skip to content

Commit bea9db9

Browse files
author
Trevor Keller
authored
Wrap files at 79 characters for cleaner diffs and readability (carpentries-incubator#323)
* wrap episodes (16 retains semantic breaks), wrap snippets * adjust CI/CD to check line lengths * couple other text fixes that got caught along the way (mebi, HTMLized dashes) Closes carpentries-incubator#282.
1 parent 6d411f2 commit bea9db9

File tree

142 files changed

+2589
-2247
lines changed

Some content is hidden

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

142 files changed

+2589
-2247
lines changed

.editorconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
root = true
2+
3+
[*]
4+
max_line_length = 79
5+
indent_size = 4
6+
indent_style = space
7+
charset = utf-8
8+
insert_final_newline = true
9+
trim_trailing_whitespace = true
10+
11+
[Makefile]
12+
indent_style = tab

.github/workflows/test_and_build.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ jobs:
3737
bundle config set path '.vendor/bundle'
3838
bundle config build.nokogiri --use-system-libraries
3939
bundle install
40+
- name: "Lint episode markdown"
41+
run: |
42+
find _episodes -name \*.md -exec bundle exec mdl -r MD001,MD003,MD005,MD006,MD007,MD008,MD009,MD010,MD011,MD012,MD015,MD016,MD017,MD018,MD019,MD020,MD021,MD022,MD023,MD025,MD035,MD036,MD037,MD038,MD039,MD046 {} \;
4043
- name: "Check lesson for warnings"
4144
run: |
4245
make lesson-check-all
@@ -74,3 +77,6 @@ jobs:
7477
- name: Check build ${{matrix.HPC_JEKYLL_CONFIG}}
7578
run: |
7679
make --always-make site HPC_JEKYLL_CONFIG=_includes/snippets_library/${{matrix.HPC_JEKYLL_CONFIG}}/_config_options.yml
80+
- name: "Lint snippet markdown"
81+
run: |
82+
find _includes/snippets_library/${{matrix.HPC_JEKYLL_CONFIG}} -name \*.snip -exec bundle exec mdl -r MD001,MD003,MD005,MD006,MD007,MD008,MD009,MD010,MD011,MD012,MD015,MD016,MD017,MD018,MD019,MD020,MD021,MD022,MD023,MD025,MD035,MD036,MD037,MD038,MD039,MD046 {} \;

CONTRIBUTING.md

Lines changed: 88 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,121 @@
11
# Contributing
22

3-
[Software Carpentry][swc-site] and [Data Carpentry][dc-site] are open source projects, and we
4-
welcome contributions of all kinds: new lessons, fixes to existing material, bug reports, and
5-
reviews of proposed changes are all welcome.
3+
[Software Carpentry][swc-site] and [Data Carpentry][dc-site] are open source
4+
projects, and we welcome contributions of all kinds: new lessons, fixes to
5+
existing material, bug reports, and reviews of proposed changes are all
6+
welcome.
67

78
## Contributor Agreement
89

9-
By contributing, you agree that we may redistribute your work under [our license](LICENSE.md). In
10-
exchange, we will address your issues and/or assess your change proposal as promptly as we can, and
11-
help you become a member of our community. Everyone involved in [Software Carpentry][swc-site] and
12-
[Data Carpentry][dc-site] agrees to abide by our [code of conduct](CODE_OF_CONDUCT.md).
10+
By contributing, you agree that we may redistribute your work under [our
11+
license](LICENSE.md). In exchange, we will address your issues and/or assess
12+
your change proposal as promptly as we can, and help you become a member of our
13+
community. Everyone involved in [Software Carpentry][swc-site] and [Data
14+
Carpentry][dc-site] agrees to abide by our [code of
15+
conduct](CODE_OF_CONDUCT.md).
1316

1417
## How to Contribute
1518

16-
The easiest way to get started is to file an issue to tell us about a spelling mistake, some awkward
17-
wording, or a factual error. This is a good way to introduce yourself and to meet some of our
18-
community members.
19+
The easiest way to get started is to file an issue to tell us about a spelling
20+
mistake, some awkward wording, or a factual error. This is a good way to
21+
introduce yourself and to meet some of our community members.
1922

20-
1. If you do not have a [GitHub][github] account, you can [send us comments by email][email].
21-
However, we will be able to respond more quickly if you use one of the other methods described
22-
below.
23+
1. If you do not have a [GitHub][github] account, you can [send us comments by
24+
email][email]. However, we will be able to respond more quickly if you use
25+
one of the other methods described below.
2326

24-
2. If you have a [GitHub][github] account, or are willing to [create one][github-join], but do not
25-
know how to use Git, you can report problems or suggest improvements by
26-
[creating an issue][issues]. This allows us to assign the item to someone and to respond to it
27-
in a threaded discussion.
27+
1. If you have a [GitHub][github] account, or are willing to [create
28+
one][github-join], but do not know how to use Git, you can report problems
29+
or suggest improvements by [creating an issue][issues]. This allows us to
30+
assign the item to someone and to respond to it in a threaded discussion.
2831

29-
3. If you are comfortable with Git, and would like to add or change material, you can submit a pull
30-
request (PR). Instructions for doing this are [included below](#using-github).
32+
1. If you are comfortable with Git, and would like to add or change material,
33+
you can submit a pull request (PR). Instructions for doing this are
34+
[included below](#using-github).
3135

3236
## Where to Contribute
3337

34-
1. If you wish to change this lesson, please work in <https://github.com/swcarpentry/FIXME>, which
35-
can be viewed at <https://swcarpentry.github.io/FIXME>.
38+
1. If you wish to change this lesson, please work in
39+
<https://github.com/carpentries-incubator/hpc-intro>, which can be viewed at
40+
<https://carpentries-incubator.github.io/hpc-intro>.
3641

37-
2. If you wish to change the example lesson, please work in
38-
<https://github.com/carpentries/lesson-example>, which documents the format of our lessons and
39-
can be viewed at <https://carpentries.github.io/lesson-example>.
42+
1. If you wish to change the example lesson, please work in
43+
<https://github.com/carpentries/lesson-example>, which documents the format
44+
of our lessons and can be viewed at
45+
<https://carpentries.github.io/lesson-example>.
4046

41-
3. If you wish to change the template used for workshop websites, please work in
42-
<https://github.com/carpentries/workshop-template>. The home page of that repository explains
43-
how to set up workshop websites, while the extra pages in
44-
<https://carpentries.github.io/workshop-template> provide more background on our design choices.
47+
1. If you wish to change the template used for workshop websites, please work
48+
in <https://github.com/carpentries/workshop-template>. The home page of that
49+
repository explains how to set up workshop websites, while the extra pages
50+
in <https://carpentries.github.io/workshop-template> provide more background
51+
on our design choices.
4552

46-
4. If you wish to change CSS style files, tools, or HTML boilerplate for lessons or workshops
47-
stored in `_includes` or `_layouts`, please work in <https://github.com/carpentries/styles>.
53+
1. If you wish to change CSS style files, tools, or HTML boilerplate for
54+
lessons or workshops stored in `_includes` or `_layouts`, please work in
55+
<https://github.com/carpentries/styles>.
4856

4957
## What to Contribute
5058

51-
There are many ways to contribute, from writing new exercises and improving existing ones to
52-
updating or filling in the documentation and submitting [bug reports][issues] about things that
53-
don't work, aren't clear, or are missing. If you are looking for ideas, please see the 'Issues' tab
54-
for a list of issues associated with this repository, or you may also look at the issues for
55-
[Data Carpentry][dc-issues] and [Software Carpentry][swc-issues] projects.
59+
There are many ways to contribute, from writing new exercises and improving
60+
existing ones to updating or filling in the documentation and submitting [bug
61+
reports][issues] about things that don't work, aren't clear, or are missing. If
62+
you are looking for ideas, please see the 'Issues' tab for a list of issues
63+
associated with this repository, or you may also look at the issues for [Data
64+
Carpentry][dc-issues] and [Software Carpentry][swc-issues] projects.
5665

57-
Comments on issues and reviews of pull requests are just as welcome: we are smarter together than we
58-
are on our own. Reviews from novices and newcomers are particularly valuable: it's easy for people
59-
who have been using these lessons for a while to forget how impenetrable some of this material can
60-
be, so fresh eyes are always welcome.
66+
Comments on issues and reviews of pull requests are just as welcome: we are
67+
smarter together than we are on our own. Reviews from novices and newcomers are
68+
particularly valuable: it's easy for people who have been using these lessons
69+
for a while to forget how impenetrable some of this material can be, so fresh
70+
eyes are always welcome.
6171

6272
## What *Not* to Contribute
6373

64-
Our lessons already contain more material than we can cover in a typical workshop, so we are usually
65-
*not* looking for more concepts or tools to add to them. As a rule, if you want to introduce a new
66-
idea, you must (a) estimate how long it will take to teach and (b) explain what you would take out
67-
to make room for it. The first encourages contributors to be honest about requirements; the second,
68-
to think hard about priorities.
74+
Our lessons already contain more material than we can cover in a typical
75+
workshop, so we are usually *not* looking for more concepts or tools to add to
76+
them. As a rule, if you want to introduce a new idea, you must (a) estimate how
77+
long it will take to teach and (b) explain what you would take out to make room
78+
for it. The first encourages contributors to be honest about requirements; the
79+
second, to think hard about priorities.
6980

70-
We are also not looking for exercises or other material that only run on one platform. Our workshops
71-
typically contain a mixture of Windows, macOS, and Linux users; in order to be usable, our lessons
72-
must run equally well on all three.
81+
We are also not looking for exercises or other material that only run on one
82+
platform. Our workshops typically contain a mixture of Windows, macOS, and
83+
Linux users; in order to be usable, our lessons must run equally well on all
84+
three.
7385

7486
## Using GitHub
7587

76-
If you choose to contribute via GitHub, you may want to look at
77-
[How to Contribute to an Open Source Project on GitHub][how-contribute]. To manage changes, we
78-
follow [GitHub flow][github-flow]. Each lesson has two maintainers who review issues and pull
79-
requests or encourage others to do so. The maintainers are community volunteers and have final say
80-
over what gets merged into the lesson. To use the web interface for contributing to a lesson:
81-
82-
1. Fork the originating repository to your GitHub profile.
83-
2. Within your version of the forked repository, move to the `gh-pages` branch and create a new
84-
branch for each significant change being made.
85-
3. Navigate to the file(s) you wish to change within the new branches and make revisions as
86-
required.
87-
4. Commit all changed files within the appropriate branches.
88-
5. Create individual pull requests from each of your changed branches
89-
to the `gh-pages` branch within the originating repository.
90-
6. If you receive feedback, make changes using your issue-specific branches of the forked
91-
repository and the pull requests will update automatically.
92-
7. Repeat as needed until all feedback has been addressed.
93-
94-
When starting work, please make sure your clone of the originating `gh-pages` branch is up-to-date
95-
before creating your own revision-specific branch(es) from there. Additionally, please only work
96-
from your newly-created branch(es) and *not* your clone of the originating `gh-pages` branch.
97-
Lastly, published copies of all the lessons are available in the `gh-pages` branch of the
98-
originating repository for reference while revising.
88+
If you choose to contribute via GitHub, you may want to look at [How to
89+
Contribute to an Open Source Project on GitHub][how-contribute]. To manage
90+
changes, we follow [GitHub flow][github-flow]. Each lesson has two maintainers
91+
who review issues and pull requests or encourage others to do so. The
92+
maintainers are community volunteers and have final say over what gets merged
93+
into the lesson. To use the web interface for contributing to a lesson:
94+
95+
1. Fork the originating repository to your GitHub profile.
96+
1. Within your version of the forked repository, move to the `gh-pages` branch
97+
and create a new branch for each significant change being made.
98+
1. Navigate to the file(s) you wish to change within the new branches and make
99+
revisions as required.
100+
1. Commit all changed files within the appropriate branches.
101+
1. Create individual pull requests from each of your changed branches to the
102+
`gh-pages` branch within the originating repository.
103+
1. If you receive feedback, make changes using your issue-specific branches of
104+
the forked repository and the pull requests will update automatically.
105+
1. Repeat as needed until all feedback has been addressed.
106+
107+
When starting work, please make sure your clone of the originating `gh-pages`
108+
branch is up-to-date before creating your own revision-specific branch(es) from
109+
there. Additionally, please only work from your newly-created branch(es) and
110+
*not* your clone of the originating `gh-pages` branch. Lastly, published copies
111+
of all the lessons are available in the `gh-pages` branch of the originating
112+
repository for reference while revising.
99113

100114
## Other Resources
101115

102-
General discussion of [Software Carpentry][swc-site] and [Data Carpentry][dc-site] happens on the
103-
[discussion mailing list][discuss-list], which everyone is welcome to join. You can also
104-
[reach us by email][email].
116+
General discussion of [Software Carpentry][swc-site] and [Data
117+
Carpentry][dc-site] happens on the [discussion mailing list][discuss-list],
118+
which everyone is welcome to join. You can also [reach us by email][email].
105119

106120
[email]: mailto:admin@software-carpentry.org
107121
[dc-issues]: https://github.com/issues?q=user%3Adatacarpentry
@@ -116,3 +130,4 @@ General discussion of [Software Carpentry][swc-site] and [Data Carpentry][dc-sit
116130
[swc-issues]: https://github.com/issues?q=user%3Aswcarpentry
117131
[swc-lessons]: https://software-carpentry.org/lessons/
118132
[swc-site]: https://software-carpentry.org/
133+

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
source "https://rubygems.org"
22
gem "github-pages", group: :jekyll_plugins
33
gem "kramdown-parser-gfm"
4+
gem "mdl"

LICENSE.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
---
22
title: "Licenses"
33
---
4+
5+
# CC BY 4.0
6+
47
## Instructional Material
58

69
All High Performance Computing Carpentry instructional material is
@@ -24,7 +27,7 @@ Under the following terms:
2427
* **Attribution**---You must give appropriate credit (mentioning that
2528
your work is derived from work that is Copyright © Software
2629
Carpentry and, where practical, linking to
27-
http://software-carpentry.org/), provide a [link to the
30+
<http://software-carpentry.org/>), provide a [link to the
2831
license][cc-by-human], and indicate if changes were made. You may do
2932
so in any reasonable manner, but not in any way that suggests the
3033
licensor endorses you or your use.

MAINTENANCE.md

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,40 +34,37 @@ There is also a [repo][mainsite-repo] for the main website covering
3434
all HPC-Carpentry activities. This is intended to be the "front door"
3535
of the HPC Carpentry community.
3636

37-
### Slack:
37+
### Slack
3838

3939
The main Carpentries Slack channel is reachable at
4040
[swcarpentry.slack.com][swc-slack]. To become a member, you can
4141
trigger in invitation from [here][slack-invite].
4242

4343
You can go directly to the HPC Carpentry sub-channel at
44-
[#hpc-carpentry][hpc-slack]. These are the things to bookmark — once
45-
you go there, the Slack engine redirects you to particular views, so
46-
cutting/pasting URLs out of the browser's location bar is likely to be
47-
disappointing.
44+
[#hpc-carpentry][hpc-slack]. These are the things to bookmark &mdash;
45+
once you go there, the Slack engine redirects you to particular views,
46+
so copying and pasting URLs out of the browser's location bar is
47+
likely to be disappointing.
4848

4949
Members of existing swcarpentry Slack channels can find the channel by
5050
typing "hpc-carpentry" into the Slack search box.
5151

52-
53-
### E-mail:
52+
### E-mail
5453

5554
The top-level site is on The Carpentries' [Topicbox][topicbox]. There
5655
are two HPC-specific lists, "discuss-hpc" and "maintainers-hpc". These
5756
mailing lists are public: you may join any that catch your interest.
5857
The system does not use passwords; log-ins are via a verification code
5958
sent to your e-mail.
6059

61-
6260
## Site Operation
6361

64-
### DOIs for Releases
62+
### DOIs for Releases
6563

6664
There is a web-hook that calls out to [Zenodo][zenodo] to create a
6765
Digital Object Identifier (DOI) whenever a release is generated on the
6866
GitHub repo. The Zenodo account is owned by Peter Steinbach (@psteinb).
6967

70-
7168
### Continuous Integration
7269

7370
The high-level lesson structure is described reasonably well in the

0 commit comments

Comments
 (0)