Skip to content

Commit

Permalink
Merge dependabot/pip/pillow-10.2.0 into combine-prs-branch
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Jan 23, 2024
2 parents a3f6f74 + 23f3c75 commit c2d71b4
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ pandas==2.1.3
# pymatgen
pathos==0.3.1
# via SMACT (setup.py)
pillow==10.1.0
pillow==10.2.0
# via matplotlib
plotly==5.18.0
# via pymatgen
Expand Down
20 changes: 10 additions & 10 deletions smact/screening.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ def pauling_test(
Returns:
bool:
True if positive ions have lower
electronegativity than negative ions
True if anions are more electronegative than
cations, otherwise False
"""

if repeat_anions and repeat_cations and threshold == 0.0:
Expand Down Expand Up @@ -135,8 +135,8 @@ def pauling_test_old(
Returns:
(bool):
True if positive ions have lower
electronegativity than negative ions
True if anions are more electronegative than
cations, otherwise False
"""
if None in paul:
Expand Down Expand Up @@ -192,8 +192,8 @@ def eneg_states_test(ox_states: List[int], enegs: List[float]):
compound
Returns:
bool : True if cations have higher electronegativity than
anions, otherwise False
bool : True if anions are more electronegative than
cations, otherwise False
"""
for (ox1, eneg1), (ox2, eneg2) in combinations(
Expand Down Expand Up @@ -231,8 +231,8 @@ def eneg_states_test_threshold(
the Pauling criterion
Returns:
bool : True if cations have higher electronegativity than
anions, otherwise False
bool : True if anions are more electronegative than
cations, otherwise False
"""
for (ox1, eneg1), (ox2, eneg2) in combinations(
Expand All @@ -259,8 +259,8 @@ def eneg_states_test_alternate(ox_states: List[int], enegs: List[float]):
compound
Returns:
bool : True if cations have higher electronegativity than
anions, otherwise False
bool : True if anions are more electronegative than
cations, otherwise False
"""
min_cation_eneg, max_anion_eneg = 10, 0
Expand Down

0 comments on commit c2d71b4

Please sign in to comment.