Fixed opex cost attribute accepts yr time unit

.gitattributes

@@ -1 +1 @@
-src/rtctools_heat_network/_version.py export-subst
+src/mesido/_version.py export-subst

.github/workflows/ci.yml

@@ -1,22 +1,32 @@
 name: PyPi release
 run-name: CI pipeline
 on:
-  push:
+  pull_request:
     branches:
       - '*'
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review
+  push:
+    branches:
+      - main
 
 jobs:
   style:
     name: Check style
     runs-on: ubuntu-latest
+    timeout-minutes: 5
+    if: ${{ !github.event.pull_request.draft }}
     env:
       TOXENV: flake8,black
     steps:
       - uses: actions/checkout@v3
 
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.8"
+          python-version: "3.11"
 
       - name: deps
         run: python -m pip install -U tox
@@ -27,46 +37,143 @@ jobs:
   build:
     name: Check build
     runs-on: ubuntu-latest
+    timeout-minutes: 5
+    if: ${{ !github.event.pull_request.draft }}
     steps:
       - uses: actions/checkout@v3
 
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.8"
+          python-version: "3.11"
 
       - name: deps
         run: python -m pip install -U wheel setuptools build
 
       - name: Check build
         run: python setup.py sdist bdist_wheel
+
+  # Main testing part 1
+  test_main_1:
+    name: Test main - 1
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    if: ${{ !github.event.pull_request.draft }}
+    env:
+      TOXENV: py311
+    steps:
+      - uses: actions/checkout@v3
 
-  test:
-    name: Check test
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.11"
+
+      - name: deps
+        run: python -m pip install -U tox
+
+      - name: Check test
+        run: tox -vv -etest_env_main_1
+
+  # Main testing part 2
+  test_main_2:
+    name: Test main - 2
     runs-on: ubuntu-latest
+    timeout-minutes: 5
+    if: ${{ !github.event.pull_request.draft }}
     env:
-      TOXENV: py38
+      TOXENV: py311
     steps:
       - uses: actions/checkout@v3
 
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.8"
+          python-version: "3.11"
 
       - name: deps
         run: python -m pip install -U tox
+
+      - name: Check test
+        run: tox -vv -etest_env_main_2
+
+  # Pre-processing testing
+  test_pre_processing:
+    name: Test pre-processing
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    if: ${{ !github.event.pull_request.draft }}
+    env:
+      TOXENV: py311
+    steps:
+      - uses: actions/checkout@v3
 
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.11"
+
+      - name: deps
+        run: python -m pip install -U tox
+
       - name: Check test
-        run: tox -vv
+        run: tox -vv -etest_env_pre
+
+      - name: Upload results
+        uses: actions/upload-artifact@v4
+        with:
+          name: updated_esdl_file
+          path: examples/PoCTutorial/model/PoC Tutorial_GrowOptimized.esdl
+          retention-days: 5
+
+      - name: Upload results
+        uses: actions/upload-artifact@v4
+        with:
+          name: updated_esdl_string_file
+          path: examples/PoCTutorial/model/PoC Tutorial_GrowOptimized_esdl_string.esdl
+          retention-days: 5
+
+
+  # Post processing testing dependant on pre-processing
+  test_post_processing:
+    name: Test post-processing
+    needs: test_pre_processing
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    if: ${{ !github.event.pull_request.draft }}
+    env:
+      TOXENV: py311
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.11"
 
+      - name: deps
+        run: python -m pip install -U tox
+
+      - name: Archive test artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: updated_esdl_file
+          path: examples/PoCTutorial/model/     
+      - name: Archive test artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: updated_esdl_string_file
+          path: examples/PoCTutorial/model/  
+
+      - name: Check test
+        run: tox -vv -etest_env_post
+
   documentation:
     name: Generate documentation
     runs-on: ubuntu-latest
+    timeout-minutes: 5
+    if: ${{ !github.event.pull_request.draft }}
     steps:
       - uses: actions/checkout@v3
 
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.8"
+          python-version: "3.11"
 
       - name: Generate documentation
         run: |

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
 
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.8"
+          python-version: "3.11"
 
       - name: deps
         run: python -m pip install -U build

.gitignore

@@ -25,9 +25,18 @@ src/*.egg-info
 .ipynb_checkpoints
 .vscode
 
-# Kobus van Rooyen
-run_pipe_compare.py
-.venv/
+# Abbreviation to be added to files/folders name
+# Meaning of abbreviation: exclude from version control
+*_efvc_*
+
 # Ignore ESDL files created by workflows
 *_GrowOptimized.esdl 
+*_GrowOptimized_esdl_string.esdl 
 *_Simulation.esdl
+
+# Virtual environment files
+.venv/*
+
+# Docs build folder
+docs/_build/*
+docs/_build_kvr_

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: python:3.7
+image: python:3.11
 
 before_script:
   - pip install tox
@@ -13,7 +13,7 @@ stages:
 # style
 style:
   stage: style
-  image: python:3.7
+  image: python:3.11
   script:
     - tox -vv
   variables:
@@ -30,13 +30,18 @@ build:
     expire_in: 1 week
 
 # test
-py37:linux:
+py311:linux:
   stage: test
   script:
-    - tox -vv
-  image: python:3.7
+    - echo "Demo" > Demo.txt
+  artifacts: 
+    paths: 
+      - ./Demo.txt
+      # - ./PoC Tutorial_GrowOptimized.esdl
+    expire_in: 1 week
+  image: python:3.11
   variables:
-    TOXENV: py37
+    TOXENV: py311
 
 # documentation
 pages:

.readthedocs.yaml

@@ -9,7 +9,7 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.8"
+    python: "3.11"
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx: