Merge branch 'main' into 39-setup-urban-sewer-network-from-global-dat…

…a-project-overview

.github/workflows/ci.yml

@@ -9,16 +9,24 @@ on:
 
 jobs:
   build:
-    runs-on: ${{ matrix.os }}
+
     defaults:
       run:
         shell: bash -l {0}
+
     strategy:
+      fail-fast: false
       max-parallel: 5
       matrix:
-        python-version: [3.9]
+        python-version: ["3.9", "3.10", "3.11"]
         os: ["windows-latest"]
 
+    name: ${{ matrix.os }} - py${{ matrix.python-version }}
+    runs-on: ${{ matrix.os }}
+    concurrency:
+      group: ${{ github.workflow }}-${{ matrix.python-version }}-${{ github.ref }}
+      cancel-in-progress: true
+
     steps:
       - uses: actions/checkout@v3
       - uses: conda-incubator/setup-miniconda@v2

.github/workflows/docs.yml

@@ -1,11 +1,12 @@
+---
 name: Build Docs
 
 # We don't want pushes (or PRs) to gh-pages to kick anything off
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 jobs:
   # Build docs on Linux
@@ -20,7 +21,7 @@ jobs:
     steps:
       - name: Checkout source
         uses: actions/checkout@v2
-      
+
       - name: Setup environment
         uses: conda-incubator/setup-miniconda@v2
         with:
@@ -41,7 +42,8 @@ jobs:
           popd
 
       - name: Set doc version
-        run: echo "DOC_VERSION=$(python -c 'from hydromt_delft3dfm import __version__ as v; print("dev" if "dev" in v else "v"+v.replace(".dev",""))')" >> $GITHUB_ENV
+        run: echo "DOC_VERSION=$(python -c 'from hydromt_delft3dfm import __version__ as v; print("dev" if "dev" in v else "v"+v.replace(".dev",""))')"
+          >> $GITHUB_ENV
 
       - name: Upload to GitHub Pages
         if: ${{ github.event_name != 'pull_request'}}

.github/workflows/publish.yml

@@ -0,0 +1,117 @@
+---
+name: Build and Upload hydromt-delft3dfm 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.9
+
+      - 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-delft3dfm-min.yml
+          activate-environment: hydromt-delft3dfm
+
+      - name: Conda info
+        run: |
+          conda info
+          conda list
+
+      - name: Verify the built dist/wheel is valid
+        run: |
+          python -m pip install dist/hydromt_delft3dfm*.whl
+          python -c 'from hydromt_delft3dfm 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

.gitignore

@@ -77,6 +77,7 @@ target/
 
 # Jupyter Notebook
 .ipynb_checkpoints
+.examples/build
 
 # IPython
 profile_default/