Skip to content

Commit

Permalink
Merge 1d3e173 into b18f4a1
Browse files Browse the repository at this point in the history
  • Loading branch information
dependabot[bot] committed Aug 4, 2022
2 parents b18f4a1 + 1d3e173 commit 90c3779
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
5 changes: 2 additions & 3 deletions pymatgen/analysis/diffusion/aimd/rdf.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@

import numpy as np
from joblib import Parallel, delayed
from pymatgen.core import Structure
from pymatgen.util.plotting import pretty_plot
from scipy.ndimage import gaussian_filter1d
from scipy.signal import find_peaks
from scipy.stats import norm

from pymatgen.core import Structure
from pymatgen.util.plotting import pretty_plot


class RadialDistributionFunction:
"""
Expand Down
4 changes: 2 additions & 2 deletions pymatgen/analysis/diffusion/aimd/van_hove.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
import matplotlib.pyplot as plt
import numpy as np
import pandas as pds
from scipy.stats import norm

from pymatgen.core import Structure
from pymatgen.util.plotting import pretty_plot
from pymatgen.util.typing import ArrayLike
from scipy.stats import norm

from pymatgen.analysis.diffusion.analyzer import DiffusionAnalyzer

from .rdf import RadialDistributionFunction
Expand Down
2 changes: 1 addition & 1 deletion requirements-ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ pydocstyle
flake8
pylint
black
treon==0.1.3
treon==0.1.4
maggma==0.39.1

0 comments on commit 90c3779

Please sign in to comment.