Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sorting the lessons as they are provided #228

Merged
merged 6 commits into from
Sep 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/python/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ git+https://github.com/jakevdp/JSAnimation.git
# https://github.com/jupyter/nbgrader/issues/1373#issuecomment-702798246
jupyter-client==6.1.12
# https://github.com/jupyter/jupyter_client/issues/637
git+https://github.com/ucl-rits/greeter.git
git+https://github.com/UCL-ARC-RSEing-with-Python/greeter.git
line_profiler
8 changes: 4 additions & 4 deletions ch02git/01Intro.ipynb → ch00git/01Intro.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
{
"data": {
"text/plain": [
"'/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git'"
"'/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git'"
]
},
"execution_count": 4,
Expand All @@ -318,7 +318,7 @@
{
"data": {
"text/plain": [
"'/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git'"
"'/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git'"
]
},
"execution_count": 5,
Expand Down Expand Up @@ -440,8 +440,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
"/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git/git_example\n",
"Initialized empty Git repository in /Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git/git_example/.git/\n"
"/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git/git_example\n",
"Initialized empty Git repository in /Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git/git_example/.git/\n"
]
}
],
Expand Down
18 changes: 9 additions & 9 deletions ch02git/02Solo.ipynb → ch00git/02Solo.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
{
"data": {
"text/plain": [
"'/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git/git_example'"
"'/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git/git_example'"
]
},
"execution_count": 1,
Expand Down Expand Up @@ -233,7 +233,7 @@
"outputs": [],
"source": [
"%%bash\n",
"git config --global core.editor vim "
"git config --global core.editor nano"
]
},
{
Expand Down Expand Up @@ -276,7 +276,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"To configure Notepad++ on windows you'll need something like the below, ask a demonstrator to help for your machine."
"To configure VS Code on your operating system you'll need something like the below, ask a demonstrator to help for your machine."
]
},
{
Expand All @@ -299,7 +299,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"I'm going to be using `vim` as my editor, but you can use whatever editor you prefer. Find how to setup your favourite editor in [the setup chapter of Software Carpentry's Git lesson](http://swcarpentry.github.io/git-novice/02-setup/index.html)."
"I'm going to be using `nano` as my editor, but you can use whatever editor you prefer. Find how to setup your favourite editor in [the setup chapter of Software Carpentry's Git lesson](https://swcarpentry.github.io/git-novice/02-setup.html)."
]
},
{
Expand Down Expand Up @@ -407,7 +407,7 @@
"source": [
"Let's edit the file again:\n",
"\n",
" vim index.md"
" nano index.md"
]
},
{
Expand Down Expand Up @@ -891,7 +891,7 @@
"metadata": {},
"source": [
"```bash\n",
"vim index.md\n",
"nano index.md\n",
"```"
]
},
Expand Down Expand Up @@ -1112,7 +1112,7 @@
"participant \"Cleese's index\" as I\n",
"participant Cleese as C\n",
"\n",
"note right of C: vim index.md\n",
"note right of C: nano index.md\n",
"\n",
"note right of C: git init\n",
"C->R: create\n",
Expand All @@ -1124,14 +1124,14 @@
"note right of C: git commit\n",
"I->R: Commit content of index.md\n",
"\n",
"note right of C: vim index.md\n",
"note right of C: nano index.md\n",
"\n",
"note right of C: git add --update\n",
"C->I: Add content of index.md\n",
"note right of C: git commit -m \"Add a lie\"\n",
"I->R: Commit change to index.md\n",
"\n",
"note right of C: vim index.md\n",
"note right of C: nano index.md\n",
"note right of C: git commit -am \"Change title\"\n",
"C->R: Add and commit change to index.md (and all tracked files)\n",
"\"\"\"\n",
Expand Down
2 changes: 1 addition & 1 deletion ch02git/03Mistakes.ipynb → ch00git/03Mistakes.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
{
"data": {
"text/plain": [
"'/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git/git_example'"
"'/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git/git_example'"
]
},
"execution_count": 1,
Expand Down
12 changes: 6 additions & 6 deletions ch02git/04Publishing.ipynb → ch00git/04Publishing.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
{
"data": {
"text/plain": [
"'/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git/git_example'"
"'/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git/git_example'"
]
},
"execution_count": 1,
Expand Down Expand Up @@ -83,7 +83,7 @@
"\n",
"Students can get free private repositories on GitHub, by going to [GitHub Education](https://education.github.com/) and filling in a form (look for the Student Developer Pack). \n",
"\n",
"UCL pays for private GitHub repositories for UCL research groups: you can find the service details on the [Research Software Development Group's website](https://www.ucl.ac.uk/isd/services/research-it/research-software-development-tools/support-for-ucl-researchers-to-use-github)."
"UCL pays for private GitHub repositories for UCL research groups: you can find the service details on the [Advanced Research Computing Centre's website](https://www.ucl.ac.uk/advanced-research-computing/expertise/research-software-development/research-software-development-tools/support-ucl-2)."
]
},
{
Expand Down Expand Up @@ -144,7 +144,7 @@
],
"source": [
"%%bash\n",
"git push -uf origin main # I have an extra `f` switch here.\n",
"git push -uf origin main # You shouldn't need the extra `f` switch. We use it here to force the push and rewrite that repository.\n",
" #You should copy the instructions from YOUR repository."
]
},
Expand Down Expand Up @@ -239,7 +239,7 @@
"metadata": {},
"source": [
"``` bash\n",
"vim lakeland.md\n",
"nano lakeland.md\n",
"```"
]
},
Expand Down Expand Up @@ -681,8 +681,8 @@
"participant \"Cleese's index\" as I\n",
"participant Cleese as C\n",
"\n",
"note right of C: vim index.md\n",
"note right of C: vim lakeland.md\n",
"note right of C: nano index.md\n",
"note right of C: nano lakeland.md\n",
"\n",
"note right of C: git add index.md\n",
"C->I: Add *only* the changes to index.md to the staging area\n",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git\n"
"/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git\n"
]
}
],
Expand Down Expand Up @@ -109,7 +109,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git\n"
"/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git\n"
]
},
{
Expand Down Expand Up @@ -155,7 +155,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git/partner_dir\n",
"/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git/partner_dir\n",
"index.md\n",
"lakeland.md\n"
]
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion ch02git/11Miscellany.ipynb → ch00git/11Miscellany.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@
"### UCL layout for GitHub pages\n",
"\n",
"You can use GitHub pages to make HTML layouts, here's an [example of how to do it](http://github.com/UCL/ucl-github-pages-example), \n",
"and [how it looks](http://ucl.github.com/ucl-github-pages-example). We won't go into the detail of this now, \n",
"and [how it looks](http://github-pages.ucl.ac.uk/ucl-github-pages-example). We won't go into the detail of this now,\n",
"but after the class, you might want to try this."
]
}
Expand Down
22 changes: 11 additions & 11 deletions ch02git/12Remotes.ipynb → ch00git/12Remotes.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
"outputs": [
{
"ename": "OSError",
"evalue": "[Errno 2] No such file or directory: '/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git/git_example/learning_git/git_example'",
"evalue": "[Errno 2] No such file or directory: '/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git/git_example/learning_git/git_example'",
"output_type": "error",
"traceback": [
"\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
"\u001b[0;31mOSError\u001b[0m Traceback (most recent call last)",
"\u001b[0;32m<ipython-input-15-0e99b315a891>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[1;32m 3\u001b[0m \u001b[0mgit_dir\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mos\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mpath\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mjoin\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mtop_dir\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m'learning_git'\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 4\u001b[0m \u001b[0mworking_dir\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0mos\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mpath\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mjoin\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mgit_dir\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m'git_example'\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 5\u001b[0;31m \u001b[0mos\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mchdir\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mworking_dir\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m",
"\u001b[0;31mOSError\u001b[0m: [Errno 2] No such file or directory: '/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git/git_example/learning_git/git_example'"
"\u001b[0;31mOSError\u001b[0m: [Errno 2] No such file or directory: '/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git/git_example/learning_git/git_example'"
]
}
],
Expand Down Expand Up @@ -98,7 +98,7 @@
"source": [
"%%bash\n",
"git switch main\n",
"git remote add rits git@github.com:ucl-rits/github-example.git\n",
"git remote add arc git@github.com:UCL-ARC-RSEing-with-Python/github-example.git\n",
"git remote -v"
]
},
Expand Down Expand Up @@ -189,7 +189,7 @@
],
"source": [
"%%bash\n",
"git push -uf rits main"
"git push -uf arc main"
]
},
{
Expand Down Expand Up @@ -231,7 +231,7 @@
"source": [
"%%bash\n",
"git fetch\n",
"git log --oneline --left-right rits/main...origin/main"
"git log --oneline --left-right arc/main...origin/main"
]
},
{
Expand Down Expand Up @@ -325,13 +325,13 @@
"outputs": [
{
"ename": "OSError",
"evalue": "[Errno 2] No such file or directory: '/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git/git_example/learning_git'",
"evalue": "[Errno 2] No such file or directory: '/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git/git_example/learning_git'",
"output_type": "error",
"traceback": [
"\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
"\u001b[0;31mOSError\u001b[0m Traceback (most recent call last)",
"\u001b[0;32m<ipython-input-25-63b2be9c146e>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[1;32m 1\u001b[0m \u001b[0mbare_dir\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0mos\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mpath\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mjoin\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mgit_dir\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m'bare_repo'\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 2\u001b[0;31m \u001b[0mos\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mchdir\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mgit_dir\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m",
"\u001b[0;31mOSError\u001b[0m: [Errno 2] No such file or directory: '/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git/git_example/learning_git'"
"\u001b[0;31mOSError\u001b[0m: [Errno 2] No such file or directory: '/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git/git_example/learning_git'"
]
}
],
Expand All @@ -354,7 +354,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Initialized empty Git repository in /Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git/git_example/bare_repo/\n"
"Initialized empty Git repository in /Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git/git_example/bare_repo/\n"
]
}
],
Expand All @@ -377,13 +377,13 @@
"outputs": [
{
"ename": "OSError",
"evalue": "[Errno 2] No such file or directory: '/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git/git_example/learning_git/git_example'",
"evalue": "[Errno 2] No such file or directory: '/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git/git_example/learning_git/git_example'",
"output_type": "error",
"traceback": [
"\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
"\u001b[0;31mOSError\u001b[0m Traceback (most recent call last)",
"\u001b[0;32m<ipython-input-27-678c239be373>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[0;32m----> 1\u001b[0;31m \u001b[0mos\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mchdir\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mworking_dir\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m",
"\u001b[0;31mOSError\u001b[0m: [Errno 2] No such file or directory: '/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git/git_example/learning_git/git_example'"
"\u001b[0;31mOSError\u001b[0m: [Errno 2] No such file or directory: '/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git/git_example/learning_git/git_example'"
]
}
],
Expand Down Expand Up @@ -493,7 +493,7 @@
"copying the content from your computer. (Probably at .ssh/id_rsa.pub)\n",
"\n",
"If you have difficulties, the instructions for this are [on the GitHub\n",
"website](https://help.github.com/en/articles/connecting-to-github-with-ssh). "
"website](https://docs.github.com/en/authentication/connecting-to-github-with-ssh)."
]
}
],
Expand Down
2 changes: 1 addition & 1 deletion ch02git/13Rebase.ipynb → ch00git/13Rebase.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"\n",
"### An example rebase\n",
"\n",
"We've built a [repository to help visualise the difference between a merge and a rebase](https://github.com/UCL-RITS/wocky_rebase/blob/main/wocky.md)."
"We've built a [repository to help visualise the difference between a merge and a rebase](https://github.com/UCL-ARC-RSEing-with-Python/wocky_rebase/blob/main/wocky.md)."
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion ch02git/14Bisect.ipynb → ch00git/14Bisect.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"source": [
"%%bash\n",
"rm -rf bisectdemo\n",
"git clone https://github.com/UCL-RITS/bisectdemo.git"
"git clone https://github.com/UCL-ARC-RSEing-with-Python/bisectdemo.git"
]
},
{
Expand Down
File renamed without changes.
Loading