Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
resolve
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ift
resolve
Commits
fdffa7c6
Commit
fdffa7c6
authored
10 months ago
by
Jakob Roth
Browse files
Options
Downloads
Plain Diff
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
!53
allow new numpy
Pipeline
#221170
passed
10 months ago
Stage: build_docker
Stage: testing
Stage: release
Stage: deploy
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
resolve/config_utils.py
+0
-2
0 additions, 2 deletions
resolve/config_utils.py
setup.py
+1
-1
1 addition, 1 deletion
setup.py
test/test_energies.py
+1
-1
1 addition, 1 deletion
test/test_energies.py
with
2 additions
and
4 deletions
resolve/config_utils.py
+
0
−
2
View file @
fdffa7c6
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
setup.py
+
1
−
1
View file @
fdffa7c6
...
@@ -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
"
:
...
...
This diff is collapsed.
Click to expand it.
test/test_energies.py
+
1
−
1
View file @
fdffa7c6
...
@@ -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
.
complex
64
,
np
.
complex128
,
np
.
float32
,
np
.
float64
])
dtype
=
list2fixture
([
np
.
complex
128
,
np
.
float64
])
with_mask
=
list2fixture
([
False
,
True
])
with_mask
=
list2fixture
([
False
,
True
])
with_multiplicative
=
list2fixture
([
False
,
True
])
with_multiplicative
=
list2fixture
([
False
,
True
])
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment