Merge pull request #103 from Deltares/prep_release

Prep release 0.2.0

.github/workflows/publish.yml

@@ -0,0 +1,116 @@
+name: Build and Upload HydroMT-Wflow to PyPI
+
+on:
+  release:
+    types:
+      - published
+  push:
+    tags:
+      - 'v*'
+
+
+jobs:
+  build-artifacts:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-python@v4
+        name: Install Python
+        with:
+          python-version: 3.8
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install flit wheel twine
+
+      - name: Build tarball and wheels
+        run: |
+          git clean -xdf
+          git restore -SW .
+          flit build
+
+      - name: Check built artifacts
+        run: |
+          python -m twine check dist/*
+          pwd
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: releases
+          path: dist
+
+  test-built-dist:
+    needs: build-artifacts
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash -l {0}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/download-artifact@v3
+        with:
+          name: releases
+          path: dist
+      - name: List contents of built dist
+        run: |
+          ls -ltrh
+          ls -ltrh dist
+
+      - name: Setup environment
+        uses: conda-incubator/setup-miniconda@v2
+        with:
+          python-version: "3.9"
+          mamba-version: "*"
+          channels: conda-forge,defaults
+          channel-priority: true
+          environment-file: envs/hydromt-wflow-min.yml
+          activate-environment: hydromt-wflow-min
+
+      - name: Conda info
+        run: |
+          conda info
+          conda list
+
+      - name: Verify the built dist/wheel is valid
+        run: |
+          python -m pip install dist/hydromt_wflow*.whl
+          python -c 'from hydromt_wflow import __version__ as v; print(v)'
+          echo "hydromt --models"
+
+  upload-to-test-pypi:
+    needs: test-built-dist
+    if: github.event_name == 'push'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: releases
+          path: dist
+      - name: Publish package to TestPyPI
+        uses: pypa/[email protected]
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI_TEST_TOKEN }}
+          repository_url: https://test.pypi.org/legacy/
+          verbose: true
+          skip_existing: true
+
+  upload-to-pypi:
+    needs: test-built-dist
+    if: github.event_name == 'release'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: releases
+          path: dist
+      - name: Publish package to PyPI
+        uses: pypa/[email protected]
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI_TOKEN }}
+          verbose: true

docs/changelog.rst

@@ -5,8 +5,11 @@ All notable changes to this project will be documented in this page.
 The format is based on `Keep a Changelog`_, and this project adheres to
 `Semantic Versioning`_.
 
-Unreleased
-----------
+v0.2.0 (5 August 2022)
+----------------------
+We now use rioxarray to read raster data. We recommend reinstalling your hydromt and hydromt_wflow environment including the rioxarray package.
+This enables the writting of CF compliant netcdf files for wflow staticmaps.nc and inmaps.nc.
+Following an update in xarray, hydromt version should be >= 0.5.0.
 
 Fixed
 ^^^^^

environment.yml

@@ -12,10 +12,11 @@ dependencies:
   - dask
   - descartes # to run examples
   - entrypoints
-  - flit>=3.2
+  - flit>=3.4
   - gdal>=3.1
-  - geopandas
-#  - hydromt>=0.4.0
+  - geopandas>=0.10
+  - hydromt>=0.5.0
+  - hydromt_wflow
   - jupyter # to run examples
   - netcdf4
   - matplotlib # to run examples
@@ -25,7 +26,7 @@ dependencies:
   - pandas
   - pcraster # optional
   - pip
-  - pyflwdir>=0.4.7
+  - pyflwdir>=0.5.5
   - pygeos>=0.8
   - python>=3.7
   - rasterio
@@ -37,6 +38,4 @@ dependencies:
   - zarr
   - pip:
     - hydroengine
-    - git+https://github.com/Deltares/hydromt.git
-    - git+https://github.com/Deltares/hydromt_wflow.git
 

envs/hydromt-wflow-min.yml

@@ -0,0 +1,35 @@
+name: hydromt-wflow-min
+
+channels:
+  - conda-forge
+
+# note that these are the developer dependencies
+dependencies:
+  - affine
+  - click
+  - black
+  - bottleneck
+  - dask
+  - entrypoints
+  - flit>=3.4
+  - gdal>=3.1
+  - geopandas>=0.10
+  - hydromt >= 0.5.0
+  - netcdf4
+  - numba
+  - numpy
+  - openpyxl
+  - pandas
+  - pcraster # optional
+  - pip
+  - pyflwdir>=0.5.5
+  - pygeos>=0.8
+  - python>=3.7
+  - rasterio
+  - rioxarray
+  - requests
+  - scipy
+  - toml
+  - xarray
+  - zarr
+

envs/hydromt-wflow.yml

@@ -13,9 +13,9 @@ dependencies:
   - dask
   - descartes # to run examples
   - entrypoints
-  - flit>=3.2
+  - flit>=3.4
   - gdal>=3.1
-  - geopandas
+  - geopandas>=0.10
   # - hydromt >= 0.4.5
   - jupyter # to run examples
   - netcdf4

envs/test_env.yml

@@ -12,9 +12,9 @@ dependencies:
   - bottleneck
   - dask
   - entrypoints
-  - flit>=3.2
+  - flit>=3.4
   - gdal>=3.1
-  - geopandas
+  - geopandas>=0.10
   # - hydromt >= 0.4.5
   - netcdf4
   - numba

hydromt_wflow/__init__.py

@@ -2,7 +2,7 @@
 
 from os.path import join, dirname, abspath
 
-__version__ = "0.1.5.dev"
+__version__ = "0.2.0"
 
 try:
     import pcraster as pcr

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["flit_core >=3.2.0,<3.3"]
+requires = ["flit_core >=3.4.0,<4"]
 build-backend = "flit_core.buildapi"
 
 [project]
@@ -9,9 +9,9 @@ authors = [
     {name = "Hélène Boisgontier", email = "[email protected]"},
 ]
 dependencies = [
-    "hydromt >=0.4.5",
+    "hydromt >=0.5.0",
     "dask",
-    "geopandas >=0.8",
+    "geopandas >=0.10",
     "netcdf4",
     "numpy",
     "pandas",
@@ -38,16 +38,16 @@ dynamic = ['version', 'description']
 
 [project.optional-dependencies]
 test = [
-    "testpath",
-    "responses",
     "pytest>=2.7.3",
     "pytest-cov",
     "black",
 ]
 doc = [
+    "nbsphinx",
     "sphinx",
     "sphinx_design",
     "pydata-sphinx-theme",
+    "sphinx_autosummary_accessors",
 ]
 
 [project.urls]