From eb5a2c04fdb2b0ae3f7542c0a568796c9f709547 Mon Sep 17 00:00:00 2001 From: Sierd Date: Mon, 24 Mar 2025 19:05:39 +0100 Subject: [PATCH] fixed dependencies for python 3.13 --- aeolis/vegetation.py | 10 ---------- aeolis/wind.py | 13 ++----------- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/aeolis/vegetation.py b/aeolis/vegetation.py index 809c6a86..f8afd0f0 100644 --- a/aeolis/vegetation.py +++ b/aeolis/vegetation.py @@ -28,23 +28,13 @@ import logging from scipy import ndimage, misc import numpy as np -import math -#import matplotlib.pyplot as plt from aeolis.wind import * import aeolis.rotation # package modules import aeolis.wind -#from aeolis.utils import * import numpy as np -from scipy.integrate import quad -from scipy.integrate import romberg -from scipy.optimize import root_scalar -from scipy.signal import convolve -from scipy.special import sici -from scipy.special import erfi -import matplotlib.pyplot as plt # initialize logger logger = logging.getLogger(__name__) diff --git a/aeolis/wind.py b/aeolis/wind.py index 0ea51ffc..43ad78a2 100644 --- a/aeolis/wind.py +++ b/aeolis/wind.py @@ -28,18 +28,9 @@ import numpy as np import logging -import operator -#import scipy.special -#import scipy.interpolate -from scipy import ndimage, misc -import matplotlib.pyplot as plt -from scipy.integrate import quad -from scipy.integrate import romberg + +from scipy import ndimage from scipy.optimize import root_scalar -from scipy.signal import convolve -from scipy.special import sici -from scipy.special import erfi -from scipy.interpolate import griddata # package modules diff --git a/pyproject.toml b/pyproject.toml index 8e7782e4..4aa3a01c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,7 @@ dependencies = [ "bmi-python", "netCDF4", "scipy", - "numpy<1.24,>=1.18", + "numpy", "matplotlib", "numba", ]