deploy: 6ef78db

_sources/foundations/github/git-branches.md

@@ -146,6 +146,11 @@ Before we push this branch upstream, let's make some sample changes (like C3 or
 touch hello.py
 ```
 
+```{admonition} Note
+:class: info
+`touch` is not a Windows native command. You can use `type nul > hello.py` to create an empty file instead.
+```
+
 ![Git Status](../../images/6-samplechange.png)
 
 You can check that this file has been created by comparing an `ls` before and after this command, and also with a `git status` that will show your new untracked file.
@@ -182,7 +187,7 @@ Thankfully, Git provided this command in the previous error message. If you clon
 
 We can see that this worked by doing a `git branch -a`
 
-Notice the new branch called `remotes/origin/newbranch`. And when you do a `git status` you'll see that we are up to date with this new remote branch.
+Notice the new branch called `remotes/origin/branchA`. And when you do a `git status` you'll see that we are up to date with this new remote branch.
 
 ![Git Commit Status](../../images/7-github-branchandstatus.png)
 
@@ -269,22 +274,23 @@ git pull
 
 `git pull` is a combination of `git fetch` and `git merge`. That is it updates the remote tracking branches (`git fetch`) AND updates your current branch with any new commits on the remote tracking branch (`git merge`).
 
-This same concept appplies to work in a team setting. Multiple authors will have their own feature branches that merge into the same Upstream Main repository via Pull Requests. It is important for each author to do regular `git pulls` to stay up to date with each other's contributions.
+This same concept applies to work in a team setting. Multiple authors will have their own feature branches that merge into the same Upstream Main repository via Pull Requests. It is important for each author to do regular `git pulls` to stay up to date with each other's contributions.
 
 ## Complete Workflow
 
 All in all your Git Branching workflow should resemble this flow:
 ![gitworkflow](../../images/gitworkflow.gif)
 
-1. Forking the upstream repository
-1. Creating a local clone of your upstream fork
-1. Creating a new branch
-1. Switching branches
-1. Making a commit
-1. Setting up a remote branch
-1. Merging branches via a PR
-1. Deleting branches
-1. Pulling from upstream
+1. Fork the upstream repository
+1. Create a local clone of your upstream fork
+1. Create and switch to a new branch in local copy
+1. Make changes
+1. Add and commit changes in branch
+1. Push commits to fork (Set an upstream branch only for first push)
+1. Repeat last three steps as necessary
+1. Merge into upstream main branch via Pull Request
+1. Delete branch from clone and fork
+1. Pull upstream changes to main branch of fork and clone
 
 ---
 

appendix/how-to-contribute.html

@@ -81,7 +81,7 @@
     <link rel="prev" title="Dask Arrays with Xarray" href="../core/xarray/dask-arrays-xarray.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1"/>
   <meta name="docsearch:language" content="en"/>
-    <meta name="docbuild:last-update" content="5 June 2024"/>
+    <meta name="docbuild:last-update" content="7 June 2024"/>
   </head>
 
 
@@ -835,7 +835,7 @@ <h3>Keeping your dev environment up to date<a class="headerlink" href="#keeping-
 
   <div class="footer-item">
     <p class="last-updated">
-  Last updated on 5 June 2024.
+  Last updated on 7 June 2024.
   <br/>
 </p>
   </div>
@@ -964,7 +964,7 @@ <h1>Contribute</h1>
 
           By the <a href="https://projectpythia.org/">Project Pythia</a> Community.
 
-          Last updated on 5 June 2024.
+          Last updated on 7 June 2024.
         </p>
       </div>
     </div>

appendix/template.html

@@ -80,7 +80,7 @@
     <link rel="prev" title="Pythia Foundations Contributor’s Guide" href="how-to-contribute.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1"/>
   <meta name="docsearch:language" content="en"/>
-    <meta name="docbuild:last-update" content="5 June 2024"/>
+    <meta name="docbuild:last-update" content="7 June 2024"/>
   </head>
 
 
@@ -616,8 +616,8 @@ <h5>of further and further<a class="headerlink" href="#of-further-and-further" t
 <section id="header-levels">
 <h6>header levels<a class="headerlink" href="#header-levels" title="Link to this heading"><i class="fas fa-link"></i></a></h6>
 <p>Each section in your notebook can also contain <span class="math notranslate nohighlight">\(\LaTeX\)</span> equations, enabled through MathJax. In the following example, we illustrate some sample MathJax equations. (Rendering instructions, as well as detailed information about MathJax, can be found in <a class="reference external" href="https://jupyter-notebook.readthedocs.io/en/stable/examples/Notebook/Typesetting%20Equations.html">this documentation</a>.)</p>
-<div class="amsmath math notranslate nohighlight" id="equation-388a2d23-2f02-4f7b-9e9e-70b6da118372">
-<span class="eqno">(1)<a class="headerlink" href="#equation-388a2d23-2f02-4f7b-9e9e-70b6da118372" title="Permalink to this equation"><i class="fas fa-link"></i></a></span>\[\begin{align}
+<div class="amsmath math notranslate nohighlight" id="equation-fe92fa4b-c34b-489a-9dad-4002bdb21ff8">
+<span class="eqno">(1)<a class="headerlink" href="#equation-fe92fa4b-c34b-489a-9dad-4002bdb21ff8" title="Permalink to this equation"><i class="fas fa-link"></i></a></span>\[\begin{align}
 \dot{x} &amp; = \sigma(y-x) \\
 \dot{y} &amp; = \rho x - y - xz \\
 \dot{z} &amp; = -\beta z + xy
@@ -1002,7 +1002,7 @@ <h2>Resources and references<a class="headerlink" href="#resources-and-reference
 
   <div class="footer-item">
     <p class="last-updated">
-  Last updated on 5 June 2024.
+  Last updated on 7 June 2024.
   <br/>
 </p>
   </div>
@@ -1131,7 +1131,7 @@ <h1>Contribute</h1>
 
           By the <a href="https://projectpythia.org/">Project Pythia</a> Community.
 
-          Last updated on 5 June 2024.
+          Last updated on 7 June 2024.
         </p>
       </div>
     </div>

core/cartopy.html

@@ -79,7 +79,7 @@
     <link rel="prev" title="Annotations, Colorbars, and Advanced Layouts" href="matplotlib/annotations-colorbars-layouts.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1"/>
   <meta name="docsearch:language" content="en"/>
-    <meta name="docbuild:last-update" content="5 June 2024"/>
+    <meta name="docbuild:last-update" content="7 June 2024"/>
   </head>
 
 
@@ -764,7 +764,7 @@ <h1>Cartopy<a class="headerlink" href="#cartopy" title="Link to this heading"><i
 
   <div class="footer-item">
     <p class="last-updated">
-  Last updated on 5 June 2024.
+  Last updated on 7 June 2024.
   <br/>
 </p>
   </div>
@@ -893,7 +893,7 @@ <h1>Contribute</h1>
 
           By the <a href="https://projectpythia.org/">Project Pythia</a> Community.
 
-          Last updated on 5 June 2024.
+          Last updated on 7 June 2024.
         </p>
       </div>
     </div>

core/cartopy/cartopy.html

@@ -79,7 +79,7 @@
     <link rel="prev" title="Cartopy" href="../cartopy.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1"/>
   <meta name="docsearch:language" content="en"/>
-    <meta name="docbuild:last-update" content="5 June 2024"/>
+    <meta name="docbuild:last-update" content="7 June 2024"/>
   </head>
 
 
@@ -575,7 +575,7 @@ <h3>Create a map with a specified projection<a class="headerlink" href="#create-
 </div>
 </div>
 <div class="cell_output docutils container">
-<div class="output text_plain highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>&lt;cartopy.mpl.feature_artist.FeatureArtist at 0x7f7a3c5e43e0&gt;
+<div class="output text_plain highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>&lt;cartopy.mpl.feature_artist.FeatureArtist at 0x7f32bd9467e0&gt;
 </pre></div>
 </div>
 </div>
@@ -607,7 +607,7 @@ <h3>Add cartographic features to the map<a class="headerlink" href="#add-cartogr
 </div>
 </div>
 <div class="cell_output docutils container">
-<div class="output text_plain highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>&lt;cartopy.mpl.feature_artist.FeatureArtist at 0x7f7a1ba36f60&gt;
+<div class="output text_plain highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>&lt;cartopy.mpl.feature_artist.FeatureArtist at 0x7f32bd0f7b90&gt;
 </pre></div>
 </div>
 </div>
@@ -1344,7 +1344,7 @@ <h2>Resources and References<a class="headerlink" href="#resources-and-reference
 
   <div class="footer-item">
     <p class="last-updated">
-  Last updated on 5 June 2024.
+  Last updated on 7 June 2024.
   <br/>
 </p>
   </div>
@@ -1473,7 +1473,7 @@ <h1>Contribute</h1>
 
           By the <a href="https://projectpythia.org/">Project Pythia</a> Community.
 
-          Last updated on 5 June 2024.
+          Last updated on 7 June 2024.
         </p>
       </div>
     </div>

core/data-formats.html

@@ -79,7 +79,7 @@
     <link rel="prev" title="Introduction to Pandas" href="pandas/pandas.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1"/>
   <meta name="docsearch:language" content="en"/>
-    <meta name="docbuild:last-update" content="5 June 2024"/>
+    <meta name="docbuild:last-update" content="7 June 2024"/>
   </head>
 
 
@@ -756,7 +756,7 @@ <h1>Data Formats<a class="headerlink" href="#data-formats" title="Link to this h
 
   <div class="footer-item">
     <p class="last-updated">
-  Last updated on 5 June 2024.
+  Last updated on 7 June 2024.
   <br/>
 </p>
   </div>
@@ -885,7 +885,7 @@ <h1>Contribute</h1>
 
           By the <a href="https://projectpythia.org/">Project Pythia</a> Community.
 
-          Last updated on 5 June 2024.
+          Last updated on 7 June 2024.
         </p>
       </div>
     </div>

core/data-formats/netcdf-cf.html

@@ -79,7 +79,7 @@
     <link rel="prev" title="Data Formats" href="../data-formats.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1"/>
   <meta name="docsearch:language" content="en"/>
-    <meta name="docbuild:last-update" content="5 June 2024"/>
+    <meta name="docbuild:last-update" content="7 June 2024"/>
   </head>
 
 
@@ -568,7 +568,7 @@ <h2>Gridded Data<a class="headerlink" href="#gridded-data" title="Link to this h
 </div>
 </div>
 <div class="cell_output docutils container">
-<div class="output stderr highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>/tmp/ipykernel_2533/2342439358.py:1: DeprecationWarning: datetime.datetime.utcnow() is deprecated and scheduled for removal in a future version. Use timezone-aware objects to represent datetimes in UTC: datetime.datetime.now(datetime.UTC).
+<div class="output stderr highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>/tmp/ipykernel_2590/2342439358.py:1: DeprecationWarning: datetime.datetime.utcnow() is deprecated and scheduled for removal in a future version. Use timezone-aware objects to represent datetimes in UTC: datetime.datetime.now(datetime.UTC).
   start = datetime.utcnow().replace(hour=22, minute=0, second=0, microsecond=0)
 </pre></div>
 </div>
@@ -614,7 +614,7 @@ <h3>Creating the file and dimensions<a class="headerlink" href="#creating-the-fi
 </div>
 </div>
 <div class="cell_output docutils container">
-<div class="output stderr highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>/tmp/ipykernel_2533/2008125275.py:5: DeprecationWarning: datetime.datetime.utcnow() is deprecated and scheduled for removal in a future version. Use timezone-aware objects to represent datetimes in UTC: datetime.datetime.now(datetime.UTC).
+<div class="output stderr highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>/tmp/ipykernel_2590/2008125275.py:5: DeprecationWarning: datetime.datetime.utcnow() is deprecated and scheduled for removal in a future version. Use timezone-aware objects to represent datetimes in UTC: datetime.datetime.now(datetime.UTC).
   nc.history = str(datetime.utcnow()) + &#39; Python&#39;
 </pre></div>
 </div>
@@ -655,7 +655,7 @@ <h3>Creating the file and dimensions<a class="headerlink" href="#creating-the-fi
     title: Forecast model run
     institution: Unidata
     source: WRF-1.5
-    history: 2024-06-05 19:05:44.907304 Python
+    history: 2024-06-07 20:18:21.238621 Python
     references: 
     comment: 
     dimensions(sizes): forecast_time(0), x(101), y(67), pressure(7)
@@ -1568,7 +1568,7 @@ <h2>Resources and References<a class="headerlink" href="#resources-and-reference
 
   <div class="footer-item">
     <p class="last-updated">
-  Last updated on 5 June 2024.
+  Last updated on 7 June 2024.
   <br/>
 </p>
   </div>
@@ -1697,7 +1697,7 @@ <h1>Contribute</h1>
 
           By the <a href="https://projectpythia.org/">Project Pythia</a> Community.
 
-          Last updated on 5 June 2024.
+          Last updated on 7 June 2024.
         </p>
       </div>
     </div>

core/datetime.html

@@ -81,7 +81,7 @@
     <link rel="prev" title="Introduction to Cartopy" href="cartopy/cartopy.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1"/>
   <meta name="docsearch:language" content="en"/>
-    <meta name="docbuild:last-update" content="5 June 2024"/>
+    <meta name="docbuild:last-update" content="7 June 2024"/>
   </head>
 
 
@@ -764,7 +764,7 @@ <h1>Datetime<a class="headerlink" href="#datetime" title="Link to this heading">
 
   <div class="footer-item">
     <p class="last-updated">
-  Last updated on 5 June 2024.
+  Last updated on 7 June 2024.
   <br/>
 </p>
   </div>
@@ -893,7 +893,7 @@ <h1>Contribute</h1>
 
           By the <a href="https://projectpythia.org/">Project Pythia</a> Community.
 
-          Last updated on 5 June 2024.
+          Last updated on 7 June 2024.
         </p>
       </div>
     </div>

core/datetime/datetime.html

@@ -81,7 +81,7 @@
     <link rel="prev" title="Datetime" href="../datetime.html" />
   <meta name="viewport" content="width=device-width, initial-scale=1"/>
   <meta name="docsearch:language" content="en"/>
-    <meta name="docbuild:last-update" content="5 June 2024"/>
+    <meta name="docbuild:last-update" content="7 June 2024"/>
   </head>
 
 
@@ -597,7 +597,7 @@ <h3>Some core terminology<a class="headerlink" href="#some-core-terminology" tit
 </div>
 </div>
 <div class="cell_output docutils container">
-<div class="output stream highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>1717614346.1388805
+<div class="output stream highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>1717791502.3866818
 </pre></div>
 </div>
 </div>
@@ -618,7 +618,7 @@ <h3><code class="docutils literal notranslate"><span class="pre">time</span></co
 </div>
 </div>
 <div class="cell_output docutils container">
-<div class="output stream highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>The benchmark took 1.0002219676971436 seconds
+<div class="output stream highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>The benchmark took 1.0002167224884033 seconds
 </pre></div>
 </div>
 </div>
@@ -747,7 +747,7 @@ <h4>See how many days have elapsed since the strike:<a class="headerlink" href="
 </div>
 </div>
 <div class="cell_output docutils container">
-<div class="output text_plain highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>6188
+<div class="output text_plain highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>6190
 </pre></div>
 </div>
 </div>
@@ -819,8 +819,8 @@ <h3>Time Zone Naive Versus Time Zone Aware <code class="docutils literal notrans
 </div>
 </div>
 <div class="cell_output docutils container">
-<div class="output stream highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>I am time zone naive 2024-06-05 19:05:47.178211.
-I am time zone aware 2024-06-05 19:05:47.178239+00:00.
+<div class="output stream highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>I am time zone naive 2024-06-07 20:18:23.424868.
+I am time zone aware 2024-06-07 20:18:23.424895+00:00.
 </pre></div>
 </div>
 </div>
@@ -843,8 +843,8 @@ <h3>Full time zone support with the <code class="docutils literal notranslate"><
 </div>
 </div>
 <div class="cell_output docutils container">
-<div class="output stream highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>I am time zone naive: 2024-06-05 19:05:47.182445.
-I am time zone aware: 2024-06-05 13:05:47.193334-06:00.
+<div class="output stream highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>I am time zone naive: 2024-06-07 20:18:23.429273.
+I am time zone aware: 2024-06-07 14:18:23.440055-06:00.
 </pre></div>
 </div>
 </div>
@@ -866,11 +866,11 @@ <h3>Print Time with a Different Time Zone<a class="headerlink" href="#print-time
 </div>
 </div>
 <div class="cell_output docutils container">
-<div class="output stream highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>The UTC time is June 05, 2024, 7:05PM.
-The &#39;US/Mountain&#39; time is June 05, 2024, 1:05PM.
+<div class="output stream highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>The UTC time is June 07, 2024, 8:18PM.
+The &#39;US/Mountain&#39; time is June 07, 2024, 2:18PM.
 </pre></div>
 </div>
-<div class="output stderr highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>/tmp/ipykernel_2556/3080495102.py:1: DeprecationWarning: datetime.datetime.utcnow() is deprecated and scheduled for removal in a future version. Use timezone-aware objects to represent datetimes in UTC: datetime.datetime.now(datetime.UTC).
+<div class="output stderr highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>/tmp/ipykernel_2611/3080495102.py:1: DeprecationWarning: datetime.datetime.utcnow() is deprecated and scheduled for removal in a future version. Use timezone-aware objects to represent datetimes in UTC: datetime.datetime.now(datetime.UTC).
   utc = dt.datetime.utcnow().replace(tzinfo=pytz.utc)
 </pre></div>
 </div>
@@ -1247,7 +1247,7 @@ <h2>Resources and References<a class="headerlink" href="#resources-and-reference
 
   <div class="footer-item">
     <p class="last-updated">
-  Last updated on 5 June 2024.
+  Last updated on 7 June 2024.
   <br/>
 </p>
   </div>
@@ -1376,7 +1376,7 @@ <h1>Contribute</h1>
 
           By the <a href="https://projectpythia.org/">Project Pythia</a> Community.
 
-          Last updated on 5 June 2024.
+          Last updated on 7 June 2024.
         </p>
       </div>
     </div>