From ab0bb79eb94538cfdf5e001d42400ad57ebf52cb Mon Sep 17 00:00:00 2001 From: lkstrp Date: Mon, 6 Jan 2025 11:59:10 +0100 Subject: [PATCH] ci: fix trigger --- .github/workflows/codeql.yml | 4 ++-- .github/workflows/test.yaml | 4 ++-- .github/workflows/update-fixed-env.yaml | 2 +- .github/workflows/validate.yaml | 4 ++-- config/test/config.validator.yaml | 15 --------------- envs/environment.yaml | 3 +-- 6 files changed, 8 insertions(+), 24 deletions(-) delete mode 100644 config/test/config.validator.yaml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index fd64e164b..187260b0d 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -13,9 +13,9 @@ name: "CodeQL" on: push: - branches: ["master"] + branches: ["main"] pull_request: - branches: ["master"] + branches: ["main"] schedule: - cron: '23 18 * * 5' diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 0649ec7a5..b628c4a2b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -7,10 +7,10 @@ name: Test workflows on: push: branches: - - master + - main pull_request: branches: - - master + - main schedule: - cron: "0 5 * * *" diff --git a/.github/workflows/update-fixed-env.yaml b/.github/workflows/update-fixed-env.yaml index 22c061908..d5ac259dd 100644 --- a/.github/workflows/update-fixed-env.yaml +++ b/.github/workflows/update-fixed-env.yaml @@ -3,7 +3,7 @@ name: Fixed-Version Environment Checker on: push: branches: - - master + - main paths: - 'envs/environment.yaml' diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml index 18ad23633..d4b961f41 100644 --- a/.github/workflows/validate.yaml +++ b/.github/workflows/validate.yaml @@ -16,7 +16,7 @@ jobs: if: github.event.pull_request.head.repo.full_name == github.repository runs-on: self-hosted steps: - - uses: lkstrp/pypsa-validator@v0.2.4 + - uses: PyPSA/pypsa-validator@v0.2.5 with: step: run-self-hosted-validation env_file: envs/environment.yaml @@ -32,7 +32,7 @@ jobs: needs: run-validation runs-on: ubuntu-latest steps: - - uses: lkstrp/pypsa-validator@v0.2.4 + - uses: PyPSA/pypsa-validator@v0.2.5 with: step: create-comment snakemake_config: config/config.yaml diff --git a/config/test/config.validator.yaml b/config/test/config.validator.yaml deleted file mode 100644 index a7440deee..000000000 --- a/config/test/config.validator.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-FileCopyrightText: : 2017-2024 The PyPSA-Eur Authors -# -# SPDX-License-Identifier: CC0-1.0 - -logging: - level: INFO - format: '%(asctime)s - %(levelname)s - %(name)s - %(message)s' - -run: - prefix: validation - -clustering: - temporal: - resolution_elec: 365H - resolution_sector: 365H diff --git a/envs/environment.yaml b/envs/environment.yaml index 3d798816b..11aa2357f 100644 --- a/envs/environment.yaml +++ b/envs/environment.yaml @@ -62,8 +62,7 @@ dependencies: # GIS dependencies: - cartopy - descartes -- rasterio==1.4.1 -- libgdal-core<3.10.0 # rasterio>=1.4.2 needed for GDAL 3.10 +- rasterio - pip: - gurobipy