Skip to content

Commit b9a8bb9

Browse files
dpsheliodpshelio
authored
Merge pull request #228 from UCL/reordering
2 parents ab9db90 + f8ae90a commit b9a8bb9

Some content is hidden

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

52 files changed

+318
-312
lines changed

‎.github/python/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ git+https://github.com/jakevdp/JSAnimation.git
33
# https://github.com/jupyter/nbgrader/issues/1373#issuecomment-702798246
44
jupyter-client==6.1.12
55
# https://github.com/jupyter/jupyter_client/issues/637
6-
git+https://github.com/ucl-rits/greeter.git
6+
git+https://github.com/UCL-ARC-RSEing-with-Python/greeter.git
77
line_profiler

‎ch02git/01Intro.ipynb renamed to ‎ch00git/01Intro.ipynb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@
291291
{
292292
"data": {
293293
"text/plain": [
294-
"'/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git'"
294+
"'/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git'"
295295
]
296296
},
297297
"execution_count": 4,
@@ -318,7 +318,7 @@
318318
{
319319
"data": {
320320
"text/plain": [
321-
"'/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git'"
321+
"'/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git'"
322322
]
323323
},
324324
"execution_count": 5,
@@ -440,8 +440,8 @@
440440
"name": "stdout",
441441
"output_type": "stream",
442442
"text": [
443-
"/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git/git_example\n",
444-
"Initialized empty Git repository in /Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git/git_example/.git/\n"
443+
"/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git/git_example\n",
444+
"Initialized empty Git repository in /Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git/git_example/.git/\n"
445445
]
446446
}
447447
],

‎ch02git/02Solo.ipynb renamed to ‎ch00git/02Solo.ipynb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
{
2828
"data": {
2929
"text/plain": [
30-
"'/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git/git_example'"
30+
"'/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git/git_example'"
3131
]
3232
},
3333
"execution_count": 1,
@@ -233,7 +233,7 @@
233233
"outputs": [],
234234
"source": [
235235
"%%bash\n",
236-
"git config --global core.editor vim "
236+
"git config --global core.editor nano"
237237
]
238238
},
239239
{
@@ -276,7 +276,7 @@
276276
"cell_type": "markdown",
277277
"metadata": {},
278278
"source": [
279-
"To configure Notepad++ on windows you'll need something like the below, ask a demonstrator to help for your machine."
279+
"To configure VS Code on your operating system you'll need something like the below, ask a demonstrator to help for your machine."
280280
]
281281
},
282282
{
@@ -299,7 +299,7 @@
299299
"cell_type": "markdown",
300300
"metadata": {},
301301
"source": [
302-
"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)."
302+
"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)."
303303
]
304304
},
305305
{
@@ -407,7 +407,7 @@
407407
"source": [
408408
"Let's edit the file again:\n",
409409
"\n",
410-
" vim index.md"
410+
" nano index.md"
411411
]
412412
},
413413
{
@@ -891,7 +891,7 @@
891891
"metadata": {},
892892
"source": [
893893
"```bash\n",
894-
"vim index.md\n",
894+
"nano index.md\n",
895895
"```"
896896
]
897897
},
@@ -1112,7 +1112,7 @@
11121112
"participant \"Cleese's index\" as I\n",
11131113
"participant Cleese as C\n",
11141114
"\n",
1115-
"note right of C: vim index.md\n",
1115+
"note right of C: nano index.md\n",
11161116
"\n",
11171117
"note right of C: git init\n",
11181118
"C->R: create\n",
@@ -1124,14 +1124,14 @@
11241124
"note right of C: git commit\n",
11251125
"I->R: Commit content of index.md\n",
11261126
"\n",
1127-
"note right of C: vim index.md\n",
1127+
"note right of C: nano index.md\n",
11281128
"\n",
11291129
"note right of C: git add --update\n",
11301130
"C->I: Add content of index.md\n",
11311131
"note right of C: git commit -m \"Add a lie\"\n",
11321132
"I->R: Commit change to index.md\n",
11331133
"\n",
1134-
"note right of C: vim index.md\n",
1134+
"note right of C: nano index.md\n",
11351135
"note right of C: git commit -am \"Change title\"\n",
11361136
"C->R: Add and commit change to index.md (and all tracked files)\n",
11371137
"\"\"\"\n",

‎ch02git/03Mistakes.ipynb renamed to ‎ch00git/03Mistakes.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
{
2828
"data": {
2929
"text/plain": [
30-
"'/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git/git_example'"
30+
"'/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git/git_example'"
3131
]
3232
},
3333
"execution_count": 1,

‎ch02git/04Publishing.ipynb renamed to ‎ch00git/04Publishing.ipynb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
{
2828
"data": {
2929
"text/plain": [
30-
"'/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git/git_example'"
30+
"'/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git/git_example'"
3131
]
3232
},
3333
"execution_count": 1,
@@ -83,7 +83,7 @@
8383
"\n",
8484
"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",
8585
"\n",
86-
"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)."
86+
"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)."
8787
]
8888
},
8989
{
@@ -144,7 +144,7 @@
144144
],
145145
"source": [
146146
"%%bash\n",
147-
"git push -uf origin main # I have an extra `f` switch here.\n",
147+
"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",
148148
" #You should copy the instructions from YOUR repository."
149149
]
150150
},
@@ -239,7 +239,7 @@
239239
"metadata": {},
240240
"source": [
241241
"``` bash\n",
242-
"vim lakeland.md\n",
242+
"nano lakeland.md\n",
243243
"```"
244244
]
245245
},
@@ -681,8 +681,8 @@
681681
"participant \"Cleese's index\" as I\n",
682682
"participant Cleese as C\n",
683683
"\n",
684-
"note right of C: vim index.md\n",
685-
"note right of C: vim lakeland.md\n",
684+
"note right of C: nano index.md\n",
685+
"note right of C: nano lakeland.md\n",
686686
"\n",
687687
"note right of C: git add index.md\n",
688688
"C->I: Add *only* the changes to index.md to the staging area\n",

‎ch02git/05Collaboration.ipynb renamed to ‎ch00git/05Collaboration.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"name": "stdout",
7070
"output_type": "stream",
7171
"text": [
72-
"/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git\n"
72+
"/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git\n"
7373
]
7474
}
7575
],
@@ -109,7 +109,7 @@
109109
"name": "stdout",
110110
"output_type": "stream",
111111
"text": [
112-
"/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git\n"
112+
"/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git\n"
113113
]
114114
},
115115
{
@@ -155,7 +155,7 @@
155155
"name": "stdout",
156156
"output_type": "stream",
157157
"text": [
158-
"/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git/partner_dir\n",
158+
"/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git/partner_dir\n",
159159
"index.md\n",
160160
"lakeland.md\n"
161161
]

‎ch02git/06ForkAndPull.ipynb renamed to ‎ch00git/06ForkAndPull.ipynb

File renamed without changes.

‎ch02git/10Branches.ipynb renamed to ‎ch00git/10Branches.ipynb

File renamed without changes.

‎ch02git/11Miscellany.ipynb renamed to ‎ch00git/11Miscellany.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@
818818
"### UCL layout for GitHub pages\n",
819819
"\n",
820820
"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",
821-
"and [how it looks](http://ucl.github.com/ucl-github-pages-example). We won't go into the detail of this now, \n",
821+
"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",
822822
"but after the class, you might want to try this."
823823
]
824824
}

‎ch02git/12Remotes.ipynb renamed to ‎ch00git/12Remotes.ipynb

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
"outputs": [
4040
{
4141
"ename": "OSError",
42-
"evalue": "[Errno 2] No such file or directory: '/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git/git_example/learning_git/git_example'",
42+
"evalue": "[Errno 2] No such file or directory: '/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git/git_example/learning_git/git_example'",
4343
"output_type": "error",
4444
"traceback": [
4545
"\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
4646
"\u001b[0;31mOSError\u001b[0m Traceback (most recent call last)",
4747
"\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",
48-
"\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'"
48+
"\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'"
4949
]
5050
}
5151
],
@@ -98,7 +98,7 @@
9898
"source": [
9999
"%%bash\n",
100100
"git switch main\n",
101-
"git remote add rits [email protected]:ucl-rits/github-example.git\n",
101+
"git remote add arc [email protected]:UCL-ARC-RSEing-with-Python/github-example.git\n",
102102
"git remote -v"
103103
]
104104
},
@@ -189,7 +189,7 @@
189189
],
190190
"source": [
191191
"%%bash\n",
192-
"git push -uf rits main"
192+
"git push -uf arc main"
193193
]
194194
},
195195
{
@@ -231,7 +231,7 @@
231231
"source": [
232232
"%%bash\n",
233233
"git fetch\n",
234-
"git log --oneline --left-right rits/main...origin/main"
234+
"git log --oneline --left-right arc/main...origin/main"
235235
]
236236
},
237237
{
@@ -325,13 +325,13 @@
325325
"outputs": [
326326
{
327327
"ename": "OSError",
328-
"evalue": "[Errno 2] No such file or directory: '/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git/git_example/learning_git'",
328+
"evalue": "[Errno 2] No such file or directory: '/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git/git_example/learning_git'",
329329
"output_type": "error",
330330
"traceback": [
331331
"\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
332332
"\u001b[0;31mOSError\u001b[0m Traceback (most recent call last)",
333333
"\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",
334-
"\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'"
334+
"\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'"
335335
]
336336
}
337337
],
@@ -354,7 +354,7 @@
354354
"name": "stdout",
355355
"output_type": "stream",
356356
"text": [
357-
"Initialized empty Git repository in /Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git/git_example/bare_repo/\n"
357+
"Initialized empty Git repository in /Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git/git_example/bare_repo/\n"
358358
]
359359
}
360360
],
@@ -377,13 +377,13 @@
377377
"outputs": [
378378
{
379379
"ename": "OSError",
380-
"evalue": "[Errno 2] No such file or directory: '/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch02git/learning_git/git_example/learning_git/git_example'",
380+
"evalue": "[Errno 2] No such file or directory: '/Users/jamespjh/devel/rsdt/rsd-engineeringcourse/ch00git/learning_git/git_example/learning_git/git_example'",
381381
"output_type": "error",
382382
"traceback": [
383383
"\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
384384
"\u001b[0;31mOSError\u001b[0m Traceback (most recent call last)",
385385
"\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",
386-
"\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'"
386+
"\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'"
387387
]
388388
}
389389
],
@@ -493,7 +493,7 @@
493493
"copying the content from your computer. (Probably at .ssh/id_rsa.pub)\n",
494494
"\n",
495495
"If you have difficulties, the instructions for this are [on the GitHub\n",
496-
"website](https://help.github.com/en/articles/connecting-to-github-with-ssh). "
496+
"website](https://docs.github.com/en/authentication/connecting-to-github-with-ssh)."
497497
]
498498
}
499499
],

0 commit comments

Comments
 (0)