Skip to content

Commit

Permalink
Merge branch 'main' into release_v1.6
Browse files Browse the repository at this point in the history
  • Loading branch information
LSchueler authored Jul 18, 2024
2 parents 66f3e41 + f73ec6b commit 6af6878
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 10 deletions.
23 changes: 14 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -v --editable .[lint]
pip install -v --editable '.[lint,test]'
pip install "coveralls>=3.0.0"
- name: black check
run: |
Expand All @@ -48,9 +49,16 @@ jobs:
run: |
python -m pylint src/gstools/
#- name: cython-lint check
#run: |
#cython-lint src/gstools/
- name: cython-lint check
run: |
cython-lint src/gstools/
- name: coveralls check
run: |
python -m pytest --cov gstools --cov-report term-missing -v tests/
python -m coveralls --service=github
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build_wheels:
name: wheels for ${{ matrix.os }}
Expand Down Expand Up @@ -110,7 +118,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install build "coveralls>=3.0.0"
pip install build
- name: Install GSTools
env:
Expand All @@ -119,12 +127,9 @@ jobs:
pip install -v --editable .[test]
- name: Run tests
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
pip install "numpy${{ matrix.ver.np }}" "scipy${{ matrix.ver.sp }}"
python -m pytest --cov gstools --cov-report term-missing -v tests/
python -m coveralls --service=github
python -m pytest -v tests/
- name: Build sdist
run: |
Expand Down
2 changes: 1 addition & 1 deletion src/gstools/field/summator.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ if OPENMP:
cimport openmp

cimport numpy as np
from libc.math cimport cos, pi, sin, sqrt
from libc.math cimport cos, sin


def set_num_threads(num_threads):
Expand Down

0 comments on commit 6af6878

Please sign in to comment.