Merge pull request #2 from open-energy-transition/os_to_pathlib

Os to pathlib and helpers.py method from pypsa-earth-sec

.github/workflows/ci-linux.yaml

@@ -3,10 +3,10 @@ name: CI-linux
 on:
   push:
     branches:
-    - main
+    - oet_main
   pull_request:
     branches:
-    - main
+    - oet_main
   schedule:
   - cron: "0 5 * * TUE"
 
@@ -82,6 +82,11 @@ jobs:
         cp test/tmp/config.landlock_tmp.yaml config.yaml
         snakemake --cores all solve_all_networks --forceall
 
+    - name: Unit tests
+      run: |
+        python -m pip install pytest
+        pytest test/
+
       # - name: Test plotting and summaries
       #   run: |
       #     snakemake --cores all plot_all_p_nom

.github/workflows/ci-mac.yaml

@@ -3,10 +3,10 @@ name: CI-mac
 on:
   push:
     branches:
-    - main
+    - oet_main
   pull_request:
     branches:
-    - main
+    - oet_main
   schedule:
   - cron: "0 5 * * TUE"
 
@@ -68,6 +68,11 @@ jobs:
         cp test/tmp/config.tutorial_noprogress_tmp.yaml config.yaml
         snakemake --cores all solve_all_networks
 
+    - name: Unit tests
+      run: |
+        python -m pip install pytest
+        pytest test/
+
       # - name: Test plotting and summaries
       #   run: |
       #     snakemake --cores all plot_all_p_nom

.github/workflows/ci-windows.yaml

@@ -3,10 +3,10 @@ name: CI-windows
 on:
   push:
     branches:
-    - main
+    - oet_main
   pull_request:
     branches:
-    - main
+    - oet_main
   schedule:
   - cron: "0 5 * * TUE"
 
@@ -68,6 +68,11 @@ jobs:
         cp test/tmp/config.tutorial_noprogress_tmp.yaml config.yaml
         snakemake --cores all solve_all_networks
 
+    - name: Unit tests
+      run: |
+        python -m pip install pytest
+        pytest test/
+
       # - name: Test plotting and summaries
       #   run: |
       #     snakemake --cores all plot_all_p_nom

Snakefile

@@ -6,7 +6,7 @@ import sys
 
 sys.path.append("./scripts")
 
-from os.path import normpath, exists, isdir
+from os.path import normpath, exists
 from shutil import copyfile, move
 
 from snakemake.remote.HTTP import RemoteProvider as HTTPRemoteProvider

doc/conf.py

@@ -12,16 +12,16 @@
 # -- Path setup --------------------------------------------------------------
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
+# documentation root, use pathlib.Path.absolute to make it absolute, like shown here.
 #
 import datetime
-import os
+import pathlib
 import shutil
 import sys
 
 from git import Repo
 
-sys.path.insert(0, os.path.abspath("../scripts"))
+sys.path.insert(0, str(pathlib.Path("../scripts").absolute()))
 for p in sys.path:
     print(p)