Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

745 rtd files #746

Merged
merged 3 commits into from
Apr 12, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed trapezoid imports
Signed-off-by: Nick Papior <[email protected]>
zerothi committed Apr 12, 2024
commit cb8c5f7858765259aa636fcbae0db772f4b36452
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ build:
- gcc
- gfortran
tools:
python: "latest"
python: "3.11"

sphinx:
configuration: docs/conf.py
6 changes: 3 additions & 3 deletions src/sisl/_core/orbital.py
Original file line number Diff line number Diff line change
@@ -17,10 +17,10 @@
from numpy import cos, sin, sqrt, square, take
from scipy.special import eval_genlaguerre, factorial, lpmv

if scipy.__version__ < "0.16":
from scipy.integrate import cumtrapz as cumulative_trapezoid
else:
try:
from scipy.integrate import cumulative_trapezoid
except ImportError:
from scipy.integrate import cumtrapz as cumulative_trapezoid

from scipy.interpolate import UnivariateSpline

7 changes: 5 additions & 2 deletions src/sisl_toolbox/siesta/atom/_atom.py
Original file line number Diff line number Diff line change
@@ -25,12 +25,15 @@
made available through the `stoolbox`.
"""
import sys
from collections.abc import Iterable
from functools import reduce
from pathlib import Path

import numpy as np
from scipy.integrate import trapezoid

try:
from scipy.integrate import trapezoid
except ImportError:
from scipy.integrate import trapz as trapezoid
from scipy.interpolate import interp1d

import sisl as si