Skip to content

Commit 36ce4d3

Browse files
committed
differences for PR #100
1 parent 0116d1b commit 36ce4d3

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

04-defensive_programming.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ except:
111111

112112
At the top of the statement is the code that we are interested in executing, which is run in the `try` statement. If that fails then the `except` statement comes into effect, (hopefully) returning helpful information to the user about what happened and giving them some guidance on how to avoid the problem in future.
113113

114-
Using `try-except` statements results in clearer, easier to understand code by following the common Python coding style of [EAFP](https://docs.python.org/3.6/glossary.html#term-eafp) (it's easier to ask for forgiveness than permission). This style shows the code we want to execute first, assuming that the incoming data is correct, before dealing with exceptions if the assumptions prove false.
114+
Using `try-except` statements results in clearer, easier to understand code by following the common Python coding style of [EAFP](https://docs.python.org/3/glossary.html#term-EAFP) (it's easier to ask for forgiveness than permission). This style shows the code we want to execute first, assuming that the incoming data is correct, before dealing with exceptions if the assumptions prove false.
115115

116116
The `except` statement will catch all errors and so we do not, initially at least, need to know exactly what errors we are trying to avoid. However, python does provide error codes, which we can use to expand the structure to capture specific error types. For the example above, we would want to capture a `TypeError`:
117117

07-software_package_management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ we can use `--prepend`, which behaves in the exact same way as `--add`).
108108

109109
## Searching for Packages
110110

111-
Once you've added the channels you wish to use, you can now search them for the software that you need. This is simply carried out using `conda search`. For example, if we wished to find out what versions of [Gromacs](https://www.gromacs.org/About_Gromacs) are available, we can use:
111+
Once you've added the channels you wish to use, you can now search them for the software that you need. This is simply carried out using `conda search`. For example, if we wished to find out what versions of [Gromacs](https://www.gromacs.org/about.html) are available, we can use:
112112

113113
```bash
114114
conda search gromacs

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ Instances of abusive, harassing, or otherwise unacceptable behavior
99
may be reported by following our [reporting guidelines][coc-reporting].
1010

1111

12-
[coc-reporting]: https://docs.carpentries.org/topic_folders/policies/incident-reporting.html
12+
[coc-reporting]: https://docs.carpentries.org/policies/coc/incident-reporting.html
1313
[coc]: https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html

config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ profiles:
8989

9090

9191
carpentry_description: Programming with Python
92-
url: https://uomresearchit.github.io/programming_with_python/
92+
url: https://uomresearchit.github.io/Programming-With-Python/
9393
analytics: carpentries
9494
lang: en
9595
workbench-beta: yes

md5sum.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
"file" "checksum" "built" "date"
2-
"CODE_OF_CONDUCT.md" "c93c83c630db2fe2462240bf72552548" "site/built/CODE_OF_CONDUCT.md" "2025-04-15"
2+
"CODE_OF_CONDUCT.md" "a44540c6ba9d8bd64f16957a4a6f1312" "site/built/CODE_OF_CONDUCT.md" "2026-04-24"
33
"LICENSE.md" "16e8eaad880865bc4a41811b3e8fa945" "site/built/LICENSE.md" "2025-04-15"
4-
"config.yaml" "b8b83de60a4508c8c8dbbaa3837b2583" "site/built/config.yaml" "2026-04-23"
4+
"config.yaml" "14e923c1451227ab8adc49ca5888cdcf" "site/built/config.yaml" "2026-04-24"
55
"index.md" "b92970dbb54d63d6543a4c28e4df0a58" "site/built/index.md" "2025-04-15"
66
"links.md" "8184cf4149eafbf03ce8da8ff0778c14" "site/built/links.md" "2025-04-15"
77
"episodes/01-introduction.md" "45f9d3a720eff2bfc316a2bbe0dafcd5" "site/built/01-introduction.md" "2026-04-21"
88
"episodes/02-dictionaries.md" "01d0b5ca498525f3fff069efae731735" "site/built/02-dictionaries.md" "2026-04-21"
99
"episodes/03-numpy_essential.md" "b1bc2d8b36e7bf87aa19a15ef7b398da" "site/built/03-numpy_essential.md" "2026-04-22"
10-
"episodes/04-defensive_programming.md" "906c151b83b81c929caae42af7fc942c" "site/built/04-defensive_programming.md" "2026-04-23"
10+
"episodes/04-defensive_programming.md" "c185aea66ccd273e5d38d37f51cd07f0" "site/built/04-defensive_programming.md" "2026-04-24"
1111
"episodes/05-units_and_quantities.md" "80b2c978e8e059a4e0fabf00c741db5b" "site/built/05-units_and_quantities.md" "2026-04-23"
1212
"episodes/06-pandas_essential.md" "b1059ad5fe7b7c4fcaf16c49e8e44bc5" "site/built/06-pandas_essential.md" "2026-04-23"
13-
"episodes/07-software_package_management.md" "42f84af49a6bcd23958a42ba7592a2b6" "site/built/07-software_package_management.md" "2026-04-23"
13+
"episodes/07-software_package_management.md" "bad70f7e80ca5eef51b9303b81e5d717" "site/built/07-software_package_management.md" "2026-04-24"
1414
"instructors/instructor-notes.md" "a59fd3b94c07c3fe3218c054a0f03277" "site/built/instructor-notes.md" "2025-04-15"
1515
"learners/discuss.md" "2758e2e5abd231d82d25c6453d8abbc6" "site/built/discuss.md" "2025-04-15"
1616
"learners/reference.md" "28853696c21dd22dfb883e9c241e95fb" "site/built/reference.md" "2025-04-15"

0 commit comments

Comments
 (0)