Remove Cython code & replace it with GSTools-Core

The Github actions still need to be updated.
GeoStat-Framework · Oct 27, 2021 · 0cc899a · 0cc899a
1 parent da4d714
commit 0cc899a
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 665 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,6 +1,6 @@
 prune *
 graft tests
-recursive-include gstools *.py *.pyx
+recursive-include gstools *.py
 recursive-exclude gstools *.c *.cpp
 include LICENSE README.md pyproject.toml setup.py setup.cfg
 exclude CHANGELOG.md CONTRIBUTING.md AUTHORS.md

diff --git a/README.md b/README.md
@@ -338,6 +338,7 @@ in memory for immediate 3D plotting in Python.
 
 - [NumPy >= 1.14.5](https://www.numpy.org)
 - [SciPy >= 1.1.0](https://www.scipy.org/scipylib)
+- [GSTools-Core >= 0.1.0](https://github.com/GeoStat-Framework/GSTools-Core)
 - [hankel >= 1.0.2](https://github.com/steven-murray/hankel)
 - [emcee >= 3.0.0](https://github.com/dfm/emcee)
 - [pyevtk >= 1.1.1](https://github.com/pyscience-projects/pyevtk)

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -378,6 +378,7 @@ Requirements
 
 - `Numpy >= 1.14.5 <http://www.numpy.org>`_
 - `SciPy >= 1.1.0 <http://www.scipy.org>`_
+- `GSTools-Core >= 0.1.0 <https://github.com/GeoStat-Framework/GSTools-Core>`_
 - `hankel >= 1.0.2 <https://github.com/steven-murray/hankel>`_
 - `emcee >= 3.0.0 <https://github.com/dfm/emcee>`_
 - `pyevtk >= 1.1.1 <https://github.com/pyscience-projects/pyevtk>`_

diff --git a/gstools/field/generator.py b/gstools/field/generator.py
@@ -16,8 +16,8 @@
 
 import numpy as np
 
+from gstools_core import summate, summate_incompr
 from gstools.covmodel.base import CovModel
-from gstools.field.summator import summate, summate_incompr
 from gstools.random.rng import RNG
 
 __all__ = ["RandMeth", "IncomprRandMeth"]

diff --git a/gstools/field/summator.pyx b/gstools/field/summator.pyx
diff --git a/gstools/krige/base.py b/gstools/krige/base.py
@@ -16,11 +16,11 @@
 import scipy.linalg as spl
 from scipy.spatial.distance import cdist
 
-from gstools.field.base import Field
-from gstools.krige.krigesum import (
+from gstools_core import (
     calc_field_krige,
     calc_field_krige_and_variance,
 )
+from gstools.field.base import Field
 from gstools.krige.tools import get_drift_functions, set_condition
 from gstools.tools.geometric import rotated_main_axes
 from gstools.tools.misc import eval_func

diff --git a/gstools/krige/krigesum.pyx b/gstools/krige/krigesum.pyx