Skip to content

Commit

Permalink
Fix CI-test (#65)
Browse files Browse the repository at this point in the history
* Update due to deprecation

* Restricting the version of Pandas will make eCalc fix Numpy at v1.24. This behaviour is not wanted.

---------

Co-authored-by: Kristian Fossum <krfo@bgo-1991.ad.norceresearch.no>
  • Loading branch information
KriFos1 and Kristian Fossum authored Jul 30, 2024
1 parent 51b79b6 commit a44d8b4
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
4 changes: 2 additions & 2 deletions pipt/geostat/decomp.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,11 +232,11 @@ def _edist2d(self, v1, v2, aspect, rotate):
ST 18/6-15: Wholesale copy of code written by Kristian Fossum. Some modifications have been made...
"""
# Rotation matrix
rot_mat = np.matrix([[np.cos((rotate / 180) * np.pi), -np.sin((rotate / 180) * np.pi)],
rot_mat = np.array([[np.cos((rotate / 180) * np.pi), -np.sin((rotate / 180) * np.pi)],
[np.sin((rotate / 180) * np.pi), np.cos((rotate / 180) * np.pi)]])

# Compressing matrix (since aspect>=1)
rescale_mat = np.matrix([[1, 0], [0, aspect]])
rescale_mat = np.array([[1, 0], [0, aspect]])

# Coordinates
dp = v1 - v2
Expand Down
6 changes: 5 additions & 1 deletion pipt/update_schemes/enrml.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,17 @@
import copy as cp
from scipy.linalg import cholesky, solve

import importlib.util

# List all available packages in the namespace package
# Import those that are present
import pipt.update_schemes.update_methods_ns as ns_pkg
tot_ns_pkg = []
# extract all class methods from namespace
for finder, name, ispkg in pkgutil.walk_packages(ns_pkg.__path__):
_module = finder.find_module(name).load_module(f'{name}')
spec = finder.find_spec(name)
_module = importlib.util.module_from_spec(spec)
spec.loader.exec_module(_module)
tot_ns_pkg.extend(inspect.getmembers(_module, inspect.isclass))

# import standard libraries
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
'psutil',
'pdoc @ git+https://github.com/patnr/pdoc@main',
'pytest',
'pandas>=1.5,<2', # libecalc 8.9.0 has requirement pandas<2,>=1
'pandas', # libecalc 8.9.0 has requirement pandas<2,>=1
'p_tqdm',
'mat73',
'opencv-python',
Expand Down

0 comments on commit a44d8b4

Please sign in to comment.