Merge branch 'main' into how-to-cite

ProjectPythia · Aug 8, 2023 · eb98465 · eb98465
2 parents 03a725e + 6a353c9
commit eb98465
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 9 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
       - id: double-quote-string-fixer
 
   - repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 23.7.0
     hooks:
       - id: black
 
@@ -20,7 +20,7 @@ repos:
       - id: blackdoc
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
+    rev: 6.1.0
     hooks:
       - id: flake8
 
@@ -34,7 +34,7 @@ repos:
       - id: isort
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.7.1
+    rev: v3.0.1
     hooks:
       - id: prettier
 

diff --git a/CITATION.cff b/CITATION.cff
@@ -24,7 +24,7 @@ authors:
   - family-names: Banihirwe
     given-names: Anderson
     orcid: https://orcid.org/0000-0001-6583-571X
-    website: https://github.com/banihirwe
+    website: https://github.com/andersy005
   - family-names: Camron
     given-names: Drew
     orcid: https://orcid.org/0000-0001-7246-6502

diff --git a/_config.yml b/_config.yml
@@ -89,6 +89,7 @@ bibtex_bibfiles:
 
 sphinx:
   config:
+    nb_execution_raise_on_error: true # raise exception in build if there are notebook errors (this flag is ignored if building on binder)
     linkcheck_request_headers:
       'https://docs.github.com/':
         User-Agent: Mozilla/5.0 (X11; Ubuntu; Linux i686; rv:24.0) Gecko/20100101 Firefox/24.0

diff --git a/core/data-formats/netcdf-cf.ipynb b/core/data-formats/netcdf-cf.ipynb
@@ -575,13 +575,13 @@
     "lon_var[:] = lon\n",
     "lon_var.units = 'degrees_east'\n",
     "lon_var.standard_name = 'longitude'  # Optional\n",
-    "lon_var.long_name = 'longitude'\n",
+    "lon_var.long_name = 'longitude coordinate'\n",
     "\n",
     "lat_var = nc.createVariable('lat', np.float64, ('y', 'x'))\n",
     "lat_var[:] = lat\n",
     "lat_var.units = 'degrees_north'\n",
     "lat_var.standard_name = 'latitude'  # Optional\n",
-    "lat_var.long_name = 'latitude'"
+    "lat_var.long_name = 'latitude coordinate'"
    ]
   },
   {

diff --git a/environment.yml b/environment.yml
@@ -15,7 +15,7 @@ dependencies:
   - pyproj
   - pythia-datasets
   - python
-  - scipy
+  - scipy<1.11
   - ffmpeg
   - sqlalchemy<1.4
   - xarray

diff --git a/foundations/github/basic-git.md b/foundations/github/basic-git.md
@@ -44,7 +44,7 @@ analysis_script_09122021_edit.py
 analysis_script_NEW.py
 ```
 
-A Version Control System (VCS) like git will replace this mess with a _well-ordered and labelled history_ of edits that you can freely browse through, and will greatly simply collaborating with other people on writing new code.
+A Version Control System (VCS) like git will replace this mess with a _well-ordered and labelled history_ of edits that you can freely browse through, and will greatly simplify collaborating with other people on writing new code.
 
 ### What is git?
 

diff --git a/foundations/github/github-repos.md b/foundations/github/github-repos.md
@@ -67,7 +67,7 @@ repository for any project. In fact, repositories can come and go
 at any time, created and deleted as need dictates. Creating new
 repositories from existing ones, synchronizing them, and managing them
 are the topics of later sections. For now, it is only important to
-understand that or a GitHub-managed project, there is typically one
+understand that for a GitHub-managed project, there is typically one
 "official" repository, often called the "upstream" repository, and it lives on GitHub.com. There may be any
 number of copies of the "official" repository, known as _forks_ (or _origins_,
 if it is owned by you),