From abf144c5c1cc9c292b5d22f7a92c6c55bc06f5df Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sun, 18 Aug 2024 15:17:27 -0600 Subject: [PATCH 01/11] Test this out --- .github/workflows/build_multi_scipy.yml | 66 +++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 .github/workflows/build_multi_scipy.yml diff --git a/.github/workflows/build_multi_scipy.yml b/.github/workflows/build_multi_scipy.yml new file mode 100644 index 0000000..a0f46d1 --- /dev/null +++ b/.github/workflows/build_multi_scipy.yml @@ -0,0 +1,66 @@ +name: Build-Test-Multi-Scipy-Numpy +on: + push: + branches: [master, release, multi_numpy_scipy_test] + pull_request: + branches: [master, release] + +jobs: + build: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: ['3.10'] + numpy: ['1.5.1', '1.10.4', '1.15.4', '1.20.3', '1.25.2', '2.0.1'] + scipy: ['1.14.0', '1.10.1', '1.6.3'] + os: [ubuntu-latest] + architecture: ['x64'] + steps: + - uses: actions/checkout@v4 + - name: Set up Python ${{ matrix.python-version }} ${{ matrix.architecture }} + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} + architecture: ${{ matrix.architecture }} + - name: cache Linux + uses: actions/cache@v4 + if: startsWith(runner.os, 'Linux') + with: + path: ~/.cache/pip + key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements_test.txt') }} + restore-keys: | + ${{ runner.os }}-${{ runner.architecture }}-${{ runner.python-version }}pip- + - name: Install Ubuntu dependencies + if: startsWith(runner.os, 'Linux') + run: | + # Taken from scipy + sudo apt-get update + sudo apt-get install -y libopenblas-dev libatlas-base-dev liblapack-dev gfortran libgmp-dev libmpfr-dev libsuitesparse-dev ccache libmpc-dev + + - name: Install dependencies + run: | + python -c "import platform; print(platform.platform()); print(platform.architecture())" + python -m pip install --upgrade pip + python -m pip install wheel + pip install -r requirements_test.txt + pip install numpy==${{ matrix.numpy }} scipy==${{ matrix.scipy }} + - name: Add numba + if: ${{ matrix.python-version == '3.6' || matrix.python-version == '3.7' || matrix.python-version == '3.8' || matrix.python-version == '3.9' || matrix.python-version == '3.10' || matrix.python-version == '3.11' || matrix.python-version == '3.12' }} + run: | + pip install numba + - name: Test with pytest + run: | + pytest . -v --cov-report html --cov=fluids --cov-report term-missing -m "not online and not thermo and not numba" + coveralls + env: + COVERALLS_REPO_TOKEN: ${{ secrets.coveralls }} + COVERALLS_PARALLEL: true + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + finish: + needs: build + runs-on: ubuntu-latest + steps: + - name: Coveralls Finished + run: | + curl https://coveralls.io/webhook?repo_token=${{ secrets.coveralls }} -d "payload[build_num]=${{ github.sha }}&payload[status]=done" \ No newline at end of file From 19adcf9d286c45caeddc0f86606f92f679dc648b Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sun, 18 Aug 2024 15:24:09 -0600 Subject: [PATCH 02/11] latest --- .github/workflows/build_multi_scipy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_multi_scipy.yml b/.github/workflows/build_multi_scipy.yml index a0f46d1..495f942 100644 --- a/.github/workflows/build_multi_scipy.yml +++ b/.github/workflows/build_multi_scipy.yml @@ -12,8 +12,8 @@ jobs: fail-fast: false matrix: python-version: ['3.10'] - numpy: ['1.5.1', '1.10.4', '1.15.4', '1.20.3', '1.25.2', '2.0.1'] - scipy: ['1.14.0', '1.10.1', '1.6.3'] + numpy: ['1.16.5', '1.20.3', '1.25.2', '2.0.1'] + scipy: ['1.7.3', '1.10.1', '1.14.0', ] os: [ubuntu-latest] architecture: ['x64'] steps: From a5363b84d6958fdeecd31f6231768361f3da244e Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sun, 18 Aug 2024 15:37:02 -0600 Subject: [PATCH 03/11] Expand versions --- .github/workflows/build_multi_scipy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_multi_scipy.yml b/.github/workflows/build_multi_scipy.yml index 495f942..925f351 100644 --- a/.github/workflows/build_multi_scipy.yml +++ b/.github/workflows/build_multi_scipy.yml @@ -11,11 +11,12 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.10'] numpy: ['1.16.5', '1.20.3', '1.25.2', '2.0.1'] scipy: ['1.7.3', '1.10.1', '1.14.0', ] + python-version: ['3.9', '3.10'] os: [ubuntu-latest] architecture: ['x64'] + steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} ${{ matrix.architecture }} From 945b3bbb10c878833a7b318933ff647f4fb65f06 Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sun, 18 Aug 2024 15:40:21 -0600 Subject: [PATCH 04/11] Further expand version range --- .github/workflows/build_multi_scipy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_multi_scipy.yml b/.github/workflows/build_multi_scipy.yml index 925f351..66d11db 100644 --- a/.github/workflows/build_multi_scipy.yml +++ b/.github/workflows/build_multi_scipy.yml @@ -13,7 +13,7 @@ jobs: matrix: numpy: ['1.16.5', '1.20.3', '1.25.2', '2.0.1'] scipy: ['1.7.3', '1.10.1', '1.14.0', ] - python-version: ['3.9', '3.10'] + python-version: ['3.7', '3.8', '3.9', '3.10'] os: [ubuntu-latest] architecture: ['x64'] From 598c478c303fb6e39c85781ccc94457f3f0f8e7d Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sun, 18 Aug 2024 15:47:12 -0600 Subject: [PATCH 05/11] Get this over with --- .github/workflows/build_multi_scipy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_multi_scipy.yml b/.github/workflows/build_multi_scipy.yml index 66d11db..fed92d4 100644 --- a/.github/workflows/build_multi_scipy.yml +++ b/.github/workflows/build_multi_scipy.yml @@ -11,8 +11,8 @@ jobs: strategy: fail-fast: false matrix: - numpy: ['1.16.5', '1.20.3', '1.25.2', '2.0.1'] - scipy: ['1.7.3', '1.10.1', '1.14.0', ] + numpy: ['1.16.5', '1.18.5', '1.20.3', '1.22.4', '1.24.4', '1.26.4', '2.0.1'] + scipy: ['1.7.3', '1.8.1', '1.9.3', '1.10.1', '1.12.0', '1.14.0', ] python-version: ['3.7', '3.8', '3.9', '3.10'] os: [ubuntu-latest] architecture: ['x64'] From b8e311cd33839e8865e66e585a98042fe441dc60 Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sun, 18 Aug 2024 16:07:23 -0600 Subject: [PATCH 06/11] Attempt to only run the working ones --- .github/workflows/build_multi_scipy.yml | 68 +++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_multi_scipy.yml b/.github/workflows/build_multi_scipy.yml index fed92d4..9d1f15e 100644 --- a/.github/workflows/build_multi_scipy.yml +++ b/.github/workflows/build_multi_scipy.yml @@ -11,12 +11,72 @@ jobs: strategy: fail-fast: false matrix: - numpy: ['1.16.5', '1.18.5', '1.20.3', '1.22.4', '1.24.4', '1.26.4', '2.0.1'] - scipy: ['1.7.3', '1.8.1', '1.9.3', '1.10.1', '1.12.0', '1.14.0', ] - python-version: ['3.7', '3.8', '3.9', '3.10'] + # numpy: ['1.16.5', '1.18.5', '1.20.3', '1.22.4', '1.24.4', '1.26.4', '2.0.1'] + # scipy: ['1.7.3', '1.8.1', '1.9.3', '1.10.1', '1.12.0', '1.14.0'] + # python-version: ['3.7', '3.8', '3.9', '3.10'] os: [ubuntu-latest] architecture: ['x64'] - + include: + - numpy: '1.16.5' + scipy: '1.7.3' + python-version: '3.7' + - numpy: '1.18.5' + scipy: '1.7.3' + python-version: '3.7' + - numpy: '1.18.5' + scipy: '1.8.1' + python-version: '3.8' + - numpy: '1.18.5' + scipy: '1.9.3' + python-version: '3.8' + - numpy: '1.20.3' + scipy: '1.7.3' + python-version: '3.7' + - numpy: '1.20.3' + scipy: '1.7.3' + python-version: '3.8' + - numpy: '1.20.3' + scipy: '1.8.1' + python-version: '3.8' + - numpy: '1.20.3' + scipy: '1.9.3' + python-version: '3.8' + - numpy: '1.20.3' + scipy: '1.10.1' + python-version: '3.8' + - numpy: '1.22.4' + scipy: '1.7.3' + python-version: '3.8' + - numpy: '1.22.4' + scipy: '1.9.3' + python-version: '3.8' + - numpy: '1.22.4' + scipy: '1.10.1' + python-version: '3.8' + - numpy: '1.24.4' + scipy: '1.8.1' + python-version: '3.8' + - numpy: '1.24.4' + scipy: '1.9.3' + python-version: '3.10' + - numpy: '1.24.4' + scipy: '1.10.1' + python-version: '3.8' + - numpy: '1.24.4' + scipy: '1.12.0' + python-version: '3.9' + - numpy: '1.26.4' + scipy: '1.10.1' + python-version: '3.9' + - numpy: '1.26.4' + scipy: '1.12.0' + python-version: '3.9' + - numpy: '1.26.4' + scipy: '1.14.0' + python-version: '3.10' + - numpy: '2.0.1' + scipy: '1.14.0' + python-version: '3.10' steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} ${{ matrix.architecture }} From ee7e2b766232d4873de83bcb19ffd21b030c3e15 Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sun, 18 Aug 2024 16:12:48 -0600 Subject: [PATCH 07/11] Try this --- .github/workflows/build_multi_scipy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_multi_scipy.yml b/.github/workflows/build_multi_scipy.yml index 9d1f15e..45e3284 100644 --- a/.github/workflows/build_multi_scipy.yml +++ b/.github/workflows/build_multi_scipy.yml @@ -11,9 +11,9 @@ jobs: strategy: fail-fast: false matrix: - # numpy: ['1.16.5', '1.18.5', '1.20.3', '1.22.4', '1.24.4', '1.26.4', '2.0.1'] - # scipy: ['1.7.3', '1.8.1', '1.9.3', '1.10.1', '1.12.0', '1.14.0'] - # python-version: ['3.7', '3.8', '3.9', '3.10'] + numpy: ['2.0.1'] #['1.16.5', '1.18.5', '1.20.3', '1.22.4', '1.24.4', '1.26.4', '2.0.1'] + scipy: ['1.14.0'] #['1.7.3', '1.8.1', '1.9.3', '1.10.1', '1.12.0', '1.14.0'] + python-version: ['3.10'] #['3.7', '3.8', '3.9', '3.10'] os: [ubuntu-latest] architecture: ['x64'] include: From d9dcc4acdcd33aabfa43e021f54717cf5e6b42f4 Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sun, 18 Aug 2024 16:18:23 -0600 Subject: [PATCH 08/11] Rename file --- .../{build_multi_scipy.yml => build_multi_numpy_scipy.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{build_multi_scipy.yml => build_multi_numpy_scipy.yml} (100%) diff --git a/.github/workflows/build_multi_scipy.yml b/.github/workflows/build_multi_numpy_scipy.yml similarity index 100% rename from .github/workflows/build_multi_scipy.yml rename to .github/workflows/build_multi_numpy_scipy.yml From 93cb0542a2d4c86272b1430d3801b4cc5bbc9bcf Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Mon, 26 Aug 2024 19:30:44 -0600 Subject: [PATCH 09/11] Ready to merge multi numpy/scipy version tests --- .github/workflows/build_multi_numpy_scipy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_multi_numpy_scipy.yml b/.github/workflows/build_multi_numpy_scipy.yml index 45e3284..ae7918a 100644 --- a/.github/workflows/build_multi_numpy_scipy.yml +++ b/.github/workflows/build_multi_numpy_scipy.yml @@ -1,7 +1,7 @@ name: Build-Test-Multi-Scipy-Numpy on: push: - branches: [master, release, multi_numpy_scipy_test] + branches: [release] pull_request: branches: [master, release] From 7ac06e771191a91648166e05b8a5eadbafb1bfd6 Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Tue, 27 Aug 2024 19:42:32 -0600 Subject: [PATCH 10/11] Minor change --- .github/workflows/build_multi_numpy_scipy.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build_multi_numpy_scipy.yml b/.github/workflows/build_multi_numpy_scipy.yml index ae7918a..134403d 100644 --- a/.github/workflows/build_multi_numpy_scipy.yml +++ b/.github/workflows/build_multi_numpy_scipy.yml @@ -123,5 +123,8 @@ jobs: runs-on: ubuntu-latest steps: - name: Coveralls Finished + env: + COVERALLS_REPO_TOKEN: ${{ secrets.coveralls }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | curl https://coveralls.io/webhook?repo_token=${{ secrets.coveralls }} -d "payload[build_num]=${{ github.sha }}&payload[status]=done" \ No newline at end of file From a3e3581c91538d26298b9dbba714dbe1fe9d7ee3 Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Tue, 27 Aug 2024 19:57:44 -0600 Subject: [PATCH 11/11] Minor change --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4c208b2..fa63bf0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -132,5 +132,8 @@ jobs: runs-on: ubuntu-latest steps: - name: Coveralls Finished + env: + COVERALLS_REPO_TOKEN: ${{ secrets.coveralls }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | curl https://coveralls.io/webhook?repo_token=${{ secrets.coveralls }} -d "payload[build_num]=${{ github.sha }}&payload[status]=done"