Skip to content
Snippets Groups Projects
Commit fdffa7c6 authored by Jakob Roth's avatar Jakob Roth
Browse files

Merge branch 'numpy2_0' into 'master'

allow new numpy

See merge request !53
parents 3d62e714 44337d18
No related branches found
No related tags found
1 merge request!53allow new numpy
Pipeline #221170 passed
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
# Author: Philipp Arras # Author: Philipp Arras
import os import os
from datetime import datetime
from distutils.util import strtobool
from glob import glob from glob import glob
import nifty8 as ift import nifty8 as ift
......
...@@ -145,7 +145,7 @@ setup( ...@@ -145,7 +145,7 @@ setup(
packages=find_packages(include=["resolve", "resolve.*", "resolve_support", "resolve_support.*"]), packages=find_packages(include=["resolve", "resolve.*", "resolve_support", "resolve_support.*"]),
zip_safe=True, zip_safe=True,
dependency_links=[], dependency_links=[],
install_requires=["ducc0>=0.23.0", "numpy<=1.26", "nifty8>=8.0"], install_requires=["ducc0>=0.23.0", "numpy", "nifty8>=8.0"],
extras_require={"full": ("astropy", "pytest", "pytest-cov", "mpi4py", "python-casacore", "h5py", "matplotlib", "jax", "jaxlib", "jaxbind")}, extras_require={"full": ("astropy", "pytest", "pytest-cov", "mpi4py", "python-casacore", "h5py", "matplotlib", "jax", "jaxlib", "jaxbind")},
ext_modules=extensions, ext_modules=extensions,
entry_points={"console_scripts": entry_points={"console_scripts":
......
...@@ -22,7 +22,7 @@ import resolve as rve ...@@ -22,7 +22,7 @@ import resolve as rve
from .common import list2fixture, setup_function, teardown_function from .common import list2fixture, setup_function, teardown_function
dtype = list2fixture([np.complex64, np.complex128, np.float32, np.float64]) dtype = list2fixture([np.complex128, np.float64])
with_mask = list2fixture([False, True]) with_mask = list2fixture([False, True])
with_multiplicative = list2fixture([False, True]) with_multiplicative = list2fixture([False, True])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment