diff --git a/.github/workflows/dev-ci.yml b/.github/workflows/dev-ci.yml index 57a550784..ac3bd84e7 100644 --- a/.github/workflows/dev-ci.yml +++ b/.github/workflows/dev-ci.yml @@ -16,9 +16,9 @@ jobs: matrix: python: - { - name: cp38, - abi: cp38, - version: '3.8', + name: cp310, + abi: cp310, + version: '3.10', } steps: @@ -43,6 +43,17 @@ jobs: with: submodules: true + - name: Checkout olf sources + uses: actions/checkout@v3 + with: + repository: powsybl/powsybl-open-loadflow + ref: fix-svc-targetV + path: powsybl-open-loadflow + + - name: Build and install olf + shell: bash + run: mvn --batch-mode -DskipTests=true --file powsybl-open-loadflow/pom.xml install + - name: Setup path run: echo "/opt/python/${{ matrix.python.name }}-${{ matrix.python.abi }}/bin/" >> $GITHUB_PATH @@ -78,19 +89,17 @@ jobs: - name: Linting run: pylint pypowsybl - - name: Sonar analysis - uses: sonarsource/sonarcloud-github-action@v2.0.2 - env: - GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - with: - args: | - -Dsonar.python.coverage.reportPaths=coverage.xml - - name: Run doc examples working-directory: ./docs run: make doctest + - name: Upload wheel + uses: actions/upload-artifact@v3 + with: + name: pypowsybl-wheel-linux-${{ matrix.python.name }} + path: wheelhouse/*.whl + + macos_windows_build: name: Build ${{ matrix.config.name }} ${{ matrix.python.name }} wheel runs-on: ${{ matrix.config.os }} @@ -107,8 +116,8 @@ jobs: } python: - { - name: cp38, - version: '3.8', + name: cp310, + version: '3.10', } steps: @@ -124,6 +133,17 @@ jobs: with: submodules: true + - name: Checkout olf sources + uses: actions/checkout@v3 + with: + repository: powsybl/powsybl-open-loadflow + ref: fix-svc-targetV + path: powsybl-open-loadflow + + - name: Build and install olf + shell: bash + run: mvn --batch-mode -DskipTests=true --file powsybl-open-loadflow/pom.xml install + - name: Setup Python uses: actions/setup-python@v4 with: @@ -153,3 +173,9 @@ jobs: - name: Run doc examples working-directory: ./docs run: make doctest + + - name: Upload wheel + uses: actions/upload-artifact@v3 + with: + name: pypowsybl-wheel-${{ matrix.config.name }}-${{ matrix.python.name }} + path: dist/*.whl diff --git a/java/pom.xml b/java/pom.xml index 16d66ec91..88708dd31 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -71,6 +71,11 @@ 2024.1.0 0.6.0 1.5.5-3 + 6.3.0 + 1.10.0-SNAPSHOT + 4.4.0 + 2.4.0 + 2.9.0 @@ -157,10 +162,45 @@ + com.powsybl - powsybl-dependencies - ${powsybl-dependencies.version} + powsybl-core + ${powsybl-core.version} + pom + import + + + + + ${project.groupId} + powsybl-diagram + ${powsybl-diagram.version} + pom + import + + + + + com.powsybl + powsybl-open-loadflow + ${powsybl-open-loadflow.version} + + + + + com.powsybl + powsybl-dynawo + ${powsybl-dynawo.version} + pom + import + + + + + com.powsybl + powsybl-entsoe + ${powsybl-entsoe.version} pom import