From 0a6622c4e2a905b14b1e34c786023e23a143a763 Mon Sep 17 00:00:00 2001
From: Brendan <brencodeert@outlook.com>
Date: Fri, 11 Aug 2023 11:57:37 +0200
Subject: [PATCH] Updated github workflows, adjusted pyproject.toml

---
 .github/workflows/docs.yml  | 11 +++++++----
 .github/workflows/tests.yml | 13 +++++++++----
 pyproject.toml              |  1 -
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 5832f22d..6cef6af7 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -19,8 +19,11 @@ jobs:
         shell: bash -l {0}
     steps:
       - name: Checkout source
-        uses: actions/checkout@v2
-      
+        uses: actions/checkout@v3
+      - name: install tomli
+        run: pip install tomli
+      - name: Generate env spec
+        run: python make_env.py doc
       - name: Setup environment
         uses: conda-incubator/setup-miniconda@v2
         with:
@@ -28,11 +31,11 @@ jobs:
           miniforge-variant: Mambaforge
           channels: conda-forge,defaults
           channel-priority: strict
-          environment-file: envs/hydromt-wflow.yml
+          environment-file: environment.yml
           activate-environment: hydromt-wflow
 
       - name: Install hydromt-wflow
-        run: flit install
+        run: pip install .
 
       - name: Build docs
         run: |
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8292d29c..4474b733 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -20,14 +20,19 @@ jobs:
         python-version: ["3.9"] # fix tests to support older versions
     
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout source
+        uses: actions/checkout@v3
+      - name: install tomli
+        run: pip install tomli
+      - name: Generate env spec
+        run: python make_env.py test
       - uses: conda-incubator/setup-miniconda@v2
         with:
           python-version: ${{ matrix.python-version }}
           mamba-version: "*"
           channels: conda-forge,defaults
-          channel-priority: true
-          environment-file: envs/test_env.yml
+          channel-priority: strict
+          environment-file: environment.yml
           activate-environment: hydromt-wflow
 
       - name: Conda info
@@ -36,7 +41,7 @@ jobs:
          conda list
 
       - name: Install hydromt_wflow
-        run: flit install --deps all
+        run: pip install .
 
       - name: Test
         run: python -m pytest --verbose --cov=hydromt_wflow --cov-report xml
diff --git a/pyproject.toml b/pyproject.toml
index ad9e676f..74a7afca 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -41,7 +41,6 @@ io = [
     "requests",
 ]
 extra = [
-    "gwwapi",
     "pyet",
 ]
 dev = [