Resolve conflict

tuwien-cms · Jun 24, 2024 · 318ddf4 · 318ddf4
2 parents 73a42d7 + e88160f
commit 318ddf4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
@@ -11,7 +11,8 @@ jobs:
     runs-on: ${{ matrix .os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-2019, macOS-latest]
+        # https://github.com/s-weigand/setup-conda/issues/432
+        os: [ubuntu-latest, windows-2019, macos-12]
 
     steps:
     - uses: actions/checkout@v4

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -20,24 +20,27 @@ jobs:
           - os: ubuntu-latest
             numpy-version: auto
             python-version: 3.9
+          - os: ubuntu-latest
+            numpy-version: 2.0
+            python-version: 3.11
           - os: windows-latest
             numpy-version: auto
             python-version: 3.9
-          - os: macos-latest
+          - os: macos-12
             numpy-version: auto
             python-version: 3.9
     steps:
       - uses: actions/checkout@v4
 
       - name: Set up python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: Install numpy ${{ matrix.numpy-version }}
         if: ${{ matrix.numpy-version != 'auto' }}
         run: |
-          pip install numpy==1.16
+          pip install numpy==${{ matrix.numpy-version }}
 
       - name: Install package with testing dependencies
         run: |

diff --git a/pysrc/xprec/__init__.py b/pysrc/xprec/__init__.py
@@ -16,7 +16,7 @@
     print(2 * x)
 
 """
-__version__ = "1.4.0"
+__version__ = "1.4.1"
 
 import numpy as _np