Skip to content

Commit

Permalink
Merge pull request #68 from the-turing-way/main
Browse files Browse the repository at this point in the history
[pull] main from the-turing-way:main
  • Loading branch information
BatoolMM authored Nov 8, 2023
2 parents 54f0a93 + 28a8edc commit 0aedd63
Show file tree
Hide file tree
Showing 30 changed files with 1,443 additions and 157 deletions.
84 changes: 83 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,8 @@
"contributions": [
"ideas",
"doc",
"review"
"review",
"eventOrganizing"
]
},
{
Expand Down Expand Up @@ -4343,6 +4344,87 @@
"contributions": [
"ideas"
]
},
{
"login": "benvanwerkhoven",
"name": "Ben van Werkhoven",
"avatar_url": "https://avatars.githubusercontent.com/u/2337546?v=4",
"profile": "https://github.com/benvanwerkhoven",
"contributions": [
"content"
]
},
{
"login": "drjwbaker",
"name": "James Baker",
"avatar_url": "https://avatars.githubusercontent.com/u/4965300?v=4",
"profile": "http://cradledincaricature.com/",
"contributions": [
"content"
]
},
{
"login": "arya1302",
"name": "Arya A",
"avatar_url": "https://avatars.githubusercontent.com/u/73542599?v=4",
"profile": "https://github.com/arya1302",
"contributions": [
"code",
"review",
"doc",
"bug",
"content",
"ideas",
"infra",
"userTesting",
"test"
]
},
{
"login": "JaroCamphuijsen",
"name": "Jaro Camphuijsen",
"avatar_url": "https://avatars.githubusercontent.com/u/12695232?v=4",
"profile": "https://github.com/JaroCamphuijsen",
"contributions": [
"content"
]
},
{
"login": "penyuan",
"name": "penyuan",
"avatar_url": "https://avatars.githubusercontent.com/u/13352427?v=4",
"profile": "https://www.penonek.com/",
"contributions": [
"content"
]
},
{
"login": "ljcolling",
"name": "Lincoln Colling",
"avatar_url": "https://avatars.githubusercontent.com/u/21215217?v=4",
"profile": "http://research.colling.net.nz",
"contributions": [
"content"
]
},
{
"login": "sadielbartholomew",
"name": "Sadie L. Bartholomew",
"avatar_url": "https://avatars.githubusercontent.com/u/30274190?v=4",
"profile": "http://sadielbartholomew.github.io",
"contributions": [
"content",
"review"
]
},
{
"login": "ereynaud",
"name": "Emmanuel G. REYNAUD",
"avatar_url": "https://avatars.githubusercontent.com/u/12295393?v=4",
"profile": "https://github.com/ereynaud",
"contributions": [
"ideas"
]
}
],
"projectName": "the-turing-way",
Expand Down
6 changes: 3 additions & 3 deletions .github/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# Comment to be posted to on first time issues
newIssueWelcomeComment: >
[![Welcome Banner](https://zenodo.org/api/iiif/v2/0c0188d3-d03c-4830-a6e3-00405f5c22fa:8ff47a85-7250-4d86-8e48-2f346b48b2c1:BannerWelcome.jpg/full/750,/0/default.jpg)](https://zenodo.org/record/3695300)
[![Welcome Banner](https://zenodo.org/api/iiif/record:3695300:BannerWelcome.jpg/full/!750,750/0/default.jpg)](https://zenodo.org/record/3695300)
:tada: Welcome to _The Turing Way_! :tada:
We're really excited to have your input into the project! :sparkling_heart:
Expand All @@ -16,7 +16,7 @@ newIssueWelcomeComment: >

# Comment to be posted to on PRs from first time contributors in your repository
newPRWelcomeComment: >
[![Thank You Banner](https://zenodo.org/api/iiif/v2/0c0188d3-d03c-4830-a6e3-00405f5c22fa:7fbd97cf-283b-480c-b8e1-11866e26245c:BannerThanks.jpg/full/750,/0/default.jpg)](https://zenodo.org/record/3695300)
[![Thank You Banner](https://zenodo.org/api/iiif/record:3695300:BannerThanks.jpg/full/!750,750/0/default.jpg)](https://zenodo.org/record/3695300)
:sparkling_heart: Thanks for opening this pull request! :sparkling_heart:
_The Turing Way_ community really appreciates your time and effort to contribute to the project.
Expand All @@ -40,7 +40,7 @@ newPRWelcomeComment: >

# Comment to be posted to on pull requests merged by a first time user
firstPRMergeComment: >
[![Congratulations Banner](https://zenodo.org/api/iiif/v2/0c0188d3-d03c-4830-a6e3-00405f5c22fa:32fbdb89-ae1b-434e-830c-88ade86724cc:BannerCongratulations.jpg/full/750,/0/default.jpg)](https://zenodo.org/record/3695300)
[![Congratulations Banner](https://zenodo.org/api/iiif/record:3695300:BannerCongratulations.jpg/full/!750,750/0/default.jpg)](https://zenodo.org/record/3695300)
Congrats on merging your first pull request! :tada:
We here at _The Turing Way_ are proud of you! :sparkling_heart:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/external_link_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ jobs:
with:
args: --config './lychee.toml' --no-progress 'book/website/_build/html/**/*.html'
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} # Use runners GitHub token to avoid rate limiting
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} # Use runner's GitHub token to avoid rate limiting

- name: Concatenate Lychee output with issue heaser
- name: Concatenate Lychee output with issue header
run: |
cat .github/workflows/resources/external_link_check_header.md lychee/out.md > issue_text.md
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -325,12 +325,12 @@ GitHub has a [nice introduction][github-flow] to the pull request workflow, but
- Edit the chapter for style.
- Once the first draft of the chapter is complete change [WIP] in the pull request title to [Ready for review].
- Add a comment on the pull request indicating that this chapter is ready for high-level review, i.e discussion of changes of the scale of a paragraph or larger such as adding material and restructuring sections.
- Discuss and make these high-level changes on this pull request. Once this is complete merge the chapter into The Alan Turing Intitute's version of the chapter branch.
- Make another pull request from your fork's version of the branch to The Alan Turing Institute's version of the branch. Title this "[Ready for review] Chapter_name chapter- low-level reviews".
- Discuss and make these high-level changes on this pull request. Once this is complete merge the chapter into The _The Turing Way_'s version of the chapter branch.
- Make another pull request from your fork's version of the branch to _The Turing Way_'s version of the branch. Title this "[Ready for review] Chapter_name chapter- low-level reviews".
- Discuss and make low-level changes to the chapter on this pull request, such as rewording sentences, typos and the like.
- This division of the pull requests into high and low-level changes stops discussion threads from becoming unmanageable.
- Once this is complete merge the pull request into The Alan Turing Intitute's version of the chapter branch.
- Merge The Alan Turing Intitute's version of the chapter branch into The Alan Turing Institute's main branch.
- Once this is complete merge the pull request into _The Turing Way_'s version of the chapter branch.
- Merge _The Turing Way_'s version of the chapter branch into _The Turing Way_'s main branch.
- DO not delete the branch as the chapter may continue to undergo improvement and development in the future.

## Local development
Expand Down
Loading

0 comments on commit 0aedd63

Please sign in to comment.