Skip to content

Commit

Permalink
Merge pull request #7 from tsmathis/update-from-string
Browse files Browse the repository at this point in the history
Replace Species.from_string() with Species.from_str()
  • Loading branch information
tsmathis authored Oct 7, 2024
2 parents e5cba26 + 3788edd commit 75a88e7
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions pymatgen/analysis/alloys/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -467,13 +467,13 @@ def _get_oxi_state_info(

if (anions_a or cations_a) and (anions_b or cations_b):

ions_a = [Species.from_string(sp) for sp in anions_a] + [
Species.from_string(sp) for sp in cations_a
ions_a = [Species.from_str(sp) for sp in anions_a] + [
Species.from_str(sp) for sp in cations_a
]
elements_a = [str(sp.element) for sp in ions_a]

ions_b = [Species.from_string(sp) for sp in anions_b] + [
Species.from_string(sp) for sp in cations_b
ions_b = [Species.from_str(sp) for sp in anions_b] + [
Species.from_str(sp) for sp in cations_b
]
elements_b = [str(sp.element) for sp in ions_b]

Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pymatgen>=2022.0.16
shapely
pymatgen>=2023.7.17
shapely
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
# and distributed under the terms of the Modified BSD License.
# pymatgen-analysis-alloys is Copyright (c) Rachel Woods-Robinson, Matthew Horton

from setuptools import setup, find_namespace_packages

import os

from setuptools import find_namespace_packages, setup

SETUP_PTH = os.path.dirname(os.path.abspath(__file__))

with open(os.path.join(SETUP_PTH, "README.md")) as readme:
Expand All @@ -18,7 +18,7 @@
name="pymatgen-analysis-alloys",
packages=find_namespace_packages(include=["pymatgen.analysis.*"]),
version="0.0.6",
install_requires=["pymatgen>=2022.0.3", "shapely>=1.8.2"],
install_requires=["pymatgen>=2023.7.17", "shapely>=1.8.2"],
extras_require={},
package_data={
"pymatgen.analysis.alloys": ["*.yaml", "*.json", "*.csv"],
Expand Down

0 comments on commit 75a88e7

Please sign in to comment.