From ac76511697cd6905fec2a87d403e2e73a8e97669 Mon Sep 17 00:00:00 2001
From: James McCreight <jamesmcc@ucar.edu>
Date: Thu, 27 Jun 2024 17:45:20 -0600
Subject: [PATCH] Touch up after solving micromamba hang, unpinning shapely
 modflow-devtools

---
 .github/workflows/ci.yaml | 1 -
 doc/whats-new.rst         | 5 ++++-
 environment.yml           | 2 +-
 pyproject.toml            | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e44c2a68..509ece9c 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -152,7 +152,6 @@ jobs:
       - name: Install Dependencies via Micromamba
         uses: mamba-org/setup-micromamba@v1
         with:
-          micromamba-version: '1.5.6-0'
           environment-file: environment.yml
           cache-environment: true
           cache-downloads: true
diff --git a/doc/whats-new.rst b/doc/whats-new.rst
index 959e876a..73876138 100644
--- a/doc/whats-new.rst
+++ b/doc/whats-new.rst
@@ -17,7 +17,7 @@ What's New
 v1.2.0 (Unreleased)
 ---------------------
 
-Breaking changes
+New Features
 ~~~~~~~~~~~~~~~~
 - The depression storage option for PRMSRunoff is implemented and tested.
   (:pull:`279`) By `James McCreight <https://github.com/jmccreight>`_.
@@ -35,6 +35,9 @@ Breaking changes
   (:pull:`288`) By `James McCreight <https://github.com/jmccreight>`_.
 - Control instances have a diff method to compare with other instances.
   (:pull:`288`) By `James McCreight <https://github.com/jmccreight>`_.
+
+Breaking Changes
+~~~~~~~~~~~~~~~~
 - pref_flow_infil_frac now a required parameter input for PRMSSoilzone. The NHM
   values assumed previously are zeros on all HRUs.
   (:pull:`288`) By `James McCreight <https://github.com/jmccreight>`_.
diff --git a/environment.yml b/environment.yml
index 29122101..c3ef743b 100644
--- a/environment.yml
+++ b/environment.yml
@@ -1,4 +1,4 @@
-name: pws_trouble
+name: pws
 channels:
   - conda-forge
   - nodefaults
diff --git a/pyproject.toml b/pyproject.toml
index 507f8626..89aeeffd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -60,7 +60,7 @@ test = [
     "flaky",
     "flopy",
     "filelock",
-    "modflow-devtools==1.3.1",
+    "modflow-devtools",
     "pre-commit",
     "pytest!=8.1.0",
     "pytest-cov",
@@ -74,7 +74,7 @@ optional = [
     "cartopy",
     "geopandas",
     "hvplot",
-    "shapely <2.0.0",
+    "shapely",
     "ipython",
     "jupyter",
     "jupyterlab",