Skip to content

Commit

Permalink
Merge branch 'main' of github.com:fneum/data-science-for-esm
Browse files Browse the repository at this point in the history
  • Loading branch information
fneum committed Oct 18, 2023
2 parents 1ca09ad + 920d834 commit b234341
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exclude: "^LICENSES"

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: check-merge-conflict
- id: end-of-file-fixer
Expand Down Expand Up @@ -33,7 +33,7 @@ repos:

# Do YAML formatting (before the linter checks it for misses)
- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
rev: v2.10.0
rev: v2.11.0
hooks:
- id: pretty-format-yaml
args: [--autofix, --indent, "2", --preserve-quotes]
Expand Down
4 changes: 2 additions & 2 deletions data-science-for-esm/04-workshop-geopandas.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -1392,9 +1392,9 @@
],
"metadata": {
"kernelspec": {
"display_name": "esm-2023",
"display_name": "",
"language": "python",
"name": "python3"
"name": ""
},
"language_info": {
"codemirror_mode": {
Expand Down
4 changes: 2 additions & 2 deletions data-science-for-esm/07-workshop-networkx.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -1698,9 +1698,9 @@
],
"metadata": {
"kernelspec": {
"display_name": "esm-2023",
"display_name": "",
"language": "python",
"name": "python3"
"name": ""
},
"language_info": {
"codemirror_mode": {
Expand Down
4 changes: 2 additions & 2 deletions data-science-for-esm/11-workshop-groupwork.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -949,9 +949,9 @@
],
"metadata": {
"kernelspec": {
"display_name": "pypsa-eur-221227",
"display_name": "",
"language": "python",
"name": "python3"
"name": ""
},
"language_info": {
"codemirror_mode": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"import matplotlib.pyplot as plt\n",
"import holoviews as hv\n",
"\n",
"plt.style.use(\"bmh\")\n"
"plt.style.use(\"bmh\")"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion data-science-for-esm/intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ A good tutorial for this can be found [here](https://realpython.com/installing-p

### Using Python without a local installation

You can even start the course without a local Python installation using online services like [Google Colab (colab.google)](https://colab.google) which provide an online Python version
You can even start the course without a local Python installation using online services like [Google Colab (colab.google)](https://colab.google) which provide an online Python version
in a [Jupyter Notebook](jupyter.org/) environment.

## Managing environments with `conda`
Expand Down

0 comments on commit b234341

Please sign in to comment.