From c111e41737438c1131cf636a064db3177b92c529 Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sat, 3 Aug 2024 11:39:34 -0600 Subject: [PATCH 01/34] Check out QEMU for testing on other arches --- .github/workflows/build-multiarch.yaml | 34 ++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/build-multiarch.yaml diff --git a/.github/workflows/build-multiarch.yaml b/.github/workflows/build-multiarch.yaml new file mode 100644 index 0000000..8546dfa --- /dev/null +++ b/.github/workflows/build-multiarch.yaml @@ -0,0 +1,34 @@ +name: Build Multiarch + +on: + push: + branches: [master, release, multi_arch_test] + pull_request: + branches: [master, release] + +jobs: + multi-arch-test: + runs-on: ubuntu-latest + strategy: + matrix: + arch: [armv7, aarch64, riscv64, s390x, ppc64le] + steps: + - uses: actions/checkout@v4 + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + with: + platforms: all + - name: Run on ${{ matrix.arch }} + uses: uraimo/run-on-arch-action@v2 + with: + arch: ${{ matrix.arch }} + distro: ubuntu_latest + githubToken: ${{ github.token }} + install: | + apt-get update + apt-get install -y libopenblas-dev libatlas-base-dev liblapack-dev gfortran libgmp-dev libmpfr-dev libsuitesparse-dev ccache libmpc-dev python3 python3-pip + run: | + python3 -m pip install --upgrade pip + python3 -m pip install wheel + pip3 install -r requirements_test.txt + pytest . -v -m "not online and not thermo" \ No newline at end of file From c41d65970222488fe6f18086be2877bc1712d186 Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sat, 3 Aug 2024 11:56:48 -0600 Subject: [PATCH 02/34] Pursue using system packages for now --- .github/workflows/build-multiarch.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-multiarch.yaml b/.github/workflows/build-multiarch.yaml index 8546dfa..386c085 100644 --- a/.github/workflows/build-multiarch.yaml +++ b/.github/workflows/build-multiarch.yaml @@ -28,7 +28,7 @@ jobs: apt-get update apt-get install -y libopenblas-dev libatlas-base-dev liblapack-dev gfortran libgmp-dev libmpfr-dev libsuitesparse-dev ccache libmpc-dev python3 python3-pip run: | - python3 -m pip install --upgrade pip - python3 -m pip install wheel - pip3 install -r requirements_test.txt + python3 -m pip install --upgrade pip --break-system-packages + python3 -m pip install wheel --break-system-packages + pip3 install -r requirements_test.txt --break-system-packages pytest . -v -m "not online and not thermo" \ No newline at end of file From 8b2c121eddaecc27c1c023e709f496bb2d188fc2 Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sat, 3 Aug 2024 11:57:34 -0600 Subject: [PATCH 03/34] Do not fail fast --- .github/workflows/build-multiarch.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-multiarch.yaml b/.github/workflows/build-multiarch.yaml index 386c085..8a7ca58 100644 --- a/.github/workflows/build-multiarch.yaml +++ b/.github/workflows/build-multiarch.yaml @@ -10,6 +10,7 @@ jobs: multi-arch-test: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: arch: [armv7, aarch64, riscv64, s390x, ppc64le] steps: From 4d426d6c28196848cc7516f0f77244528bcc8a5c Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sat, 3 Aug 2024 11:58:40 -0600 Subject: [PATCH 04/34] . --- .github/workflows/build-multiarch.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-multiarch.yaml b/.github/workflows/build-multiarch.yaml index 8a7ca58..81e9f86 100644 --- a/.github/workflows/build-multiarch.yaml +++ b/.github/workflows/build-multiarch.yaml @@ -29,7 +29,6 @@ jobs: apt-get update apt-get install -y libopenblas-dev libatlas-base-dev liblapack-dev gfortran libgmp-dev libmpfr-dev libsuitesparse-dev ccache libmpc-dev python3 python3-pip run: | - python3 -m pip install --upgrade pip --break-system-packages python3 -m pip install wheel --break-system-packages pip3 install -r requirements_test.txt --break-system-packages pytest . -v -m "not online and not thermo" \ No newline at end of file From 988902977767997592021abc6430b4468a82564c Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sat, 3 Aug 2024 12:04:15 -0600 Subject: [PATCH 05/34] See about using the distribution's scipy and friends --- .github/workflows/build-multiarch.yaml | 6 +++--- requirements_test_multiarch.txt | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 requirements_test_multiarch.txt diff --git a/.github/workflows/build-multiarch.yaml b/.github/workflows/build-multiarch.yaml index 81e9f86..d6c381a 100644 --- a/.github/workflows/build-multiarch.yaml +++ b/.github/workflows/build-multiarch.yaml @@ -27,8 +27,8 @@ jobs: githubToken: ${{ github.token }} install: | apt-get update - apt-get install -y libopenblas-dev libatlas-base-dev liblapack-dev gfortran libgmp-dev libmpfr-dev libsuitesparse-dev ccache libmpc-dev python3 python3-pip + apt-get install -y libopenblas-dev libatlas-base-dev liblapack-dev gfortran libgmp-dev libmpfr-dev libsuitesparse-dev ccache libmpc-dev python3 python3-pip python3-scipy python3-matplotlib python3-numpy python3-pandas run: | python3 -m pip install wheel --break-system-packages - pip3 install -r requirements_test.txt --break-system-packages - pytest . -v -m "not online and not thermo" \ No newline at end of file + pip3 install -r requirements_test_multiarch.txt --break-system-packages + pytest . -v -m "not online and not thermo and not numba" \ No newline at end of file diff --git a/requirements_test_multiarch.txt b/requirements_test_multiarch.txt new file mode 100644 index 0000000..4a1b1da --- /dev/null +++ b/requirements_test_multiarch.txt @@ -0,0 +1,9 @@ +pytest +pytest-cov +sympy +thefuzz +pint +pytz +IPython +sphinx +wheel From c1eb4ccc44eeaf0a7fdfb268ca95294425a81a7e Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sat, 3 Aug 2024 12:38:07 -0600 Subject: [PATCH 06/34] Two tries --- .github/workflows/build-multiarch.yaml | 13 ++++++++++--- conftest.py | 6 +++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-multiarch.yaml b/.github/workflows/build-multiarch.yaml index d6c381a..c7129c2 100644 --- a/.github/workflows/build-multiarch.yaml +++ b/.github/workflows/build-multiarch.yaml @@ -29,6 +29,13 @@ jobs: apt-get update apt-get install -y libopenblas-dev libatlas-base-dev liblapack-dev gfortran libgmp-dev libmpfr-dev libsuitesparse-dev ccache libmpc-dev python3 python3-pip python3-scipy python3-matplotlib python3-numpy python3-pandas run: | - python3 -m pip install wheel --break-system-packages - pip3 install -r requirements_test_multiarch.txt --break-system-packages - pytest . -v -m "not online and not thermo and not numba" \ No newline at end of file + if python3 -c "import subprocess; exit('no such option' in subprocess.getoutput('pip3 install --break-system-packages'))"; then + # If the exit status is 0 (True), this means the option is not supported + python3 -m pip install wheel + pip3 install -r requirements_test_multiarch.txt + else + # If the exit status is 1 (False), this means the option is supported + python3 -m pip install wheel --break-system-packages + pip3 install -r requirements_test_multiarch.txt --break-system-packages + fi + pytest . -v -m "not online and not thermo and not numba" \ No newline at end of file diff --git a/conftest.py b/conftest.py index 536920c..6052d17 100644 --- a/conftest.py +++ b/conftest.py @@ -5,6 +5,10 @@ ver_tup = platform.python_version_tuple()[0:2] ver_tup = tuple(int(i) for i in ver_tup) + +is_x86_or_x86_64 = platform.machine().lower() in ('i386', 'i686', 'x86', 'x86_64', 'amd64') + + def pytest_ignore_collect(path): path = str(path) if 'manual_runner' in path or 'make_test_stubs' in path or 'plot' in path or 'prerelease' in path: @@ -15,7 +19,7 @@ def pytest_ignore_collect(path): return True if 'is_pypy' and 'test_spa' in path: return True - if ver_tup < (3, 7) or ver_tup >= (3, 13) or is_pypy: + if ver_tup < (3, 7) or ver_tup >= (3, 13) or is_pypy or not is_x86_or_x86_64: # numba does not yet run under pypy if 'numba' in path: return True From c78e3cdbc26e0a439e68e3da03f23437907833c4 Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sat, 3 Aug 2024 12:38:32 -0600 Subject: [PATCH 07/34] Try two --- .github/workflows/build-multiarch.yaml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-multiarch.yaml b/.github/workflows/build-multiarch.yaml index c7129c2..c2dc270 100644 --- a/.github/workflows/build-multiarch.yaml +++ b/.github/workflows/build-multiarch.yaml @@ -29,13 +29,6 @@ jobs: apt-get update apt-get install -y libopenblas-dev libatlas-base-dev liblapack-dev gfortran libgmp-dev libmpfr-dev libsuitesparse-dev ccache libmpc-dev python3 python3-pip python3-scipy python3-matplotlib python3-numpy python3-pandas run: | - if python3 -c "import subprocess; exit('no such option' in subprocess.getoutput('pip3 install --break-system-packages'))"; then - # If the exit status is 0 (True), this means the option is not supported - python3 -m pip install wheel - pip3 install -r requirements_test_multiarch.txt - else - # If the exit status is 1 (False), this means the option is supported - python3 -m pip install wheel --break-system-packages - pip3 install -r requirements_test_multiarch.txt --break-system-packages - fi + python3 -m pip install wheel --break-system-packages + pip3 install -r requirements_test_multiarch.txt --break-system-packages pytest . -v -m "not online and not thermo and not numba" \ No newline at end of file From cadd31186d6bf50fda3291771260d75a1e8081ee Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sat, 3 Aug 2024 12:48:45 -0600 Subject: [PATCH 08/34] Fix conditional --- .github/workflows/build-multiarch.yaml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-multiarch.yaml b/.github/workflows/build-multiarch.yaml index c2dc270..fa2edb5 100644 --- a/.github/workflows/build-multiarch.yaml +++ b/.github/workflows/build-multiarch.yaml @@ -29,6 +29,13 @@ jobs: apt-get update apt-get install -y libopenblas-dev libatlas-base-dev liblapack-dev gfortran libgmp-dev libmpfr-dev libsuitesparse-dev ccache libmpc-dev python3 python3-pip python3-scipy python3-matplotlib python3-numpy python3-pandas run: | - python3 -m pip install wheel --break-system-packages - pip3 install -r requirements_test_multiarch.txt --break-system-packages + if python3 -c "import subprocess; exit('no such option' not in subprocess.getoutput('pip3 install --break-system-packages'))"; then + # If the exit status is 0 (True), this means the option is not supported + python3 -m pip install wheel + pip3 install -r requirements_test_multiarch.txt + else + # If the exit status is 1 (False), this means the option is supported + python3 -m pip install wheel --break-system-packages + pip3 install -r requirements_test_multiarch.txt --break-system-packages + fi pytest . -v -m "not online and not thermo and not numba" \ No newline at end of file From 737ba0ace06983e2be272f479ca0ff195d1c3b7f Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sat, 3 Aug 2024 12:53:53 -0600 Subject: [PATCH 09/34] Allow missing pytest --- .github/workflows/build-multiarch.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-multiarch.yaml b/.github/workflows/build-multiarch.yaml index fa2edb5..8132e27 100644 --- a/.github/workflows/build-multiarch.yaml +++ b/.github/workflows/build-multiarch.yaml @@ -38,4 +38,4 @@ jobs: python3 -m pip install wheel --break-system-packages pip3 install -r requirements_test_multiarch.txt --break-system-packages fi - pytest . -v -m "not online and not thermo and not numba" \ No newline at end of file + python3 -m pytest . -v -m "not online and not thermo and not numba" \ No newline at end of file From 93a7ad67c40f67bcd68aa309437a8cfab535aa37 Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sat, 3 Aug 2024 13:03:28 -0600 Subject: [PATCH 10/34] Try this --- .github/workflows/build-multiarch.yaml | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-multiarch.yaml b/.github/workflows/build-multiarch.yaml index 8132e27..97f9499 100644 --- a/.github/workflows/build-multiarch.yaml +++ b/.github/workflows/build-multiarch.yaml @@ -12,7 +12,28 @@ jobs: strategy: fail-fast: false matrix: - arch: [armv7, aarch64, riscv64, s390x, ppc64le] + include: + - arch: armv6 + distro: bookworm + - arch: armv7 + distro: bookworm + - arch: aarch64 + distro: bookworm + - arch: s390x + distro: bookworm + - arch: ppc64le + distro: bookworm + + - arch: armv7 + distro: ubuntu_latest + - arch: aarch64 + distro: ubuntu_latest + - arch: riscv64 + distro: ubuntu_latest + - arch: s390x + distro: ubuntu_latest + - arch: ppc64le + distro: ubuntu_latest steps: - uses: actions/checkout@v4 - name: Set up QEMU @@ -23,7 +44,7 @@ jobs: uses: uraimo/run-on-arch-action@v2 with: arch: ${{ matrix.arch }} - distro: ubuntu_latest + distro: ${{ matrix.distro }} githubToken: ${{ github.token }} install: | apt-get update From 808c7c8d3bbe520ddecd916627cbb9c94b49c871 Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sat, 3 Aug 2024 13:06:28 -0600 Subject: [PATCH 11/34] Try agian --- tests/test_numerics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_numerics.py b/tests/test_numerics.py index 00d7823..1d41fa5 100644 --- a/tests/test_numerics.py +++ b/tests/test_numerics.py @@ -512,7 +512,7 @@ def to_solve(x): def test_is_poly_positive(): assert not is_poly_positive([4, 3, 2, 1]) - for high in range(0, 100, 5): + for high in range(0, 30, 5): assert is_poly_positive([4, 3, 2, 1], domain=(0, 10**high)) coeffs_4alpha = [2.1570803657937594e-10, 2.008831101045556e-06, -0.004656598178209313, 2.8575882247542514] From 0b65f20fb699659af87f14054478243ef80d3c21 Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sat, 3 Aug 2024 13:29:05 -0600 Subject: [PATCH 12/34] See what happens with alpine --- .github/workflows/build-multiarch.yaml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-multiarch.yaml b/.github/workflows/build-multiarch.yaml index 97f9499..dbff5c7 100644 --- a/.github/workflows/build-multiarch.yaml +++ b/.github/workflows/build-multiarch.yaml @@ -34,6 +34,19 @@ jobs: distro: ubuntu_latest - arch: ppc64le distro: ubuntu_latest + + - arch: armv6 + distro: alpine_latest + - arch: armv7 + distro: alpine_latest + - arch: aarch64 + distro: alpine_latest + - arch: riscv64 + distro: alpine_latest + - arch: s390x + distro: alpine_latest + - arch: ppc64le + distro: alpine_latest steps: - uses: actions/checkout@v4 - name: Set up QEMU @@ -47,8 +60,13 @@ jobs: distro: ${{ matrix.distro }} githubToken: ${{ github.token }} install: | - apt-get update - apt-get install -y libopenblas-dev libatlas-base-dev liblapack-dev gfortran libgmp-dev libmpfr-dev libsuitesparse-dev ccache libmpc-dev python3 python3-pip python3-scipy python3-matplotlib python3-numpy python3-pandas + if [[ "${{ matrix.distro }}" == "alpine_latest" ]]; then + apk update + apk add python3 py3-pip py3-scipy py3-matplotlib py3-numpy py3-pandas + elif [[ "${{ matrix.distro }}" == "ubuntu_latest" || "${{ matrix.distro }}" == "bookworm" ]]; then + apt-get update + apt-get install -y libopenblas-dev libatlas-base-dev liblapack-dev gfortran libgmp-dev libmpfr-dev libsuitesparse-dev ccache libmpc-dev python3 python3-pip python3-scipy python3-matplotlib python3-numpy python3-pandas + fi run: | if python3 -c "import subprocess; exit('no such option' not in subprocess.getoutput('pip3 install --break-system-packages'))"; then # If the exit status is 0 (True), this means the option is not supported From 33ab94348b2d1bc317454b04c9418ddd3ad0e457 Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sat, 3 Aug 2024 13:44:55 -0600 Subject: [PATCH 13/34] Expand ubuntu versions --- .github/workflows/build-multiarch.yaml | 40 ++++++++++++++++++++------ 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-multiarch.yaml b/.github/workflows/build-multiarch.yaml index dbff5c7..e323750 100644 --- a/.github/workflows/build-multiarch.yaml +++ b/.github/workflows/build-multiarch.yaml @@ -35,6 +35,28 @@ jobs: - arch: ppc64le distro: ubuntu_latest + - arch: armv7 + distro: ubuntu22.04 + - arch: aarch64 + distro: ubuntu22.04 + - arch: riscv64 + distro: ubuntu22.04 + - arch: s390x + distro: ubuntu22.04 + - arch: ppc64le + distro: ubuntu22.04 + + - arch: armv7 + distro: ubuntu20.04 + - arch: aarch64 + distro: ubuntu20.04 + - arch: riscv64 + distro: ubuntu20.04 + - arch: s390x + distro: ubuntu20.04 + - arch: ppc64le + distro: ubuntu20.04 + - arch: armv6 distro: alpine_latest - arch: armv7 @@ -67,14 +89,14 @@ jobs: apt-get update apt-get install -y libopenblas-dev libatlas-base-dev liblapack-dev gfortran libgmp-dev libmpfr-dev libsuitesparse-dev ccache libmpc-dev python3 python3-pip python3-scipy python3-matplotlib python3-numpy python3-pandas fi + if python3 -c "import subprocess; exit('no such option' not in subprocess.getoutput('pip3 install --break-system-packages'))"; then + # If the exit status is 0 (True), this means the option is not supported + python3 -m pip install wheel + pip3 install -r requirements_test_multiarch.txt + else + # If the exit status is 1 (False), this means the option is supported + python3 -m pip install wheel --break-system-packages + pip3 install -r requirements_test_multiarch.txt --break-system-packages + fi run: | - if python3 -c "import subprocess; exit('no such option' not in subprocess.getoutput('pip3 install --break-system-packages'))"; then - # If the exit status is 0 (True), this means the option is not supported - python3 -m pip install wheel - pip3 install -r requirements_test_multiarch.txt - else - # If the exit status is 1 (False), this means the option is supported - python3 -m pip install wheel --break-system-packages - pip3 install -r requirements_test_multiarch.txt --break-system-packages - fi python3 -m pytest . -v -m "not online and not thermo and not numba" \ No newline at end of file From b93dd06fb182e6713f16a2081471f62b15cfa0a4 Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sat, 3 Aug 2024 13:47:44 -0600 Subject: [PATCH 14/34] Didn't think so --- .github/workflows/build-multiarch.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-multiarch.yaml b/.github/workflows/build-multiarch.yaml index e323750..f4937b4 100644 --- a/.github/workflows/build-multiarch.yaml +++ b/.github/workflows/build-multiarch.yaml @@ -89,14 +89,14 @@ jobs: apt-get update apt-get install -y libopenblas-dev libatlas-base-dev liblapack-dev gfortran libgmp-dev libmpfr-dev libsuitesparse-dev ccache libmpc-dev python3 python3-pip python3-scipy python3-matplotlib python3-numpy python3-pandas fi - if python3 -c "import subprocess; exit('no such option' not in subprocess.getoutput('pip3 install --break-system-packages'))"; then - # If the exit status is 0 (True), this means the option is not supported - python3 -m pip install wheel - pip3 install -r requirements_test_multiarch.txt - else - # If the exit status is 1 (False), this means the option is supported - python3 -m pip install wheel --break-system-packages - pip3 install -r requirements_test_multiarch.txt --break-system-packages - fi run: | + if python3 -c "import subprocess; exit('no such option' not in subprocess.getoutput('pip3 install --break-system-packages'))"; then + # If the exit status is 0 (True), this means the option is not supported + python3 -m pip install wheel + pip3 install -r requirements_test_multiarch.txt + else + # If the exit status is 1 (False), this means the option is supported + python3 -m pip install wheel --break-system-packages + pip3 install -r requirements_test_multiarch.txt --break-system-packages + fi python3 -m pytest . -v -m "not online and not thermo and not numba" \ No newline at end of file From 3d8a64553eaf6a7c9841c9f0eec190e4538d8791 Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sat, 3 Aug 2024 13:49:54 -0600 Subject: [PATCH 15/34] Oops --- .github/workflows/build-multiarch.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-multiarch.yaml b/.github/workflows/build-multiarch.yaml index f4937b4..ae9e9f7 100644 --- a/.github/workflows/build-multiarch.yaml +++ b/.github/workflows/build-multiarch.yaml @@ -85,7 +85,7 @@ jobs: if [[ "${{ matrix.distro }}" == "alpine_latest" ]]; then apk update apk add python3 py3-pip py3-scipy py3-matplotlib py3-numpy py3-pandas - elif [[ "${{ matrix.distro }}" == "ubuntu_latest" || "${{ matrix.distro }}" == "bookworm" ]]; then + elif [[ "${{ matrix.distro }}" == "ubuntu_latest" || "${{ matrix.distro }}" == "ubuntu20.04" || "${{ matrix.distro }}" == "ubuntu22.04" || "${{ matrix.distro }}" == "bookworm" ]]; then apt-get update apt-get install -y libopenblas-dev libatlas-base-dev liblapack-dev gfortran libgmp-dev libmpfr-dev libsuitesparse-dev ccache libmpc-dev python3 python3-pip python3-scipy python3-matplotlib python3-numpy python3-pandas fi From 783615d534fb949a99596ceff3dce4c2410335a3 Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sat, 3 Aug 2024 14:10:09 -0600 Subject: [PATCH 16/34] Look at adding fedora --- .github/workflows/build-multiarch.yaml | 39 +++++--------------------- 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build-multiarch.yaml b/.github/workflows/build-multiarch.yaml index ae9e9f7..3c18206 100644 --- a/.github/workflows/build-multiarch.yaml +++ b/.github/workflows/build-multiarch.yaml @@ -13,27 +13,6 @@ jobs: fail-fast: false matrix: include: - - arch: armv6 - distro: bookworm - - arch: armv7 - distro: bookworm - - arch: aarch64 - distro: bookworm - - arch: s390x - distro: bookworm - - arch: ppc64le - distro: bookworm - - - arch: armv7 - distro: ubuntu_latest - - arch: aarch64 - distro: ubuntu_latest - - arch: riscv64 - distro: ubuntu_latest - - arch: s390x - distro: ubuntu_latest - - arch: ppc64le - distro: ubuntu_latest - arch: armv7 distro: ubuntu22.04 @@ -57,18 +36,11 @@ jobs: - arch: ppc64le distro: ubuntu20.04 - - arch: armv6 - distro: alpine_latest + - arch: armv7 - distro: alpine_latest + distro: fedora_latest - arch: aarch64 - distro: alpine_latest - - arch: riscv64 - distro: alpine_latest - - arch: s390x - distro: alpine_latest - - arch: ppc64le - distro: alpine_latest + distro: fedora_latest steps: - uses: actions/checkout@v4 - name: Set up QEMU @@ -87,7 +59,10 @@ jobs: apk add python3 py3-pip py3-scipy py3-matplotlib py3-numpy py3-pandas elif [[ "${{ matrix.distro }}" == "ubuntu_latest" || "${{ matrix.distro }}" == "ubuntu20.04" || "${{ matrix.distro }}" == "ubuntu22.04" || "${{ matrix.distro }}" == "bookworm" ]]; then apt-get update - apt-get install -y libopenblas-dev libatlas-base-dev liblapack-dev gfortran libgmp-dev libmpfr-dev libsuitesparse-dev ccache libmpc-dev python3 python3-pip python3-scipy python3-matplotlib python3-numpy python3-pandas + apt-get install -y libatlas-base-dev liblapack-dev gfortran libgmp-dev libmpfr-dev libsuitesparse-dev ccache libmpc-dev python3 python3-pip python3-scipy python3-matplotlib python3-numpy python3-pandas + elif [[ "${{ matrix.distro }}" == "fedora_latest" ]]; then + dnf update + dnf install python3 python3-pip python3-scipy python3-matplotlib python3-numpy python3-pandas fi run: | if python3 -c "import subprocess; exit('no such option' not in subprocess.getoutput('pip3 install --break-system-packages'))"; then From 21efc223dc03ee0ab7e357f04f6c77f7462267f7 Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sat, 3 Aug 2024 14:23:39 -0600 Subject: [PATCH 17/34] Drop ubutnu 20.04 --- .github/workflows/build-multiarch.yaml | 48 ++++++++++++++++++-------- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-multiarch.yaml b/.github/workflows/build-multiarch.yaml index 3c18206..1a74bb4 100644 --- a/.github/workflows/build-multiarch.yaml +++ b/.github/workflows/build-multiarch.yaml @@ -13,34 +13,55 @@ jobs: fail-fast: false matrix: include: + - arch: armv6 + distro: bookworm + - arch: armv7 + distro: bookworm + - arch: aarch64 + distro: bookworm + - arch: s390x + distro: bookworm + - arch: ppc64le + distro: bookworm - arch: armv7 - distro: ubuntu22.04 + distro: ubuntu_latest - arch: aarch64 + distro: ubuntu_latest + # - arch: riscv64 + # distro: ubuntu_latest + - arch: s390x + distro: ubuntu_latest + - arch: ppc64le + distro: ubuntu_latest + + - arch: armv7 distro: ubuntu22.04 - - arch: riscv64 + - arch: aarch64 distro: ubuntu22.04 + # - arch: riscv64 + # distro: ubuntu22.04 - arch: s390x distro: ubuntu22.04 - arch: ppc64le distro: ubuntu22.04 + # ubuntu with riscv64 has three failures and a crash on test_SolverInterface_basics in scipy's root function; also test_is_poly_positive and test_bend_rounded_Miller_Re_correction + # ubuntu20.04 is too old, fluids dropped support with numpy 2.0 compat + - arch: armv6 + distro: alpine_latest - arch: armv7 - distro: ubuntu20.04 + distro: alpine_latest - arch: aarch64 - distro: ubuntu20.04 + distro: alpine_latest - arch: riscv64 - distro: ubuntu20.04 + distro: alpine_latest - arch: s390x - distro: ubuntu20.04 + distro: alpine_latest - arch: ppc64le - distro: ubuntu20.04 + distro: alpine_latest + # fedora-latest doesn't work not sure why - - - arch: armv7 - distro: fedora_latest - - arch: aarch64 - distro: fedora_latest steps: - uses: actions/checkout@v4 - name: Set up QEMU @@ -60,9 +81,6 @@ jobs: elif [[ "${{ matrix.distro }}" == "ubuntu_latest" || "${{ matrix.distro }}" == "ubuntu20.04" || "${{ matrix.distro }}" == "ubuntu22.04" || "${{ matrix.distro }}" == "bookworm" ]]; then apt-get update apt-get install -y libatlas-base-dev liblapack-dev gfortran libgmp-dev libmpfr-dev libsuitesparse-dev ccache libmpc-dev python3 python3-pip python3-scipy python3-matplotlib python3-numpy python3-pandas - elif [[ "${{ matrix.distro }}" == "fedora_latest" ]]; then - dnf update - dnf install python3 python3-pip python3-scipy python3-matplotlib python3-numpy python3-pandas fi run: | if python3 -c "import subprocess; exit('no such option' not in subprocess.getoutput('pip3 install --break-system-packages'))"; then From 0b961eef37ac653912a48153126b9ea988e041e5 Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sat, 3 Aug 2024 21:09:38 -0600 Subject: [PATCH 18/34] push --- .github/workflows/build-multiarch.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-multiarch.yaml b/.github/workflows/build-multiarch.yaml index 1a74bb4..9ce7511 100644 --- a/.github/workflows/build-multiarch.yaml +++ b/.github/workflows/build-multiarch.yaml @@ -92,4 +92,4 @@ jobs: python3 -m pip install wheel --break-system-packages pip3 install -r requirements_test_multiarch.txt --break-system-packages fi - python3 -m pytest . -v -m "not online and not thermo and not numba" \ No newline at end of file + python3 -m pytest . -v -m "not online and not thermo and not numba" \ No newline at end of file From bca5f5b89ac22fd23eb45714d985603a066a55d4 Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Mon, 5 Aug 2024 16:42:42 -0600 Subject: [PATCH 19/34] See about this --- .github/workflows/build-multiarch.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-multiarch.yaml b/.github/workflows/build-multiarch.yaml index 9ce7511..6c22695 100644 --- a/.github/workflows/build-multiarch.yaml +++ b/.github/workflows/build-multiarch.yaml @@ -25,15 +25,15 @@ jobs: distro: bookworm - arch: armv7 - distro: ubuntu_latest + distro: ubuntu_rolling - arch: aarch64 - distro: ubuntu_latest - # - arch: riscv64 - # distro: ubuntu_latest + distro: ubuntu_rolling + - arch: riscv64 + distro: ubuntu_rolling - arch: s390x - distro: ubuntu_latest + distro: ubuntu_rolling - arch: ppc64le - distro: ubuntu_latest + distro: ubuntu_rolling - arch: armv7 distro: ubuntu22.04 From af104b084ca08264e7ae89288173baace18c6039 Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Mon, 5 Aug 2024 16:58:25 -0600 Subject: [PATCH 20/34] . --- .github/workflows/build-multiarch.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-multiarch.yaml b/.github/workflows/build-multiarch.yaml index 6c22695..b071dbf 100644 --- a/.github/workflows/build-multiarch.yaml +++ b/.github/workflows/build-multiarch.yaml @@ -78,7 +78,7 @@ jobs: if [[ "${{ matrix.distro }}" == "alpine_latest" ]]; then apk update apk add python3 py3-pip py3-scipy py3-matplotlib py3-numpy py3-pandas - elif [[ "${{ matrix.distro }}" == "ubuntu_latest" || "${{ matrix.distro }}" == "ubuntu20.04" || "${{ matrix.distro }}" == "ubuntu22.04" || "${{ matrix.distro }}" == "bookworm" ]]; then + elif [[ "${{ matrix.distro }}" == "ubuntu_latest" || "${{ matrix.distro }}" == "ubuntu_rolling" || "${{ matrix.distro }}" == "ubuntu20.04" || "${{ matrix.distro }}" == "ubuntu22.04" || "${{ matrix.distro }}" == "bookworm" ]]; then apt-get update apt-get install -y libatlas-base-dev liblapack-dev gfortran libgmp-dev libmpfr-dev libsuitesparse-dev ccache libmpc-dev python3 python3-pip python3-scipy python3-matplotlib python3-numpy python3-pandas fi From db58f6c6e89e646d58cb2c3e4e95d40397cf0b95 Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Mon, 5 Aug 2024 17:04:11 -0600 Subject: [PATCH 21/34] . --- .github/workflows/build-multiarch.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-multiarch.yaml b/.github/workflows/build-multiarch.yaml index b071dbf..941c808 100644 --- a/.github/workflows/build-multiarch.yaml +++ b/.github/workflows/build-multiarch.yaml @@ -25,15 +25,15 @@ jobs: distro: bookworm - arch: armv7 - distro: ubuntu_rolling + distro: ubuntu_latest - arch: aarch64 - distro: ubuntu_rolling + distro: ubuntu_latest - arch: riscv64 - distro: ubuntu_rolling + distro: ubuntu_devel - arch: s390x - distro: ubuntu_rolling + distro: ubuntu_latest - arch: ppc64le - distro: ubuntu_rolling + distro: ubuntu_latest - arch: armv7 distro: ubuntu22.04 From 097e9b99371498cb3f5f775764db24448d73fc60 Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Mon, 5 Aug 2024 17:17:09 -0600 Subject: [PATCH 22/34] . --- .github/workflows/build-multiarch.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-multiarch.yaml b/.github/workflows/build-multiarch.yaml index 941c808..49ea703 100644 --- a/.github/workflows/build-multiarch.yaml +++ b/.github/workflows/build-multiarch.yaml @@ -78,7 +78,7 @@ jobs: if [[ "${{ matrix.distro }}" == "alpine_latest" ]]; then apk update apk add python3 py3-pip py3-scipy py3-matplotlib py3-numpy py3-pandas - elif [[ "${{ matrix.distro }}" == "ubuntu_latest" || "${{ matrix.distro }}" == "ubuntu_rolling" || "${{ matrix.distro }}" == "ubuntu20.04" || "${{ matrix.distro }}" == "ubuntu22.04" || "${{ matrix.distro }}" == "bookworm" ]]; then + elif [[ "${{ matrix.distro }}" == "ubuntu_latest" || "${{ matrix.distro }}" == "ubuntu_rolling" || "${{ matrix.distro }}" == "ubuntu_devel" || "${{ matrix.distro }}" == "ubuntu20.04" || "${{ matrix.distro }}" == "ubuntu22.04" || "${{ matrix.distro }}" == "bookworm" ]]; then apt-get update apt-get install -y libatlas-base-dev liblapack-dev gfortran libgmp-dev libmpfr-dev libsuitesparse-dev ccache libmpc-dev python3 python3-pip python3-scipy python3-matplotlib python3-numpy python3-pandas fi From abf144c5c1cc9c292b5d22f7a92c6c55bc06f5df Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sun, 18 Aug 2024 15:17:27 -0600 Subject: [PATCH 23/34] 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 24/34] 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 25/34] 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 26/34] 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 27/34] 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 28/34] 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 29/34] 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 30/34] 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 47c51a1c3dddb78be54d771f88351ca8847e62f6 Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Sun, 25 Aug 2024 20:51:36 -0600 Subject: [PATCH 31/34] Ready to merge --- .github/workflows/build-multiarch.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-multiarch.yaml b/.github/workflows/build-multiarch.yaml index 49ea703..dec199b 100644 --- a/.github/workflows/build-multiarch.yaml +++ b/.github/workflows/build-multiarch.yaml @@ -2,7 +2,7 @@ name: Build Multiarch on: push: - branches: [master, release, multi_arch_test] + branches: [release] pull_request: branches: [master, release] From 93cb0542a2d4c86272b1430d3801b4cc5bbc9bcf Mon Sep 17 00:00:00 2001 From: Caleb Bell Date: Mon, 26 Aug 2024 19:30:44 -0600 Subject: [PATCH 32/34] 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 33/34] 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 34/34] 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"