Skip to content

Commit f55b891

Browse files
committed
Merge branch 'main' into module-4
2 parents 88364e6 + 2c01d22 commit f55b891

File tree

11 files changed

+674
-54
lines changed

11 files changed

+674
-54
lines changed

00-instructors.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,18 @@ oceanographic remote sensing and climate monitoring from space.
1010
She leads transformative initiatives in open science, cloud computing, and geospatial
1111
data accessibility to increase scientific participation and collaboration.
1212

13+
## [Fernando Perez](https://fernandoperez.org/)
14+
15+
**Faculty Director @ [Schmidt Center for Data Science and Environment, UC Berkeley](https://dse.berkeley.edu/) \
16+
Associate Professor @ [UC Berkeley](https://berkeley.edu)**
17+
18+
Dr. Fernando Pérez is an Associate Professor in Statistics at UC Berkeley and scientist at LBNL.
19+
He builds open source tools for humans to use computers as companions in thinking and
20+
collaboration, mostly in the scientific Python ecosystem (IPython, Jupyter & friends).
21+
A computational physicist by training, his research interests include questions at the
22+
nexus of software and geoscience, seeking to build the computational and data ecosystem
23+
to tackle problems like climate change with collaborative, open, reproducible, and
24+
extensible scientific practices.
1325

1426
## [Matt Fisher](https://mfisher87.github.io)
1527

docker/environment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ dependencies:
5151
- "maplibre"
5252

5353
# Publishing
54-
- "mystmd >=1.6.6"
54+
- "mystmd >=1.7.0"
5555
- "typst"
56-
- "jupyter-myst-build-proxy >=0.5.1"
56+
- "jupyter-myst-build-proxy >=0.6.0"
5757

5858
# Testing and validation
5959
- "ruff"

for-instructors/dogfooding.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ our users will use on the day of the workshop.
1010

1111
You'll need to be familiar with the following processes:
1212

13-
* [](../reference/01-starting-your-server.md)
14-
* [](../reference/02-stopping-your-server.md)
15-
* [](../reference/03-gh-auth.md)
13+
* [](/reference/01-starting-your-server.md)
14+
* [](/reference/02-stopping-your-server.md)
15+
* [](/reference/03-gh-auth.md)
1616

1717
Once you've set up GitHub authentication, you can use Git normally.
1818

@@ -23,7 +23,7 @@ We have installed
2323
[`jupyter-myst-build-proxy`](https://github.com/ryanlovett/jupyter-myst-build-proxy)
2424
which builds the MyST site on-demand.
2525

26-
See [](../reference/04-using-myst.md) for instructions.
26+
See [](/reference/04-using-myst.md) for instructions.
2727

2828

2929
### Tradeoffs

for-instructors/style-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ Follow the [Diátaxis](https://diataxis.fr) principles for your audience!
129129

130130
### Vocabulary
131131

132-
All vocabulary should be defined in the [](../reference/00-vocabulary.md) page.
132+
All vocabulary should be defined in the [](/reference/00-vocabulary.md) page.
133133
Follow the pre-existing pattern to add new terms.
134134

135135
References should be conscious of case.

joining-late.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
::::::{hint} Joining late? You may need to clone the workshop repository
2+
:class: dropdown
3+
4+
If you're joining late, you may have missed a prior instruction to start your CryoCloud server,
5+
clone the workshop website and set up GitHub authentication.
6+
7+
To start your CryoCloud server, visit the reference section [](/reference/01-starting-your-server.md).
8+
9+
To clone the workshop repository, open a terminal in your CryoCloud JupyterLab server:
10+
11+
```bash
12+
cd # Move to your home directory
13+
git clone https://github.com/geojupyter/workshop-open-source-geospatial.git
14+
```
15+
16+
:::{youShouldNotice}
17+
...this command produces output like:
18+
19+
```
20+
Cloning into 'workshop-open-source-geospatial'...
21+
remote: Enumerating objects: 417, done.
22+
remote: Counting objects: 100% (178/178), done.
23+
remote: Compressing objects: 100% (101/101), done.
24+
remote: Total 417 (delta 136), reused 97 (delta 77), pack-reused 239 (from 2)
25+
Receiving objects: 100% (417/417), 1.13 MiB | 7.21 MiB/s, done.
26+
Resolving deltas: 100% (229/229), done.
27+
```
28+
:::
29+
30+
**Finally, you'll need to setup GitHub authentication to push to GitHub**, which is required to
31+
complete some modules (e.g. module 5).
32+
Please follow the instructions at [](/reference/03-gh-auth.md).
33+
::::::

modules/05-sharing-and-publishing/index.md

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ instance with MyST pre-installed.
106106
CryoCloud also comes with a special configuration for building a MyST site without the
107107
use of the terminal.
108108

109-
To preview a MyST site in JupyterLab, view instructions in the reference section [](../../reference/04-using-myst.md).
109+
To preview a MyST site in JupyterLab, view instructions in the reference section [](/reference/04-using-myst.md).
110110

111111
:::{note} The normal way (without JupyterLab)
112112
:class: dropdown
@@ -137,40 +137,9 @@ This workshop's materials are built with MyST.
137137
We'll build this premade website together on CryoCloud so you can get used to the
138138
process.
139139

140-
::::::{hint} Joining late? You may need to clone the workshop repository
141-
:class: dropdown
142-
143-
If you're joining late, you may have missed a prior instruction to start your CryoCloud server,
144-
clone the workshop website and set up GitHub authentication.
145-
146-
To start your CryoCloud server, visit the reference section [](../../reference/01-starting-your-server.md).
147-
148-
To clone the workshop repository, open a terminal in your CryoCloud JupyterLab server:
149-
150-
```bash
151-
cd # Move to your home directory
152-
git clone https://github.com/geojupyter/workshop-open-source-geospatial.git
153-
```
154-
155-
:::{youShouldNotice}
156-
...this command produces output like:
157-
158-
```
159-
Cloning into 'workshop-open-source-geospatial'...
160-
remote: Enumerating objects: 417, done.
161-
remote: Counting objects: 100% (178/178), done.
162-
remote: Compressing objects: 100% (101/101), done.
163-
remote: Total 417 (delta 136), reused 97 (delta 77), pack-reused 239 (from 2)
164-
Receiving objects: 100% (417/417), 1.13 MiB | 7.21 MiB/s, done.
165-
Resolving deltas: 100% (229/229), done.
166-
```
140+
:::{include} /joining-late.md
167141
:::
168142

169-
**Finally, you'll need to setup GitHub authentication to push to GitHub**, which is required to
170-
complete this module.
171-
Please follow the instructions at [](../../reference/03-gh-auth.md).
172-
::::::
173-
174143

175144
#### Navigate to the correct directory in the file browser
176145

modules/06-geojupyter/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
data/*
2+
*.jGIS

0 commit comments

Comments
 (0)