From c459d8b43c34b20710b3444b3a87579c5b3a858d Mon Sep 17 00:00:00 2001
From: DWesl <22566757+DWesl@users.noreply.github.com>
Date: Wed, 30 Oct 2024 17:21:10 -0400
Subject: [PATCH 1/5] DOC: Specify py2k-compatible version in py3k statement
The `python>=3.6` requirement at the top of the file dates to early 2020, before v0.1 of MONETIO. Before this, MONET and MONETIO were one package. It looks like the last commit in MONET 2.1.5 merges in the work to split MONET and MONETIO, so someone wanting MONETIO functionality from MONET would need a MONET version prior to that.
---
docs/installing.rst | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/installing.rst b/docs/installing.rst
index 76ea9108..04c53371 100644
--- 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 `__
- `Tips on porting to Python 3 `__
From 7ad479905beaf538bcac22f0bff692bbb2e93600 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Nov 2024 11:59:09 -0400
Subject: [PATCH 2/5] Bump mamba-org/setup-micromamba from 1 to 2 (#213)
Bumps [mamba-org/setup-micromamba](https://github.com/mamba-org/setup-micromamba) from 1 to 2.
- [Release notes](https://github.com/mamba-org/setup-micromamba/releases)
- [Commits](https://github.com/mamba-org/setup-micromamba/compare/v1...v2)
---
updated-dependencies:
- dependency-name: mamba-org/setup-micromamba
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 848d038e..e058fae7 100644
--- 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
From 53adecd4548b48c771cb27dee48e36aa48af4901 Mon Sep 17 00:00:00 2001
From: DWesl <22566757+DWesl@users.noreply.github.com>
Date: Fri, 1 Nov 2024 13:42:53 -0400
Subject: [PATCH 3/5] STY: Remove end-of-line whitespace
Thought I'd caught all of those, thanks for spotting that one.
Co-authored-by: Zachary Moon
---
docs/installing.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/installing.rst b/docs/installing.rst
index 04c53371..a2982687 100644
--- a/docs/installing.rst
+++ b/docs/installing.rst
@@ -51,8 +51,8 @@ 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 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
+ 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 `__
From eeda56cff0ee2e79605a35e386a912da9d166398 Mon Sep 17 00:00:00 2001
From: DWesl <22566757+DWesl@users.noreply.github.com>
Date: Fri, 1 Nov 2024 13:50:57 -0400
Subject: [PATCH 4/5] DOC: Cite the MONET/MONETIO split
---
docs/index.rst | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/docs/index.rst b/docs/index.rst
index 31e35c27..b75f2b4d 100644
--- 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.
+From 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,7 +78,6 @@ Supported datasets
* `IMPROVE `_
* `ISH `_
-
.. toctree::
:maxdepth: 10
:caption: Help & Reference
@@ -86,3 +85,9 @@ Supported datasets
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 noaa-oar-arl/monet#77, which brought the branch testing the split MONET and MONETIO packages into the
+ primary branch of the repository.
From 508cc74206b3f6e49b4d937b5561f8669b6d6065 Mon Sep 17 00:00:00 2001
From: DWesl <22566757+DWesl@users.noreply.github.com>
Date: Sat, 2 Nov 2024 11:21:24 -0400
Subject: [PATCH 5/5] DOC,FIX: Fix rst syntax in MONETIO-split footnote.
Apparently I've spent too long on GitHub.
Co-authored-by: Zachary Moon
---
docs/index.rst | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/docs/index.rst b/docs/index.rst
index b75f2b4d..30f38c69 100644
--- 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 [#monetio-split]_.
+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.
@@ -88,6 +88,8 @@ Supported datasets
.. 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 noaa-oar-arl/monet#77, which brought the branch testing the split MONET and MONETIO packages into the
- primary branch of the repository.
+.. [#monetio-split] The last commit of `MONET v2.1.5 `__
+ merged `PR#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 `__
+ and `MONETIO v0.1 `__ (Mar 2020).