Merge branch 'main' into 6.6.0-SNAPSHOT

Signed-off-by: Hugo KULESZA <hugo.kulesza@rte-france.com>
powsybl · Dec 3, 2024 · 1eb3192 · 1eb3192
2 parents 37454ea + 454973a
commit 1eb3192
Show file tree

Hide file tree

Showing 340 changed files with 11,070 additions and 2,435 deletions.
diff --git a/.github/workflows/dev-ci.yml b/.github/workflows/dev-ci.yml
@@ -7,9 +7,17 @@ jobs:
   manylinux_build:
     name: Build linux ${{ matrix.python.name }} wheel
     runs-on: ubuntu-latest
+<<<<<<< HEAD
     container: quay.io/pypa/manylinux2014_x86_64:2024-10-07-1887322
     env:
       ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+||||||| 4ebe183e
+    container: quay.io/pypa/manylinux2014_x86_64:2024-07-01-8dac23b
+    env:
+      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+=======
+    container: quay.io/pypa/manylinux_2_28_x86_64:2024-11-16-d70d8cd
+>>>>>>> main
     strategy:
       matrix:
         python:
@@ -20,21 +28,24 @@ jobs:
           }
 
     steps:
+      - name: Install Linux Packages
+        run: dnf install -y wget
+
       - name: Install Maven
         run: |
-          curl --fail --silent --show-error https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.tar.gz -o /tmp/apache-maven-3.9.6-bin.tar.gz
+          wget -q https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.tar.gz -P /tmp
           tar xf /tmp/apache-maven-*.tar.gz -C /opt
           echo /opt/apache-maven-3.9.6/bin >> $GITHUB_PATH
 
       - name: Setup GraalVM
-        uses: graalvm/setup-graalvm@v1.1.5 # !!! this is last version compatible with manylinux 2014
+        uses: graalvm/setup-graalvm@v1
         with:
-          java-version: '17'
+          java-version: '17.0.12'
           distribution: 'graalvm'
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
 
@@ -130,17 +141,17 @@ jobs:
       - name: Setup GraalVM
         uses: graalvm/setup-graalvm@v1
         with:
-          java-version: '17'
+          java-version: '17.0.12'
           distribution: 'graalvm'
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python.version }}
 
@@ -181,6 +192,7 @@ jobs:
           cmake $GITHUB_WORKSPACE/cpp  -DBUILD_PYPOWSYBL_JAVA=OFF -DPYPOWSYBL_JAVA_LIBRARY_DIR=$GITHUB_WORKSPACE/dist/lib -DPYPOWSYBL_JAVA_INCLUDE_DIR=$GITHUB_WORKSPACE/dist/include
           cmake --build . --config Release
           
+<<<<<<< HEAD
   build:
     name: Run SonarCloud analysis for Java code
     runs-on: ubuntu-latest
@@ -210,3 +222,38 @@ jobs:
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}          
 
+||||||| 4ebe183e
+
+
+
+=======
+  build:
+    name: Run SonarCloud analysis for Java code
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Build with Maven (Ubuntu)
+        working-directory: ./java
+        run: >
+          mvn --batch-mode install
+
+      - name: Run SonarCloud analysis
+        working-directory: ./java
+        run: >
+          mvn --batch-mode -DskipTests sonar:sonar
+          -Dsonar.host.url=https://sonarcloud.io
+          -Dsonar.organization=powsybl-ci-github
+          -Dsonar.projectKey=powsybl_pypowsybl-java
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+
+>>>>>>> main
diff --git a/.github/workflows/full-ci.yml b/.github/workflows/full-ci.yml
@@ -13,9 +13,7 @@ jobs:
   manylinux_build:
     name: Build linux ${{ matrix.python.name }} wheel
     runs-on: ubuntu-latest
-    container: quay.io/pypa/manylinux2014_x86_64:2024-10-07-1887322
-    env:
-      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+    container: quay.io/pypa/manylinux_2_28_x86_64:2024-11-16-d70d8cd
     strategy:
       matrix:
         python:
@@ -44,28 +42,31 @@ jobs:
             abi: cp312,
             version: '3.12'
           }
-          - {
-            name: cp313,
-            abi: cp313,
-            version: '3.13'
-          }
+#          - {
+#            name: cp313,
+#            abi: cp313,
+#            version: '3.13'
+#          }
 
     steps:
+      - name: Install Linux Packages
+        run: dnf install -y wget
+
       - name: Install Maven
         run: |
-          curl --fail --silent --show-error https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.tar.gz -o /tmp/apache-maven-3.9.6-bin.tar.gz
+          wget -q https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.tar.gz -P /tmp
           tar xf /tmp/apache-maven-*.tar.gz -C /opt
           echo /opt/apache-maven-3.9.6/bin >> $GITHUB_PATH
 
       - name: Setup GraalVM
-        uses: graalvm/setup-graalvm@v1.1.5 # !!! this is last version compatible with manylinux 2014
+        uses: graalvm/setup-graalvm@v1
         with:
-          java-version: '17'
+          java-version: '17.0.12'
           distribution: 'graalvm'
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
 
@@ -126,7 +127,7 @@ jobs:
         run: make html doctest SPHINXOPTS="-W"
 
       - name: Upload wheel
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pypowsybl-wheel-linux-${{ matrix.python.name }}
           path: wheelhouse/*.whl
@@ -174,26 +175,26 @@ jobs:
             name: cp312,
             version: '3.12',
           }
-          - {
-            name: cp313,
-            version: '3.13',
-          }
+#          - {
+#            name: cp313,
+#            version: '3.13',
+#          }
 
     steps:
       - name: Setup GraalVM
         uses: graalvm/setup-graalvm@v1
         with:
-          java-version: '17'
+          java-version: '17.0.12'
           distribution: 'graalvm'
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python.version }}
 
@@ -227,7 +228,7 @@ jobs:
         run: make html doctest SPHINXOPTS="-W"
 
       - name: Upload wheel
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pypowsybl-wheel-${{ matrix.config.name }}-${{ matrix.python.name }}
           path: dist/*.whl
@@ -239,12 +240,12 @@ jobs:
 
     steps:
       - name: Download wheels
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: download
 
       - name: Upload wheels
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pypowsybl-wheels
           path: |
@@ -263,10 +264,10 @@ jobs:
 
     steps:
       - name: Checkout sources
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@v4
 
       - name: Set up JDK 17
-        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'
@@ -282,6 +283,6 @@ jobs:
           mvn --batch-mode -DskipTests sonar:sonar
           -Dsonar.host.url=https://sonarcloud.io
           -Dsonar.organization=powsybl-ci-github
-          -Dsonar.projectKey=powsybl_pypowsybl
+          -Dsonar.projectKey=powsybl_pypowsybl-java
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml
@@ -12,9 +12,7 @@ jobs:
   manylinux_build:
     name: Build linux ${{ matrix.python.name }} wheel
     runs-on: ubuntu-latest
-    container: quay.io/pypa/manylinux2014_x86_64:2024-10-07-1887322
-    env:
-      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+    container: quay.io/pypa/manylinux_2_28_x86_64:2024-11-16-d70d8cd
     strategy:
       matrix:
         python:
@@ -25,21 +23,24 @@ jobs:
           }
 
     steps:
+      - name: Install Linux Packages
+        run: dnf install -y wget
+
       - name: Install Maven
         run: |
-          curl --fail --silent --show-error https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.tar.gz -o /tmp/apache-maven-3.9.6-bin.tar.gz
+          wget https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.tar.gz -P /tmp
           tar xf /tmp/apache-maven-*.tar.gz -C /opt
           echo /opt/apache-maven-3.9.6/bin >> $GITHUB_PATH
 
       - name: Setup GraalVM
-        uses: graalvm/setup-graalvm@v1.1.5 # !!! this is last version compatible with manylinux 2014
+        uses: graalvm/setup-graalvm@v1
         with:
-          java-version: '17'
+          java-version: '17.0.12'
           distribution: 'graalvm'
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
 
@@ -95,17 +96,17 @@ jobs:
       - name: Setup GraalVM
         uses: graalvm/setup-graalvm@v1
         with:
-          java-version: '17'
+          java-version: '17.0.12'
           distribution: 'graalvm'
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python.version }}