Skip to content

Commit 8c997c2

Browse files
authored
Merge pull request #1935 from pyiron/lammpsparser
Transition from pyiron_lammps to lammpsparser
2 parents 7274d9f + 00f77d9 commit 8c997c2

File tree

13 files changed

+22
-21
lines changed

13 files changed

+22
-21
lines changed

.ci_support/environment-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies:
1919
- phonopy =2.47.1
2020
- pint =0.25.2
2121
- pyiron_base =0.15.12
22-
- pyiron_lammps =0.5.2
22+
- lammpsparser =0.0.1
2323
- pyiron_snippets =1.0.2
2424
- pyiron_vasp =0.2.18
2525
- pylammpsmpi =0.3.9

.ci_support/environment-old.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies:
1515
- phonopy =2.26.6
1616
- pint =0.24.4
1717
- pyiron_base =0.15.4
18-
- pyiron_lammps =0.3.2
18+
- lammpsparser =0.0.1
1919
- pyiron_vasp =0.2.2
2020
- pyiron_snippets =1.0.1
2121
- pylammpsmpi =0.2.36

.ci_support/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies:
1616
- phonopy =2.47.1
1717
- pint =0.25.2
1818
- pyiron_base =0.15.12
19-
- pyiron_lammps =0.5.2
19+
- lammpsparser =0.0.1
2020
- pyiron_vasp =0.2.18
2121
- pyiron_snippets =1.0.2
2222
- pylammpsmpi =0.3.9

binder/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies:
1515
- phonopy =2.47.1
1616
- pint =0.25.2
1717
- pyiron_base =0.15.12
18-
- pyiron_lammps =0.5.2
18+
- lammpsparser =0.0.1
1919
- pyiron_snippets =1.0.2
2020
- pyiron_vasp =0.2.18
2121
- pylammpsmpi =0.3.9

pyiron_atomistics/calphy/job.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
import pandas as pd
77
import yaml
88
from ase.io import read
9-
from pyiron_base import DataContainer, GenericJob
10-
from pyiron_lammps.structure import (
9+
from lammpsparser.structure import (
1110
UnfoldingPrism,
1211
structure_to_lammps,
1312
)
13+
from pyiron_base import DataContainer, GenericJob
1414
from pyiron_snippets.import_alarm import ImportAlarm
1515

1616
from pyiron_atomistics.atomistics.structure.atoms import Atoms, ase_to_pyiron

pyiron_atomistics/lammps/base.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
import numpy as np
1313
import pandas
14+
from lammpsparser.output import parse_lammps_output
15+
from lammpsparser.structure import UnfoldingPrism, structure_to_lammps
16+
from lammpsparser.units import LAMMPS_UNIT_CONVERSIONS
1417
from pyiron_base import state
15-
from pyiron_lammps.output import parse_lammps_output
16-
from pyiron_lammps.structure import UnfoldingPrism, structure_to_lammps
17-
from pyiron_lammps.units import LAMMPS_UNIT_CONVERSIONS
1818
from pyiron_snippets.deprecate import deprecate
1919
from pyiron_snippets.logger import logger
2020

pyiron_atomistics/lammps/control.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
from collections import OrderedDict
1010

1111
import numpy as np
12+
from lammpsparser.units import LAMMPS_UNIT_CONVERSIONS
1213
from pyiron_base import GenericParameters, state
13-
from pyiron_lammps.units import LAMMPS_UNIT_CONVERSIONS
1414

1515
__author__ = "Joerg Neugebauer, Sudarsan Surendralal, Jan Janssen"
1616
__copyright__ = (

pyiron_atomistics/lammps/interactive.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
import numpy as np
99
import pandas as pd
10-
from pyiron_lammps.structure import UnfoldingPrism
11-
from pyiron_lammps.units import UnitConverter
10+
from lammpsparser.structure import UnfoldingPrism
11+
from lammpsparser.units import UnitConverter
1212
from pyiron_snippets.import_alarm import ImportAlarm
1313

1414
from pyiron_atomistics.atomistics.job.interactive import GenericInteractive

pyiron_atomistics/lammps/structure.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
from collections import OrderedDict
88

99
import numpy as np
10-
from pyiron_lammps.structure import LammpsStructure as LammpsStructureASE
11-
from pyiron_lammps.units import UnitConverter
10+
from lammpsparser.structure import LammpsStructure as LammpsStructureASE
11+
from lammpsparser.units import UnitConverter
1212

1313
__author__ = "Joerg Neugebauer, Sudarsan Surendralal, Yury Lysogorskiy, Jan Janssen, Markus Tautschnig"
1414
__copyright__ = (

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ dependencies = [
3636
"phonopy==2.47.1",
3737
"pint==0.25.2",
3838
"pyiron_base==0.15.12",
39-
"pyiron_lammps==0.5.2",
39+
"lammpsparser==0.0.1",
4040
"pyiron_snippets==1.0.2",
4141
"pyiron_vasp==0.2.18",
4242
"pylammpsmpi==0.3.9",

0 commit comments

Comments
 (0)