Merge branch 'develop' into use-new-header

Author: BenjaminRodenberg

.github/workflows/build-and-test.yml

@@ -8,81 +8,38 @@ on:
       - "*"
 
 jobs:
-  setup_for_spack:
-    name: Run setup.py phases needed by spack
-    needs: [setup_test]
-    runs-on: ubuntu-latest
-    container:
-      image: precice/precice:develop
-      options: --user root
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v2
-      - name: Install & upgrade pip3
-        run: |
-          apt-get -yy update
-          apt-get install -y python3-pip pkg-config
-          rm -rf /var/lib/apt/lists/*
-          pip3 install --upgrade --user pip
-      - name: Install dependencies
-        run: |
-          pip3 install --user toml
-          python3 -c 'import toml; c = toml.load("pyproject.toml"); print("\n".join(c["build-system"]["requires"]))' | pip3 install -r /dev/stdin
-      - name: Run setup.py phases needed by spack
-        run: |
-          python3 setup.py install_lib
-          python3 setup.py build_ext
-
   setup_install:
     name: Run setup install
     runs-on: ubuntu-latest
     container:
-      image: precice/precice:develop
+      image: precice/precice:nightly
       options: --user root
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
       - name: Install pip3, pkgconfig and upgrade pip3
         run: |
           apt-get -yy update
-          apt-get install -y python3-pip pkg-config
+          apt-get install -y python3-pip python3.12-venv pkg-config
           rm -rf /var/lib/apt/lists/*
-          pip3 install --upgrade --user pip
+      - name: Create venv
+        run: python3 -m venv .venv
+      - name: Activate venv
+        # see https://stackoverflow.com/a/74669486
+        run: |
+          . .venv/bin/activate
+          echo PATH=$PATH >> $GITHUB_ENV
       - name: Install dependencies
         run: |
-          pip3 install --user toml
+          pip3 install toml
           python3 -c 'import toml; c = toml.load("pyproject.toml"); print("\n".join(c["build-system"]["requires"]))' | pip3 install -r /dev/stdin
       - name: Run setup install
-        run:  python3 setup.py install --user
+        run:  python3 setup.py install
       - name: Test install
         run: |
           export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
           python3 -c "import precice"
 
-  setup_install_single_version_externally_managed:
-    name: Run setup install --single-version-externally-managed (for spack)
-    needs: [setup_install]
-    runs-on: ubuntu-latest
-    container:
-      image: precice/precice:develop
-      options: --user root
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v2
-      - name: Install pip3, pkgconfig and upgrade pip3
-        run: |
-          su root
-          apt-get -yy update
-          apt-get install -y python3-pip pkg-config
-          rm -rf /var/lib/apt/lists/*
-          pip3 install --upgrade --user pip
-      - name: Install dependencies
-        run: |
-          pip3 install --user toml
-          python3 -c 'import toml; c = toml.load("pyproject.toml"); print("\n".join(c["build-system"]["requires"]))' | pip3 install -r /dev/stdin
-      - name: Run setup install --single-version-externally-managed
-        run:  python3 setup.py install --single-version-externally-managed --root=/
-
   setup_test:
     name: Run setup test
     runs-on: ubuntu-latest
@@ -104,7 +61,7 @@ jobs:
           mkdir -p precice
           cp precice-core/src/precice/Participant.hpp precice/Participant.hpp
           cp precice-core/src/precice/Tooling.hpp precice/Tooling.hpp
-          cp precice-core/src/precice/Tooling.hpp precice/Tooling.cpp
+          cp precice-core/src/precice/Tooling.cpp precice/Tooling.cpp
           cd precice-core
           mkdir build && cd build
           cmake .. -DPRECICE_FEATURE_MPI_COMMUNICATION=OFF -DPRECICE_FEATURE_PETSC_MAPPING=OFF -DPRECICE_FEATURE_PYTHON_ACTIONS=OFF -DBUILD_TESTING=OFF
@@ -124,42 +81,56 @@ jobs:
     needs: [setup_test]
     runs-on: ubuntu-latest
     container:
-      image: precice/precice:develop
+      image: precice/precice:nightly
       options: --user root
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
-      - name: Install pip3, pkgconfig and upgrade pip3
+      - name: Install dependencies
         run: |
           apt-get -yy update
-          apt-get install -y python3-pip pkg-config
+          apt-get install -y python3-pip python3.12-venv pkg-config
           rm -rf /var/lib/apt/lists/*
-          pip3 install --upgrade --user pip
-      - name: Run pip install
-        run:  pip3 install --user .
+      - name: Create venv
+        run: |
+          python3 -m venv .venv
+      - name: Activate venv
+        # see https://stackoverflow.com/a/74669486
+        run: |
+          . .venv/bin/activate
+          echo PATH=$PATH >> $GITHUB_ENV
       - name: Run pip install
+        run:  pip3 install .
+      - name: Check import
         run: |
           export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
           python3 -c "import precice"
 
   solverdummy_test:
     name: Run solverdummy
-    needs: [setup_install, setup_test]
+    needs: [pip_install]
     runs-on: ubuntu-latest
     container:
-      image: precice/precice:develop
+      image: precice/precice:nightly
       options: --user root
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
-      - name: Install pip3, pkgconfig and upgrade pip3
+      - name: Install dependencies
         run: |
           apt-get -yy update
-          apt-get install -y python3-pip pkg-config
+          apt-get install -y python3-pip python3.12-venv pkg-config
           rm -rf /var/lib/apt/lists/*
-          pip3 install --upgrade --user pip
+      - name: Create venv
+        run: |
+          python3 -m venv .venv
+      - name: Activate venv
+        # see https://stackoverflow.com/a/74669486
+        run: |
+          . .venv/bin/activate
+          echo PATH=$PATH >> $GITHUB_ENV
       - name: Run pip install
-        run:  pip3 install --user .
+        run:  pip3 install .
       - name: Run solverdummy
         run: |
           export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH

.github/workflows/build-docker.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Set PRECICE_TAG and the TAG depending on branch
         shell: bash
         run: |
-          echo "PRECICE_TAG=${{ env.BINDINGS_REF }}" >> "$GITHUB_ENV"
+          echo "PRECICE_TAG=${{ env.BINDINGS_REF == 'develop' && 'nightly' || env.BINDINGS_REF }}" >> "$GITHUB_ENV"
           echo "TAG=${{ env.BINDINGS_REF }}" >> "$GITHUB_ENV"
           echo "Building TAG: ${{ env.BINDINGS_REF }}"
       - name: Checkout Repository

.github/workflows/build-env.yml

@@ -11,22 +11,29 @@ jobs:
     name: Run solverdummies
     runs-on: ubuntu-latest
     container:
-      image: precice/precice:develop
+      image: precice/precice:nightly
       options: --user root
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
       - name: Install Dependencies
         run: |
           apt-get -qq update
-          apt-get -qq install software-properties-common python3-dev python3-pip git apt-utils pkg-config
+          apt-get -qq install software-properties-common python3-dev python3-pip python3.12-venv git apt-utils pkg-config
           rm -rf /var/lib/apt/lists/*
-          pip3 install --upgrade --user pip
+      - name: Create venv
+        run: |
+          python3 -m venv .venv
+      - name: Activate venv
+        # see https://stackoverflow.com/a/74669486
+        run: |
+          . .venv/bin/activate
+          echo PATH=$PATH >> $GITHUB_ENV
       - name: Install bindings
-        run:  pip3 install --user .
+        run:  pip3 install .
       - name: Check whether preCICE was built with MPI  # reformat version information as a dict and check whether preCICE was compiled with MPI
         run: python3 -c "import precice; assert({item.split('=')[0]:item.split('=')[-1] for item in str(precice.get_version_information()).split(';')}['PRECICE_FEATURE_MPI_COMMUNICATION']=='Y')"
       - name: Run solverdummies
         run: |
           cd examples/solverdummy/
-          python3 solverdummy.py precice-config.xml SolverOne & python3 solverdummy.py precice-config.xml SolverTwo
+          python3 solverdummy.py precice-config.xml SolverOne & python3 solverdummy.py precice-config.xml SolverTwo

.github/workflows/build-spack.yml

@@ -2,16 +2,18 @@
 
 All notable changes to this project will be documented in this file.
 
-## latest
+## 3.1.2
 
+* Restrict to numpy < 2 for better compatibility with CI pipeline. https://github.com/precice/python-bindings/pull/213
+* Require setuptools < 72 since support for the test command was removed in Setuptools 72. https://github.com/precice/python-bindings/pull/213
 * Require setuptools >= 61 to guarantee that pyproject.toml is used https://github.com/precice/python-bindings/pull/207
 * Fix CI pipeline for spack https://github.com/precice/python-bindings/pull/206
 
-## v3.1.1
+## 3.1.1
 
 * Fix NumPy include order to not conflict with system NumPy and the one installed via pip https://github.com/precice/python-bindings/pull/204
 
-## v3.1.0
+## 3.1.0
 
 * Change versioning scheme https://github.com/precice/python-bindings/pull/199
 

.github/workflows/run-solverdummy.yml

@@ -2,7 +2,7 @@
 
 ⚠️ The latest version of the documentation for the python bindings can be found on [precice.org](https://precice.org/installation-bindings-python.html). The information from this `README` is currently under revision and will be moved ⚠️
 
-[![Upload Python Package](https://github.com/precice/python-bindings/workflows/Upload%20Python%20Package/badge.svg?branch=master)](https://pypi.org/project/pyprecice/)
+[![Upload Python Package](https://github.com/precice/python-bindings/workflows/Upload%20Python%20Package/badge.svg)](https://pypi.org/project/pyprecice/)
 
 This package provides python language bindings for the C++ library [preCICE](https://github.com/precice/precice). Note that the first two digits of the version number of the bindings indicate the major and minor version of the preCICE version that the bindings support. The last digit represents the version of the bindings. Example: `v3.1.0` and `v3.1.1` of the bindings represent versions `0` and `1` of the bindings that are compatible with preCICE `v3.1.x`. Note that this versioning scheme was introduced from bindings `v3.1.0`, which is different than the [old versioning scheme](#old-versioning-scheme).
 

CHANGELOG.md

@@ -0,0 +1 @@
+* Removed testing of spack package

README.md

@@ -0,0 +1 @@
+- Added API function `reset_mesh()`

changelog-entries/221.md

@@ -65,6 +65,10 @@ cdef extern from "precice/precice.hpp" namespace "precice":
 
         void setMeshTetrahedra (const string& meshName, vector[int] vertices)
 
+        # remeshing
+
+        void resetMesh (const string& meshName)
+
         # data access
 
         void writeData (const string& meshName, const string& dataName, vector[int] vertices, vector[double] values)