Updated github workflows, adjusted pyproject.toml

Deltares · Aug 11, 2023 · 0a6622c · 0a6622c
1 parent 542aec9
commit 0a6622c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -19,20 +19,23 @@ 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:
           python-version: "3.9"
           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
@@ -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
@@ -41,7 +41,6 @@ io = [
     "requests",
 ]
 extra = [
-    "gwwapi",
     "pyet",
 ]
 dev = [