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

Bump atomistics from 0.0.3 to 0.0.5 #1164

Merged
merged 6 commits into from
Sep 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion .ci_support/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ channels:
- conda-forge
dependencies:
- ase =3.22.1
- atomistics =0.0.3
- atomistics =0.0.5
- coveralls
- coverage
- codacy-coverage
Expand Down
6 changes: 3 additions & 3 deletions pyiron_atomistics/atomistics/master/murnaghan.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
from __future__ import print_function
from typing import Optional

from atomistics.thermo.debye import DebyeModel
from atomistics.evcurve.fit import (
from atomistics.shared.thermo.debye import DebyeModel
from atomistics.workflows.evcurve.fit import (
EnergyVolumeFit,
fitfunction,
get_error,
fit_leastsq_eos,
)
from atomistics.evcurve.calculator import _strain_axes
from atomistics.workflows.evcurve.workflow import _strain_axes
import matplotlib.pyplot as plt
import numpy as np

Expand Down
2 changes: 1 addition & 1 deletion pyiron_atomistics/atomistics/thermodynamics/thermo_bulk.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (c) Max-Planck-Institut für Eisenforschung GmbH - Computational Materials Design (CM) Department
# Distributed under the terms of "New BSD License", see the LICENSE file.

from atomistics.thermo.thermo import ThermoBulk as AtomisticsThermoBulk
from atomistics.shared.thermo.thermo import ThermoBulk as AtomisticsThermoBulk

__author__ = "Joerg Neugebauer, Jan Janssen"
__copyright__ = (
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
]),
install_requires=[
'ase==3.22.1',
'atomistics==0.0.3',
'atomistics==0.0.5',
'defusedxml==0.7.1',
'h5py==3.9.0',
'matplotlib==3.7.2',
Expand Down
Loading