Merge branch 'master' of https://github.com/Timon-R/pypsa-eur

Author: Timon-R

.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-eur/releases) of PyPSA-Eur.
+    - label: >
+        I have confirmed this bug exists on the current
+        [`master`](https://github.com/pypsa/pypsa-eur/tree/master) branch of PyPSA-Eur.
+
+- 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

@@ -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

@@ -0,0 +1,52 @@
+name: Push images
+
+on:
+  push:
+
+    branches:
+    - master
+  workflow_dispatch:
+
+env:
+  IMAGE_NAME: pypsa/eur-dev-env
+  BASE_ENV: envs/linux-pinned.yaml
+
+jobs:
+  push-image:
+    name: dev-env
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
+    - name: 'Get relevant env'
+      run: |
+        hash_last_changed=$(git log -1 --pretty=format:%H -- ${{ env.BASE_ENV }})
+        echo "hash_last_changed=$hash_last_changed" >> $GITHUB_ENV
+
+    - name: 'Login to GitHub Container Registry'
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.REGISTRY_TOKEN }}
+
+    - name: 'Build new image' # only build if the pinned envs file was modified
+      if: env.hash_last_changed == github.sha || github.event_name == 'workflow_dispatch'
+      run: |
+        docker build . --file docker/dev-env/Dockerfile --tag ghcr.io/${{ env.IMAGE_NAME }}:${{ github.sha }}
+        docker push ghcr.io/${{ env.IMAGE_NAME }}:${{ github.sha }}
+
+        # Add latest tag if on main branch
+        if [ "${{ github.ref }}" == "refs/heads/master" ]; then
+          docker tag ghcr.io/${{ env.IMAGE_NAME }}:${{ github.sha }} ghcr.io/${{ env.IMAGE_NAME }}:latest
+          docker push ghcr.io/${{ env.IMAGE_NAME }}:latest
+        fi
+
+    - name: 'Add SHA tag to existing image' # when rebuild is not needed
+      if: env.hash_last_changed != github.sha
+      run: |-
+        docker pull ghcr.io/${{ env.IMAGE_NAME }}:${{ env.hash_last_changed }}
+        docker tag ghcr.io/${{ env.IMAGE_NAME }}:${{ env.hash_last_changed }} ghcr.io/${{ env.IMAGE_NAME }}:${{ github.sha }}
+        docker push ghcr.io/${{ env.IMAGE_NAME }}:${{ github.sha }}

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: Contributors to PyPSA-Eur <https://github.com/pypsa/pypsa-eur>
-#
-# SPDX-License-Identifier: CC0-1.0
-
 name: Test workflows
 
 on:
@@ -14,6 +10,7 @@ on:
   schedule:
   - cron: "0 5 * * 1-6"
   - cron: "0 5 * * 0"
+  workflow_dispatch:
 
 # Cancel any in-progress runs when a new run is triggered
 concurrency:
@@ -73,7 +70,9 @@ jobs:
 
     - uses: conda-incubator/setup-miniconda@v3
       with:
+        miniforge-version: latest
         activate-environment: pypsa-eur
+        channel-priority: strict
 
     - name: Cache Conda env
       uses: actions/cache@v4
@@ -88,6 +87,11 @@ jobs:
         conda env update -n pypsa-eur -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
+      run: |
+        pylint --disable=all --enable=E0601,E0606 --output-format=parseable scripts/add_* scripts/prepare_* scripts/solve_* 
+
     - name: Run snakemake test workflows
       run: |
         make test

.github/dependabot.yml .github/dependabot.yaml.github/dependabot.yml renamed to .github/dependabot.yaml

@@ -34,8 +34,9 @@ jobs:
     - name: Setup conda
       uses: conda-incubator/setup-miniconda@v3
       with:
+        miniforge-version: latest
         activate-environment: ${{ github.event.repository.name }}
-        channels: bioconda,conda-forge,defaults
+        channel-priority: strict
         environment-file: ${{ env.BASE_ENV }}
 
     - name: Update pinned environment per OS
@@ -83,5 +84,8 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
         branch: update-pinned-environment
         title: "[github-actions.ci] Update pinned envs"
-        body: "Automatically generated PR to update pinned environment files for Windows, macOS, and Linux."
+        body: |
+          Automatically generated PR to update pinned environment files for Windows, macOS, and Linux.
+
+          **Note: Do not merge without manual test execution. Either update the branch to trigger tests, or use `workflow_dispatch` to run tests manually. Unlike standard PRs, tests will not run automatically.**
         commit-message: "Update pinned environment files for all platforms"

.github/workflows/codeql.yml .github/workflows/codeql.yaml.github/workflows/codeql.yml renamed to .github/workflows/codeql.yaml

@@ -4,7 +4,6 @@ on:
   pull_request:
     branches:
     - master
-    - main
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -15,22 +14,36 @@ jobs:
     name: Run validation
     if: github.event.pull_request.head.repo.full_name == github.repository
     runs-on: self-hosted
+    outputs:
+      validation_failed: ${{ steps.check_validation.outputs.failed }}
     steps:
-    - uses: lkstrp/pypsa-validator@v0.2.4
+    - uses: lkstrp/pypsa-validator@v0.2.5
+      id: validation
+      continue-on-error: true
       with:
         step: run-self-hosted-validation
         env_file: envs/environment.yaml
         snakemake_config: config/test/config.validator.yaml
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - name: Check validation status
+      id: check_validation
+      run: |
+        if [[ "${{ steps.validation.outcome }}" == "failure" ]]; then
+          echo "failed=true" >> $GITHUB_OUTPUT
+        else
+          echo "failed=false" >> $GITHUB_OUTPUT
+        fi
 
   create-report:
     name: Create report
-    if: github.event.pull_request.head.repo.full_name == github.repository
     needs: run-validation
+    if: |
+      github.event.pull_request.head.repo.full_name == github.repository && 
+      needs.run-validation.outputs.validation_failed != 'true'
     runs-on: ubuntu-latest
     steps:
-    - uses: lkstrp/pypsa-validator@v0.2.4
+    - uses: lkstrp/pypsa-validator@v0.2.5
       with:
         step: create-comment
         snakemake_config: config/test/config.validator.yaml