Skip to content

Commit

Permalink
Merge pull request #14 from nauaneed/fix-build
Browse files Browse the repository at this point in the history
Fix build and tests
  • Loading branch information
prabhuramachandran authored Dec 9, 2023
2 parents e304f91 + 4701dcf commit ba9640b
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python-version: [3.8, 3.9]
python-version: ['3.10', '3.11']

env:
USE_TRILINOS: 1
Expand All @@ -17,18 +17,19 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install Linux packages ZOLTAN support
run: |
sudo apt-get update
sudo apt-get install -y openmpi-bin libopenmpi-dev libtrilinos-zoltan-dev
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip wheel
python -m pip install --upgrade pip setuptools wheel
python -m pip install numpy 'cython<3.0'
python -m pip install -r requirements.txt
python setup.py develop
- name: Run tests
Expand Down
2 changes: 1 addition & 1 deletion pyzoltan/core/zoltan_comm.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import numpy as np
cimport numpy as np

# Zoltan error checking
from zoltan cimport _check_error
from pyzoltan.core.zoltan cimport _check_error

cdef class ZComm:
"""Wrapper for simplified unstructured point-to-point communication
Expand Down
2 changes: 1 addition & 1 deletion pyzoltan/core/zoltan_dd.pyx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""Example for the Zoltan Distributed data directory"""
from zoltan cimport _check_error
from pyzoltan.core.zoltan cimport _check_error

cdef class Zoltan_DD:
"""A Zoltan Distributed data directory is used as a parallel hash map.
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cyarray
Cython>=0.20
Cython<3.0
setuptools>=6.0
numpy
pytest
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ def setup_package():

# The requirements.
install_requires = [
'cyarray', 'numpy', 'Cython>=0.20', 'setuptools>=6.0', 'mpi4py>=1.2'
'cyarray', 'numpy', 'Cython<3.0', 'setuptools>=6.0', 'mpi4py>=1.2'
]
tests_require = ["pytest>=3.0"]
docs_require = ["sphinx"]
Expand Down

0 comments on commit ba9640b

Please sign in to comment.