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

Fix CI #536

Merged
merged 2 commits into from
Feb 29, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/test_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- uses: actions/checkout@v3
- name: Install cibuildwheel
# MAKE SURE THIS STAYS IN SYNC WITH THE LOWER GHA cibuildwheel
run: pipx install cibuildwheel==2.16.2
run: pipx install cibuildwheel==2.16.5
- id: set-matrix
run: |
MATRIX=$(
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:

- name: Build & (optionally) test wheels
# MAKE SURE THIS STAYS IN SYNC WITH THE UPPER pipx call to cibuildwheel
uses: pypa/[email protected].2
uses: pypa/[email protected].5
with:
only: ${{ matrix.only }}

Expand Down Expand Up @@ -240,7 +240,7 @@ jobs:
with:
password: ${{ secrets.PYPI_TOKEN }}


upload-docs:
name: Upload documentation to GitHub Releases
permissions:
Expand Down
40 changes: 12 additions & 28 deletions tests/structure/test_charges.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

# Test the partial charge of carbon in the molecules given in table
# 3 of the Gasteiger-Marsili publication
# Since some of the molecules are not available in the Chemical
# Since some of the molecules are not available in the Chemical
# Components Dictionary, the respective AtomArrays are constructed via
# Biotite and the coordinates are arbitrarily set to the origin since
# the relevant information is the BondList
Expand Down Expand Up @@ -118,7 +118,7 @@


fluoroethane = array(
[carbon, carbon, fluorine, hydrogen, hydrogen, hydrogen,
[carbon, carbon, fluorine, hydrogen, hydrogen, hydrogen,
hydrogen, hydrogen]
)
fluoroethane.bonds = BondList(
Expand Down Expand Up @@ -328,14 +328,13 @@ def test_valence_state_not_parametrized():
the two hydrogens. Furthermore, the respective warning is expected
to be raised.
"""
warning_message_no_param_for_valence = (
"Parameters for specific valence states of some atoms are not "
"available. These valence states are: \n"
"Atom: Amount of binding partners: Bond type:\n"
"S --------------------------- 2\n"
"Their electronegativity is given as NaN."
)
with pytest.warns(None) as record:
with pytest.warns(
UserWarning,
match=(
"Parameters for specific valence states of some atoms "
"are not available"
)
):
thioformaldehyde = array(
[carbon, sulfur, hydrogen, hydrogen]
)
Expand All @@ -349,10 +348,6 @@ def test_valence_state_not_parametrized():
sulfur_part_charge = charges[1]
carb_part_charge = charges[0]
hyd_part_charge = charges[2]
assert len(record) == 1
warning = record[0]
assert issubclass(warning.category, UserWarning)
assert str(warning.message) == warning_message_no_param_for_valence
assert np.isnan(sulfur_part_charge)
assert carb_part_charge < hyd_part_charge

Expand All @@ -371,11 +366,11 @@ def test_correct_output_ions():
sodium_array.charge = np.array([1])
# Sodium is not involved in covalent bonding
sodium_array.bonds = BondList(sodium_array.array_length())
with pytest.warns(None) as record:
with warnings.catch_warnings():
warnings.simplefilter("error")
sodium_charge = partial_charges(
sodium_array, iteration_step_num=1
)[0]
assert len(record) == 0
assert sodium_charge == 1


Expand Down Expand Up @@ -419,12 +414,6 @@ def test_correct_output_charged_aa():
unspecified bond types throughout the whole AtomArray is raised.
"""

warning_message_unspecified_btype_throughout_the_array = (
"Each atom's bond type is 0 (any). Therefore, it is resorted "
"to the amount of binding partners for the identification of "
"the hybridisation state which can lead to erroneous results."
)

glycine_charge = np.array(
[+1, 0, 0, 0, -1, 0, 0, 0, 0, 0]
)
Expand Down Expand Up @@ -453,15 +442,10 @@ def test_correct_output_charged_aa():
)

part_charges_with_btype = partial_charges(glycine_with_btype)
with pytest.warns(None) as record:
with pytest.warns(UserWarning, match="Each atom's bond type is 0"):
part_charges_without_btype = partial_charges(
glycine_without_btype
)
assert len(record) == 1
warning = record[0]
assert issubclass(warning.category, UserWarning)
assert str(warning.message) == \
warning_message_unspecified_btype_throughout_the_array

# Nitrogen of the amino group has the index 0
nitr_charge_with_btype = part_charges_with_btype[0]
Expand Down
Loading