Fix ci (#1210)

* Update CI * Change contrib job weekly * Update environment: ppl and atlite * Update pinned files * Reset ci cache * Revise vresutils pinned * Add release_note
pypsa-meets-earth · Nov 28, 2024 · 114a953 · 114a953
1 parent 80843a3
commit 114a953
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 22 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,7 +1,6 @@
 on:
-  push:
-    branches:
-    - main
+  schedule:
+  - cron: "0 5 * * 0"
 
 jobs:
   contrib-readme-job:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  CACHE_NUMBER: 1  # Change this value to manually reset the environment cache
+  CACHE_NUMBER: 0  # Change this value to manually reset the environment cache
 
 jobs:
   run-tests:
@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu, macos, windows]
+        os: [ubuntu, macos] #, windows]
         include:
         - os: ubuntu
           env_file: envs/linux-pinned.yaml

diff --git a/.github/workflows/update-pinned-env.yml b/.github/workflows/update-pinned-env.yml
@@ -43,13 +43,13 @@ jobs:
     - name: Add SPDX header
       if: ${{ matrix.suffix != 'windows' }}
       run: |
-        SPDX_HEADER="# SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur Authors\n# SPDX-License-Identifier: CC0-1.0\n"
+        SPDX_HEADER="# SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur Authors\n#\n# SPDX-License-Identifier: CC0-1.0\n"
         echo -e "$SPDX_HEADER" | cat - envs/${{ matrix.suffix }}-pinned.yaml > temp && mv temp envs/${{ matrix.suffix }}-pinned.yaml
 
     - name: Add SPDX header (windows)
       if: ${{ matrix.suffix == 'windows' }}
       run: |
-        $SPDX_HEADER = "# SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur`r`n# SPDX-License-Identifier: CC0-1.0`r`n`r`n"
+        $SPDX_HEADER = "# SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur`r`n#`r`n# SPDX-License-Identifier: CC0-1.0`r`n`r`n"
         $CurrentContent = Get-Content "envs/${{ matrix.suffix }}-pinned.yaml" -Raw
         $NewContent = $SPDX_HEADER + $CurrentContent
         $NewContent | Set-Content "envs/${{ matrix.suffix }}-pinned.yaml"

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ by
 
 ## Development Status: **Stable and Active**
 
-[![Test workflows](https://github.com/pypsa-meets-earth/pypsa-earth/actions/workflows/ci.yml/badge.svg)](https://github.com/pypsa-meets-earth/pypsa-earth/actions/workflows/ci.yml)
+[![Test workflows](https://github.com/pypsa-meets-earth/pypsa-earth/actions/workflows/test.yml/badge.svg)](https://github.com/pypsa-meets-earth/pypsa-earth/actions/workflows/test.yml)
 [![Documentation Status](https://readthedocs.org/projects/pypsa-earth/badge/?version=latest)](https://pypsa-earth.readthedocs.io/en/latest/?badge=latest)
 ![Size](https://img.shields.io/github/repo-size/pypsa-meets-earth/pypsa-earth)
 [![License: AGPL v3](https://img.shields.io/badge/License-AGPLv3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0)

diff --git a/doc/release_notes.rst b/doc/release_notes.rst
@@ -55,7 +55,7 @@ E.g. if a new rule becomes available describe how to use it `make test` and in o
 
 * Adds code security scans via `CodeQL <https://codeql.github.com/>`__ to CI. `PR #1185 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1185>`__
 
-* Adds CI to update keep pinned environment files up to date. `PR #1183 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1183>`__
+* Adds CI to update keep pinned environment files up to date. `PR #1183 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1183>`__ and  `PR #1210 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1210>`__
 
 PyPSA-Earth 0.4.1
 =================

diff --git a/envs/environment.yaml b/envs/environment.yaml
@@ -16,11 +16,11 @@ dependencies:
 - dask
 # currently the packages are being installed with pip
 # need to move back to conda once the issues will be resolved
-# - powerplantmatching
+- powerplantmatching>=0.5.19
 # - earth-osm>=2.1
 # until the release will incorporate all the fixes needed
 # to work with CDS beta
-# - atlite
+- atlite>=0.3
 
   # Dependencies of the workflow itself
 - xlrd
@@ -85,8 +85,6 @@ dependencies:
 
 - pip:
   - earth-osm>=2.2 # until conda release it out for earth-osm
-  - powerplantmatching>=0.5.19 # until conda release it out for powerplantmatching
-  - git+https://github.com/pypsa/atlite@master
   - git+https://github.com/davide-f/google-drive-downloader@master  # google drive with fix for virus scan
   - git+https://github.com/FRESNA/vresutils@master  # until new pip release > 0.3.1 (strictly)
   - tsam>=1.1.0

diff --git a/envs/linux-pinned.yaml b/envs/linux-pinned.yaml
@@ -1,4 +1,5 @@
 # SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur Authors
+#
 # SPDX-License-Identifier: CC0-1.0
 
 name: pypsa-earth
@@ -24,6 +25,7 @@ dependencies:
 - asttokens=2.4.1
 - async-lru=2.0.4
 - atk-1.0=2.38.0
+- atlite==0.3.0
 - attr=2.5.1
 - attrs=24.2.0
 - aws-c-auth=0.8.0
@@ -391,6 +393,7 @@ dependencies:
 - poppler=24.08.0
 - poppler-data=0.4.12
 - postgresql=16.6
+- powerplantmatching==0.6.0
 - pre-commit=4.0.1
 - proj=9.5.0
 - prometheus_client=0.21.0
@@ -545,7 +548,6 @@ dependencies:
 - zstandard=0.23.0
 - zstd=1.5.6
 - pip:
-  - atlite==0.3.0.post1.dev1+ga6e7fbb
   - cads-api-client==1.5.4
   - cdsapi==0.7.4
   - chaospy==4.3.17
@@ -557,13 +559,12 @@ dependencies:
   - highspy==1.8.1
   - multiurl==0.3.3
   - numpoly==1.3.4
-  - powerplantmatching==0.6.0
   - progressbar2==4.5.0
   - protobuf==5.28.3
   - pycountry==24.6.1
   - python-utils==3.9.0
   - tsam==2.3.6
   - unidecode==1.3.8
-  - vresutils==0.3.2.dev11+g150c1be
+  - git+https://github.com/FRESNA/vresutils@master
   - xarray==2024.11.0
 prefix: /usr/share/miniconda/envs/pypsa-earth
diff --git a/envs/macos-pinned.yaml b/envs/macos-pinned.yaml
@@ -1,4 +1,5 @@
 # SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur Authors
+#
 # SPDX-License-Identifier: CC0-1.0
 
 name: pypsa-earth
@@ -22,6 +23,7 @@ dependencies:
 - asttokens=2.4.1
 - async-lru=2.0.4
 - atk-1.0=2.38.0
+- atlite==0.3.0
 - attrs=24.2.0
 - aws-c-auth=0.8.0
 - aws-c-cal=0.8.0
@@ -344,6 +346,7 @@ dependencies:
 - poppler=24.08.0
 - poppler-data=0.4.12
 - postgresql=17.2
+- powerplantmatching==0.6.0
 - pre-commit=4.0.1
 - proj=9.5.0
 - prometheus_client=0.21.0
@@ -477,7 +480,6 @@ dependencies:
 - zstandard=0.23.0
 - zstd=1.5.6
 - pip:
-  - atlite==0.3.0.post1.dev1+ga6e7fbb
   - cads-api-client==1.5.4
   - cdsapi==0.7.4
   - chaospy==4.3.17
@@ -489,13 +491,12 @@ dependencies:
   - highspy==1.8.1
   - multiurl==0.3.3
   - numpoly==1.3.4
-  - powerplantmatching==0.6.0
   - progressbar2==4.5.0
   - protobuf==5.28.3
   - pycountry==24.6.1
   - python-utils==3.9.0
   - tsam==2.3.6
   - unidecode==1.3.8
-  - vresutils==0.3.2.dev11+g150c1be
+  - git+https://github.com/FRESNA/vresutils@master
   - xarray==2024.11.0
 prefix: /Users/runner/miniconda3/envs/pypsa-earth
diff --git a/envs/windows-pinned.yaml b/envs/windows-pinned.yaml
@@ -1,4 +1,5 @@
 # SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur
+#
 # SPDX-License-Identifier: CC0-1.0
 
 name: pypsa-earth
@@ -21,6 +22,7 @@ dependencies:
 - arrow=1.3.0
 - asttokens=2.4.1
 - async-lru=2.0.4
+- atlite==0.3.0
 - attrs=24.2.0
 - aws-c-auth=0.8.0
 - aws-c-cal=0.8.0
@@ -325,6 +327,7 @@ dependencies:
 - poppler=24.08.0
 - poppler-data=0.4.12
 - postgresql=17.2
+- powerplantmatching==0.6.0
 - pre-commit=4.0.1
 - proj=9.5.0
 - prometheus_client=0.21.0
@@ -473,7 +476,6 @@ dependencies:
 - zstandard=0.23.0
 - zstd=1.5.6
 - pip:
-  - atlite==0.3.0.post1.dev1+ga6e7fbb
   - cads-api-client==1.5.4
   - cdsapi==0.7.4
   - chaospy==4.3.17
@@ -486,13 +488,12 @@ dependencies:
   - multiurl==0.3.3
   - numpoly==1.3.4
   - polars==1.14.0
-  - powerplantmatching==0.6.0
   - progressbar2==4.5.0
   - protobuf==5.28.3
   - pycountry==24.6.1
   - python-utils==3.9.0
   - tsam==2.3.6
   - unidecode==1.3.8
-  - vresutils==0.3.2.dev11+g150c1be
+  - git+https://github.com/FRESNA/vresutils@master
   - xarray==2024.11.0
 prefix: C:\Miniconda\envs\pypsa-earth