Merge branch 'main' into fix_throw_exception_create_feeder_bay

powsybl · Feb 12, 2024 · 3fe176d · 3fe176d
2 parents 0ac4bf0 + 9a48cc4
commit 3fe176d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 26 deletions.
diff --git a/.github/workflows/dev-ci.yml b/.github/workflows/dev-ci.yml
@@ -11,7 +11,7 @@ jobs:
   manylinux_build:
     name: Build linux ${{ matrix.python.name }} wheel
     runs-on: ubuntu-latest
-    container: quay.io/pypa/manylinux_2_24_x86_64:2022-12-26-0d38463
+    container: quay.io/pypa/manylinux_2_28_x86_64:2024-01-08-eb135ed
     strategy:
       matrix:
         python:
@@ -23,10 +23,7 @@ jobs:
 
     steps:
       - name: Install Linux packages
-        run: |
-          echo "deb http://archive.debian.org/debian stretch main contrib non-free" > /etc/apt/sources.list
-          apt-get update
-          apt install -y wget
+        run: dnf install -y wget
 
       - name: Install Maven
         run: |

diff --git a/.github/workflows/full-ci.yml b/.github/workflows/full-ci.yml
@@ -11,51 +11,38 @@ jobs:
   manylinux_build:
     name: Build linux ${{ matrix.python.name }} wheel
     runs-on: ubuntu-latest
-    container: ${{ matrix.python.container }}
+    container: quay.io/pypa/manylinux_2_28_x86_64:2024-01-08-eb135ed
     strategy:
       matrix:
         python:
           - {
             name: cp38,
             abi: cp38,
-            version: '3.8',
-            container: 'quay.io/pypa/manylinux_2_24_x86_64:2022-12-26-0d38463'
+            version: '3.8'
           }
           - {
             name: cp39,
             abi: cp39,
-            version: '3.9',
-            container: 'quay.io/pypa/manylinux_2_24_x86_64:2022-12-26-0d38463'
+            version: '3.9'
           }
           - {
             name: cp310,
             abi: cp310,
-            version: '3.10',
-            container: 'quay.io/pypa/manylinux_2_24_x86_64:2022-12-26-0d38463'
+            version: '3.10'
           }
           - {
             name: cp311,
             abi: cp311,
-            version: '3.11',
-            container: 'quay.io/pypa/manylinux_2_24_x86_64:2022-12-26-0d38463'
+            version: '3.11'
           }
           - {
             name: cp312,
             abi: cp312,
-            version: '3.12',
-            container: 'quay.io/pypa/manylinux_2_28_x86_64:2024-01-08-eb135ed'
+            version: '3.12'
           }
 
     steps:
-      - name: Install Linux packages (Debian)
-        if: matrix.python.version != '3.12'
-        run: |
-          echo "deb http://archive.debian.org/debian stretch main contrib non-free" > /etc/apt/sources.list
-          apt-get update
-          apt install -y wget
-
-      - name: Install Linux packages (Alma Linux)
-        if: matrix.python.version == '3.12'
+      - name: Install Linux packages
         run: dnf install -y wget
 
       - name: Install Maven

diff --git a/java/src/main/java/com/powsybl/dataframe/network/NetworkDataframes.java b/java/src/main/java/com/powsybl/dataframe/network/NetworkDataframes.java
@@ -246,7 +246,7 @@ static NetworkDataframeMapper generators() {
         return NetworkDataframeMapperBuilder.ofStream(Network::getGeneratorStream, getOrThrow(Network::getGenerator, "Generator"))
                 .stringsIndex("id", Generator::getId)
                 .strings("name", g -> g.getOptionalName().orElse(""))
-                .enums("energy_source", EnergySource.class, Generator::getEnergySource)
+                .enums("energy_source", EnergySource.class, Generator::getEnergySource, Generator::setEnergySource)
                 .doubles("target_p", Generator::getTargetP, Generator::setTargetP)
                 .doubles("min_p", Generator::getMinP, Generator::setMinP)
                 .doubles("max_p", Generator::getMaxP, Generator::setMaxP)