Skip to content

Commit

Permalink
Merge branch 'patch'
Browse files Browse the repository at this point in the history
  • Loading branch information
lpravda committed Oct 14, 2020
2 parents 18f9d98 + bdc9d25 commit 0d1d14a
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ examples/*
.vscode/*
.pytest_cache/*
.mypy_cache
arpeggio.egg-info
3 changes: 0 additions & 3 deletions arpeggio/core/interactions.py
Original file line number Diff line number Diff line change
Expand Up @@ -1226,9 +1226,6 @@ def __calculate_group_group_contacts(self):
if amide_key == amide_key2:
continue

if amide_key == 441 and amide2 == 442:
print('foo')

# CHECK RING IS INVOLVED WITH THE SELECTION OR BINDING SITE
if amide_key2 not in self.selection_plus_amide_ids:
continue
Expand Down
2 changes: 1 addition & 1 deletion arpeggio/core/protein_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import numpy
from Bio import PDB
from Bio.PDB.StructureBuilder import StructureBuilder
from mmCif.mmcifIO import MMCIF2Dict
from pdbecif.mmcif_io import MMCIF2Dict
import openbabel as ob


Expand Down
4 changes: 4 additions & 0 deletions arpeggio/scripts/process_protein_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,3 +144,7 @@ def _parse_selection(args):
else:
logger.warning(f'No selection was perceived. Defaults into full structure!!')
return selection


if __name__ == "__main__":
main()
6 changes: 4 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,10 @@
],
zip_safe=False,
include_package_data=True,
install_requires=["pdbecif", "numpy", "biopython"],
tests_require=["pytest"],
install_requires=["pdbecif>=1.5", "numpy", "biopython"],
extras_require={
"tests": ["pytest", "pytest-cov"]
},
entry_points={
"console_scripts": ["arpeggio=arpeggio.scripts.process_protein_cli:main"]
},
Expand Down

0 comments on commit 0d1d14a

Please sign in to comment.