Snapshot CI

Signed-off-by: Leclerc Clement <clement.leclerc@rte-france.com>
powsybl · Sep 30, 2024 · 0c58576 · 0c58576
1 parent de93088
commit 0c58576
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 12 deletions.
diff --git a/.github/workflows/dependencies-ci.yml b/.github/workflows/dependencies-ci.yml
@@ -166,11 +166,11 @@ jobs:
           repository: powsybl/powsybl-open-rao
           ref: ${{ env.SNAPSHOT_BRANCH }}
       - name: Change core version
-        run : mvn versions:set-property -Dproperty=powsybl-core.version -DnewVersion=$CORE_VERSION -DgenerateBackupPoms=false
+        run : mvn versions:set-property -Dproperty=powsybl.core.version -DnewVersion=$CORE_VERSION -DgenerateBackupPoms=false
       - name: Change entsoe version
         run : mvn versions:set-property -Dproperty=powsybl.entsoe.version -DnewVersion=$ENTSOE_VERSION  -DgenerateBackupPoms=false
       - name: Change open-loadflow version
-        run : mvn versions:set-property -Dproperty=powsybl.openloadflow.version -DnewVersion=$LOADFLOW_VERSION-DgenerateBackupPoms=false
+        run : mvn versions:set-property -Dproperty=powsybl.openloadflow.version -DnewVersion=$LOADFLOW_VERSION -DgenerateBackupPoms=false
       - name: Build with Maven
         run: | 
           cat pom.xml || true

diff --git a/java/pom.xml b/java/pom.xml
@@ -298,7 +298,7 @@
         </dependency>
         <dependency>
             <groupId>com.powsybl</groupId>
-            <artifactId>powsybl-dynawaltz</artifactId>
+            <artifactId>powsybl-dynawo-simulation</artifactId>
         </dependency>
         <dependency>
             <groupId>com.powsybl</groupId>

diff --git a/java/src/main/java/com/powsybl/dataframe/dynamic/adders/GeneratorSynchronousAdder.java b/java/src/main/java/com/powsybl/dataframe/dynamic/adders/GeneratorSynchronousAdder.java
@@ -11,7 +11,7 @@
 import com.powsybl.dataframe.update.StringSeries;
 import com.powsybl.dataframe.update.UpdatingDataframe;
 import com.powsybl.dynamicsimulation.DynamicModel;
-import com.powsybl.dynawaltz.models.generators.SynchronizedGeneratorBuilder;
+import com.powsybl.dynawo.models.generators.SynchronizedGeneratorBuilder;
 import com.powsybl.iidm.network.Network;
 import com.powsybl.python.dynamic.PythonDynamicModelsSupplier;
 

diff --git a/java/src/main/java/com/powsybl/python/datasource/InMemoryZipFileDataSource.java b/java/src/main/java/com/powsybl/python/datasource/InMemoryZipFileDataSource.java
@@ -115,4 +115,10 @@ public Set<String> listNames(String regex) throws IOException {
         }
         return names;
     }
+
+    @Override
+    public boolean isDataExtension(String ext) {
+        return true;
+    }
+
 }
diff --git a/java/src/main/java/com/powsybl/python/dynamic/CurveMappingSupplier.java b/java/src/main/java/com/powsybl/python/dynamic/CurveMappingSupplier.java
@@ -10,7 +10,7 @@
 import com.powsybl.commons.report.ReportNode;
 import com.powsybl.dynamicsimulation.Curve;
 import com.powsybl.dynamicsimulation.CurvesSupplier;
-import com.powsybl.dynawaltz.curves.DynawoCurvesBuilder;
+import com.powsybl.dynawo.curves.DynawoCurvesBuilder;
 import com.powsybl.iidm.network.Network;
 
 import java.util.Collection;

diff --git a/java/src/main/java/com/powsybl/python/dynamic/EventSupplier.java b/java/src/main/java/com/powsybl/python/dynamic/EventSupplier.java
@@ -10,7 +10,7 @@
 import com.powsybl.commons.report.ReportNode;
 import com.powsybl.dynamicsimulation.EventModel;
 import com.powsybl.dynamicsimulation.EventModelsSupplier;
-import com.powsybl.dynawaltz.models.events.EventDisconnectionBuilder;
+import com.powsybl.dynawo.models.events.EventDisconnectionBuilder;
 import com.powsybl.iidm.network.Network;
 import com.powsybl.iidm.network.TwoSides;
 

diff --git a/java/src/main/java/com/powsybl/python/dynamic/PythonDynamicModelsSupplier.java b/java/src/main/java/com/powsybl/python/dynamic/PythonDynamicModelsSupplier.java
@@ -10,10 +10,10 @@
 import com.powsybl.commons.report.ReportNode;
 import com.powsybl.dynamicsimulation.DynamicModel;
 import com.powsybl.dynamicsimulation.DynamicModelsSupplier;
-import com.powsybl.dynawaltz.models.automationsystems.overloadmanagments.DynamicOverloadManagementSystemBuilder;
-import com.powsybl.dynawaltz.models.generators.SynchronizedGeneratorBuilder;
-import com.powsybl.dynawaltz.models.loads.BaseLoadBuilder;
-import com.powsybl.dynawaltz.models.loads.LoadOneTransformerBuilder;
+import com.powsybl.dynawo.models.automationsystems.overloadmanagments.DynamicOverloadManagementSystemBuilder;
+import com.powsybl.dynawo.models.generators.SynchronizedGeneratorBuilder;
+import com.powsybl.dynawo.models.loads.BaseLoadBuilder;
+import com.powsybl.dynawo.models.loads.LoadOneTransformerBuilder;
 import com.powsybl.iidm.network.Network;
 import com.powsybl.iidm.network.TwoSides;
 

diff --git a/java/src/main/java/com/powsybl/python/network/ZipMemDataSource.java b/java/src/main/java/com/powsybl/python/network/ZipMemDataSource.java
@@ -82,4 +82,10 @@ public InputStream newInputStream(String fileName) {
     public Set<String> listNames(String regex) {
         throw new UnsupportedOperationException();
     }
+
+    @Override
+    public boolean isDataExtension(String ext) {
+        return true;
+    }
+
 }
diff --git a/java/src/test/resources/nad.svg b/java/src/test/resources/nad.svg