Merge branch 'noaa-oar-arl:develop' into develop

noaa-oar-arl · Nov 5, 2024 · 4309ebd · 4309ebd
2 parents 86e70c0 + ea10e76
commit 4309ebd
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
 
       - name: Set up Python (micromamba) [>3.6]
         if: matrix.python-version != '3.6'
-        uses: mamba-org/setup-micromamba@v1
+        uses: mamba-org/setup-micromamba@v2
         with:
           environment-file: environment-dev.yml
           cache-environment: true
@@ -38,7 +38,7 @@ jobs:
 
       - name: Set up Python (micromamba) [3.6]
         if: matrix.python-version == '3.6'
-        uses: mamba-org/setup-micromamba@v1
+        uses: mamba-org/setup-micromamba@v2
         with:
           environment-file: environment-dev.yml
           cache-environment: true
@@ -67,7 +67,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Python (micromamba)
-        uses: mamba-org/setup-micromamba@v1
+        uses: mamba-org/setup-micromamba@v2
         with:
           environment-file: docs/environment-docs.yml
           cache-environment: true

diff --git a/docs/index.rst b/docs/index.rst
@@ -7,7 +7,7 @@ air quality models.
 
 MONET was developed to evaluate the Community Multiscale Air Quality Model (CMAQ)
 for the NOAA National Air Quality Forecast Capability (NAQFC) modeling system.
-From MONET version 2.1.4, MONETIO was broken off from MONET to be its own dedicated repository.
+After MONET version 2.1.4, MONETIO was broken off from MONET to be its own dedicated repository [#monetio-split]_.
 MONETIO is built to work in unison with MONET. For more information on MONET please refer to
 https://monet-arl.readthedocs.io.
 
@@ -78,11 +78,18 @@ Supported datasets
 * `IMPROVE <http://vista.cira.colostate.edu/Improve/>`_
 * `ISH <https://www.ncei.noaa.gov/products/land-based-station/integrated-surface-database>`_
 
-
 .. toctree::
    :maxdepth: 10
    :caption: Help & Reference
    :hidden:
 
    api
    get-in-touch
+
+.. rubric:: Footnotes
+
+.. [#monetio-split] The last commit of `MONET v2.1.5 <https://github.com/noaa-oar-arl/monet/releases/tag/v2.1.5>`__
+   merged `PR#77 <https://github.com/noaa-oar-arl/monet/pull/77>`__, which brought the branch testing the split MONET and MONETIO packages into the
+   primary branch of the repository.
+   The first official split GitHub releases with were `MONET v2.2.0 <https://github.com/noaa-oar-arl/monet/releases/tag/v2.2.0>`__
+   and `MONETIO v0.1 <https://github.com/noaa-oar-arl/monetio/releases/tag/v0.1>`__ (Mar 2020).
diff --git a/docs/installing.rst b/docs/installing.rst
@@ -50,10 +50,10 @@ or you can manually download it from GitHub and install it using the setup.py::
 
 .. note::
    MONET plans to drop support for python 2.7 sometime in 2019. This
-   means that new releases of xarray published after this date will only be
-   installable on python 3+ environments, but older versions of xarray will
-   always be available to python 2.7 users. For more information see the
-   following references:
+   means that new releases of MONET and MONETIO published after this date will
+   only be installable on python 3+ environments, but older versions of MONET
+   (< 2.1.5) will always be available to python 2.7 users. For more information
+   see the following references:
 
       - `Python 3 Statement <https://python3statement.github.io/>`__
       - `Tips on porting to Python 3 <https://docs.python.org/3/howto/pyporting.html>`__