diff --git a/.github/workflows/dev-ci.yml b/.github/workflows/dev-ci.yml index 028d3d2ede..57a550784d 100644 --- 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 index 89b9384bb5..153d976af1 100644 --- 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/README.md b/README.md index 021e5a05ae..21dbf8414a 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Notebooks demonstrating PyPowSyBl features can be found in this [repository](htt ## Installation -PyPowSyBl is released on [PyPi](https://pypi.org/project/pypowsybl/) for Python 3.7 to 3.11, on Linux, Windows and MacOS. +PyPowSyBl is released on [PyPi](https://pypi.org/project/pypowsybl/) for Python 3.8 to 3.12, on Linux, Windows and MacOS. First, make sure you have an up-to-date version of pip and setuptools: ```bash @@ -144,7 +144,7 @@ And then, to build the documentation: make html ``` -Web pages are generated in repository _build/html/ for preview before openning a pull request. +Web pages are generated in repository _build/html/ for preview before opening a pull request. You can for example open it with firefox browser: ```bash diff --git a/java/src/main/java/com/powsybl/dataframe/network/NetworkDataframes.java b/java/src/main/java/com/powsybl/dataframe/network/NetworkDataframes.java index 9d77d56d1b..7f4ea17f03 100644 --- 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)