Skip to content

Commit

Permalink
Touch up after solving micromamba hang, unpinning shapely modflow-dev…
Browse files Browse the repository at this point in the history
…tools
  • Loading branch information
jmccreight committed Jun 27, 2024
1 parent a2498dc commit ac76511
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
1 change: 0 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion doc/whats-new.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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>`_.
Expand All @@ -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>`_.
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pws_trouble
name: pws
channels:
- conda-forge
- nodefaults
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ test = [
"flaky",
"flopy",
"filelock",
"modflow-devtools==1.3.1",
"modflow-devtools",
"pre-commit",
"pytest!=8.1.0",
"pytest-cov",
Expand All @@ -74,7 +74,7 @@ optional = [
"cartopy",
"geopandas",
"hvplot",
"shapely <2.0.0",
"shapely",
"ipython",
"jupyter",
"jupyterlab",
Expand Down

0 comments on commit ac76511

Please sign in to comment.