From 33f5aad0884daeb4a5b74e1609b675d3c2f35aa1 Mon Sep 17 00:00:00 2001 From: Ishaan Desai Date: Thu, 29 Apr 2021 09:33:53 +0200 Subject: [PATCH 1/7] Remove travis --- .travis.yml | 28 ---------------------------- README.md | 4 ---- 2 files changed, 32 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 1d4f4376..00000000 --- a/.travis.yml +++ /dev/null @@ -1,28 +0,0 @@ -language: python -dist: trusty -os: linux - -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-6 - - libopenmpi-dev - - openmpi-bin - -jobs: - include: - - name: "Mock Test Python Bindings" - cache: false - before_install: - - pyenv global $(pyenv whence 2to3) # activate all python versions - - PYTHONPATH="" - - PY_CMD=python3 - - $PY_CMD -m pip install --upgrade pip wheel setuptools - install: - - pip3 install cython numpy mpi4py packaging - script: - - git clone https://github.com/precice/precice.git precice-core # use --branch $TRAVIS_BRANCH to select the proper branch especially master/develop - - export CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH:$TRAVIS_BUILD_DIR/precice-core/src - - python3 setup.py test diff --git a/README.md b/README.md index 193a3c54..a1f1f112 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,6 @@ Python language bindings for the C++ library preCICE ---------------------------------------------------- - - Build status - - [![Upload Python Package](https://github.com/precice/python-bindings/workflows/Upload%20Python%20Package/badge.svg?branch=master)](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 three digits of the version number of the bindings indicate the preCICE version that the bindings support. The last digit represents the version of the bindings. Example: `v2.0.0.1` and `v2.0.0.2` of the bindings represent versions `1` and `2` of the bindings that are compatible with preCICE `v2.0.0`. From fc1e75b22b1770968a741563c92728fdb253264f Mon Sep 17 00:00:00 2001 From: Ishaan Desai Date: Fri, 30 Apr 2021 13:13:17 +0200 Subject: [PATCH 2/7] Cloning preCICE and placing in correct folder for mock testing --- .github/workflows/build-and-test.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index df10f517..590c4166 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -71,8 +71,11 @@ jobs: setup_test: name: Run setup test runs-on: ubuntu-latest - container: precice/ci-ubuntu-1804 steps: + - name: Build OpenMPI + run : | + apt-get -yy update + apt-get install -y libopenmpi-dev - name: Checkout Repository uses: actions/checkout@v2 - name: Install & upgrade pip3 @@ -81,15 +84,15 @@ jobs: apt-get install -y python3-pip rm -rf /var/lib/apt/lists/* pip3 install --upgrade --user pip - - name: Checkout precice and make required files discoverable - run: | - git clone https://github.com/precice/precice.git precice-core - mkdir -p precice - cp precice-core/src/precice/SolverInterface.hpp precice/SolverInterface.hpp - 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: Checkout precice and make required files discoverable + run: | + git clone https://github.com/precice/precice.git precice-core + mkdir -p precice + cp precice-core/src/precice/SolverInterface.hpp precice/SolverInterface.hpp - name: Run setup test run: | export CFLAGS=-I$GITHUB_WORKSPACE From d91aa81a2a0821517de08645c8c0d648585b0801 Mon Sep 17 00:00:00 2001 From: Ishaan Desai Date: Fri, 30 Apr 2021 13:20:12 +0200 Subject: [PATCH 3/7] Move linopenmpi-dev into other apt-get command --- .github/workflows/build-and-test.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 590c4166..fd9577a6 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -72,16 +72,12 @@ jobs: name: Run setup test runs-on: ubuntu-latest steps: - - name: Build OpenMPI - run : | - apt-get -yy update - apt-get install -y libopenmpi-dev - name: Checkout Repository uses: actions/checkout@v2 - - name: Install & upgrade pip3 + - name: Install & upgrade pip3 and install OpenMPI run: | apt-get -yy update - apt-get install -y python3-pip + apt-get install -y python3-pip libopenmpi-dev rm -rf /var/lib/apt/lists/* pip3 install --upgrade --user pip - name: Install dependencies From f507962ac1b8756ee1ca2e54abe110b205ee80a4 Mon Sep 17 00:00:00 2001 From: Ishaan Desai Date: Fri, 30 Apr 2021 13:30:59 +0200 Subject: [PATCH 4/7] Trying without libopenmpi-dev package --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index fd9577a6..4bec1e1a 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -77,7 +77,7 @@ jobs: - name: Install & upgrade pip3 and install OpenMPI run: | apt-get -yy update - apt-get install -y python3-pip libopenmpi-dev + apt-get install -y python3-pip rm -rf /var/lib/apt/lists/* pip3 install --upgrade --user pip - name: Install dependencies From 86a31a6719d86aff1ae35cf5f17d7c82504f50ee Mon Sep 17 00:00:00 2001 From: Ishaan Desai Date: Fri, 30 Apr 2021 15:57:48 +0200 Subject: [PATCH 5/7] Adding sudo apt-get commands in testing --- .github/workflows/build-and-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 4bec1e1a..778c4a5b 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -76,8 +76,8 @@ jobs: uses: actions/checkout@v2 - name: Install & upgrade pip3 and install OpenMPI run: | - apt-get -yy update - apt-get install -y python3-pip + sudo apt-get -yy update + sudo apt-get install -y python3-pip libopenmpi-dev rm -rf /var/lib/apt/lists/* pip3 install --upgrade --user pip - name: Install dependencies From c3a333546f97b3612e72eb1662665dd5915708ce Mon Sep 17 00:00:00 2001 From: Ishaan Desai Date: Fri, 30 Apr 2021 15:59:54 +0200 Subject: [PATCH 6/7] sudo rm commands --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 778c4a5b..cdc28dc0 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -78,7 +78,7 @@ jobs: run: | sudo apt-get -yy update sudo apt-get install -y python3-pip libopenmpi-dev - rm -rf /var/lib/apt/lists/* + sudo rm -rf /var/lib/apt/lists/* pip3 install --upgrade --user pip - name: Install dependencies run: | From 0ef71e38dc49234a10505e70030bedd1ce09e243 Mon Sep 17 00:00:00 2001 From: Benjamin Rodenberg Date: Fri, 30 Apr 2021 19:50:16 +0200 Subject: [PATCH 7/7] Update build-and-test.yml --- .github/workflows/build-and-test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index cdc28dc0..45d9d024 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -80,15 +80,15 @@ jobs: sudo apt-get install -y python3-pip libopenmpi-dev sudo rm -rf /var/lib/apt/lists/* pip3 install --upgrade --user pip + - name: Checkout precice and make required files discoverable + run: | + git clone https://github.com/precice/precice.git precice-core + mkdir -p precice + cp precice-core/src/precice/SolverInterface.hpp precice/SolverInterface.hpp - 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: Checkout precice and make required files discoverable - run: | - git clone https://github.com/precice/precice.git precice-core - mkdir -p precice - cp precice-core/src/precice/SolverInterface.hpp precice/SolverInterface.hpp - name: Run setup test run: | export CFLAGS=-I$GITHUB_WORKSPACE