Merge remote-tracking branch 'origin/main' into refine_dh_areas

Author: cpschau

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,68 @@
+name: Bug Report
+description: Create a report if something doesn't work quite right.
+labels: ["needs triage"]
+type: "Bug"
+
+body:
+- type: markdown
+  attributes:
+    value: |
+      Thanks for taking the time to fill out this bug report!
+      Please do not post usage questions here. Ask them on the [PyPSA Discord server](https://discord.gg/AnuJBk23FU).
+
+- type: checkboxes
+  id: checks
+  attributes:
+    label: Version Checks (indicate both or one)
+    options:
+    - label: >
+        I have confirmed this bug exists on the lastest
+        [release](https://github.com/pypsa/PyPSA-DE/releases) of PyPSA-DE.
+    - label: >
+        I have confirmed this bug exists on the current
+        [`master`](https://github.com/pypsa/PyPSA-DE/tree/master) branch of PyPSA-DE.
+
+- type: textarea
+  id: problem
+  attributes:
+    label: Issue Description
+    description: >
+      Please provide a description of the issue.
+  validations:
+    required: true
+
+- type: textarea
+  id: example
+  validations:
+    required: true
+  attributes:
+    label: Reproducible Example
+    description: >
+      Please provide a minimal reproduciable example. See how to [craft minimal bug reports](https://matthewrocklin.com/minimal-bug-reports).
+    placeholder: >
+      ...
+
+    render: python
+
+- type: textarea
+  id: expected-behavior
+  validations:
+    required: true
+  attributes:
+    label: Expected Behavior
+    description: >
+      Please describe or show a code example of the expected behavior.
+
+- type: textarea
+  id: version
+  attributes:
+    label: Installed Versions
+    description: >
+      Please share information on your environment. Paste the output below.  For conda ``conda env export`` and for pip ``pip freeze``.
+    value: >
+      <details>
+
+      Replace this line.
+
+      </details>
+

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+- name: PyPSA Discord server
+  url: https://discord.gg/AnuJBk23FU
+  about: Please ask and answer general usage questions here.

.github/ISSUE_TEMPLATE/config.yaml

@@ -1,13 +1,14 @@
 ---
-name: Feature request
+name: Feature Request
 about: Suggest an idea for this project
 title: ''
-labels: enhancement
+labels: ["needs triage"]
+type: 'Feature'
 assignees: ''
 
 ---
 
-<!-- Please do not post usage questions here. Ask them on the PyPSA mailing list: https://groups.google.com/forum/#!forum/pypsa -->
+<!-- Please do not post usage questions here. Ask them on the PyPSA Discord server: https://discord.gg/AnuJBk23FU -->
 
 ## Describe the feature you'd like to see
 

.github/ISSUE_TEMPLATE/config.yml

@@ -40,12 +40,14 @@ jobs:
     - name: Setup env file path (ubuntu)
       if: matrix.os == 'ubuntu'
       run: |
-        echo "env_file=envs/linux-pinned.yaml" >> $GITHUB_ENV
+        # echo "env_file=envs/linux-pinned.yaml" >> $GITHUB_ENV
+        echo "env_file=${{ env.BASE_ENV }}" >> $GITHUB_ENV # TODO Remove
 
     - name: Setup env file path (macos and windows)
       if: matrix.os != 'ubuntu'
       run: |
         echo "env_file=envs/${{ matrix.os }}-pinned.yaml" >> $GITHUB_ENV
+        echo "env_file=${{ env.BASE_ENV }}" >> $GITHUB_ENV # TODO Remove
 
     - name: Use base env file if it was changed
       run: |
@@ -60,7 +62,7 @@ jobs:
     - name: Setup cache keys
       run: |
         echo "WEEK=$(date +'%Y%U')" >> $GITHUB_ENV # data and cutouts
-
+  
     - uses: actions/cache@v4
       with:
         path: |
@@ -71,7 +73,7 @@ jobs:
     - uses: conda-incubator/setup-miniconda@v3
       with:
         miniforge-version: latest
-        activate-environment: pypsa-eur
+        activate-environment: pypsa-de
         channel-priority: strict
 
     - name: Cache Conda env
@@ -84,13 +86,21 @@ jobs:
     - name: Update environment
       if: steps.cache-env.outputs.cache-hit != 'true'
       run: |
-        conda env update -n pypsa-eur -f ${{ env.env_file }}
+        conda env update -n pypsa-de -f ${{ env.env_file }}
         echo "Run conda list" && conda list
-
-    - name: Run pylint check on scripts
-      # check for undefined variables to reuse functions across scripts
+    
+    - name: Setup ixmp4 access
       run: |
-        pylint --disable=all --enable=E0601 --output-format=parseable scripts/add_* scripts/prepare_* scripts/solve_* 
+        mkdir -p ~/.local/share/ixmp4/
+        cat > ~/.local/share/ixmp4/credentials.toml << 'EOL'
+        ${{ secrets.IXMP4_ACCESS }}
+        EOL
+      shell: bash
+
+    # - name: Run pylint check on scripts
+    #   # check for undefined variables to reuse functions across scripts
+    #   run: |
+    #     pylint --disable=all --enable=E0601,E0606 --output-format=parseable scripts/add_* scripts/prepare_* scripts/solve_* 
 
     - name: Run snakemake test workflows
       run: |
@@ -138,7 +148,8 @@ jobs:
           echo "env_file=${{ env.BASE_ENV }}" >> $GITHUB_ENV
         else
           echo "Base env ${{ env.BASE_ENV }} not changed. Using pinned envs."
-          echo "env_file=envs/linux-pinned.yaml" >> $GITHUB_ENV
+          # echo "env_file=envs/linux-pinned.yaml" >> $GITHUB_ENV
+          echo "env_file=${{ env.BASE_ENV }}" >> $GITHUB_ENV # TODO Remove
         fi
 
     # Only run checks if package is not pinned
@@ -150,7 +161,7 @@ jobs:
         else
             echo "pinned=false" >> $GITHUB_ENV
         fi
-
+    
     - name: Setup cache keys
       if: env.pinned == 'false'
       run: |
@@ -167,7 +178,7 @@ jobs:
     - uses: conda-incubator/setup-miniconda@v3
       if: env.pinned == 'false'
       with:
-        activate-environment: pypsa-eur
+        activate-environment: pypsa-de
 
     - name: Cache Conda env
       if: env.pinned == 'false'
@@ -180,9 +191,17 @@ jobs:
     - name: Update environment
       if: env.pinned == 'false' && steps.cache-env.outputs.cache-hit != 'true'
       run: |
-        conda env update -n pypsa-eur -f ${{ env.env_file }}
+        conda env update -n pypsa-de -f ${{ env.env_file }}
         echo "Run conda list" && conda list
 
+    - name: Setup ixmp4 access
+      run: |
+        mkdir -p ~/.local/share/ixmp4/
+        cat > ~/.local/share/ixmp4/credentials.toml << 'EOL'
+        ${{ secrets.IXMP4_ACCESS }}
+        EOL
+      shell: bash
+
     - name: Install inhouse packages from master
       if: env.pinned == 'false'
       run: |
@@ -202,4 +221,4 @@ jobs:
           logs
           .snakemake/log
           results
-        retention-days: 3
+        retention-days: 3

.github/ISSUE_TEMPLATE/feature_request.md

@@ -34,7 +34,6 @@ config/config.yaml
 config/scenarios.yaml
 config/scenarios.automated.yaml
 
-config.yaml
 config/config.yaml
 
 dconf

.github/workflows/test.yaml

@@ -0,0 +1,9 @@
+ci:
+  autoupdate_schedule: monthly
+
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v5.0.0
+  hooks:
+  - id: check-added-large-files
+    args: ['--maxkb=2000']

.gitignore

@@ -1,4 +1,6 @@
 # Changelog
+- CHP plants located in onshore regions without district heating are represented as EOP plants
+- updating technology cost data to v0.11.0
 - add option for Offhsore NEP to delay projects by x years (CurPol and KN2045minus_WorstCase are delayed by one year)
 - Force onwind south by increasing minimum capacity and decreasing capacity per sqkm
 - Adjusting aviation demand (from Aladin) and emission accounting (only domestic aviation for national target)

.pre-commit-config.yaml

@@ -54,11 +54,11 @@ install-pinned-macos: _conda_check
 # Run default tests
 test:
 	set -e
-	snakemake solve_elec_networks --configfile config/test/config.electricity.yaml
-	snakemake --configfile config/test/config.overnight.yaml
-	snakemake --configfile config/test/config.myopic.yaml
-	snakemake make_summary_perfect --configfile config/test/config.perfect.yaml
-	snakemake --configfile config/test/config.scenarios.yaml -n
+	echo "Running tests..."
+	echo "Build scenarios..."
+	snakemake build_scenarios
+	echo "Run DACH config..."
+	snakemake ariadne_all --configfile=config/test/config.dach.yaml
 	echo "All tests completed successfully."
 
 unit-test:
@@ -83,4 +83,4 @@ reset:
 		rm -r ./.snakemake || true; \
 		rm ./config/config.yaml || true; \
 		echo "Reset completed." \
-	) || echo "Reset cancelled."
+	) || echo "Reset cancelled."