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

CAT 0.5 #42

Merged
merged 70 commits into from
Jul 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
4591e1e
WiP: CAT 0.5.0
Jun 27, 2019
7db85d3
WiP
Jun 28, 2019
3c78afe
WiP: CAT 0.5
Jul 1, 2019
7004ca2
Update
Jul 1, 2019
92c0b82
Update ligand_solvation.py
Jul 1, 2019
9b5c936
Update ligand_solvation.py
Jul 1, 2019
5df66c2
Moved the analyses modules to nano-CAT
Jul 1, 2019
7aac901
Update mol_import.py
BvB93 Jul 1, 2019
5d104f2
Update
Jul 1, 2019
e0bc64b
Merge branch 'CAT_0.5' of https://github.com/BvB93/CAT into CAT_0.5
Jul 2, 2019
a7ec4a7
Update ligand_opt.py
Jul 2, 2019
b214905
Update base.py
Jul 2, 2019
eff36e3
WiP: CAT 0.5
Jul 3, 2019
21e4d2a
Bug fixes
Jul 3, 2019
f54dfb6
Update ligand_attach.py
Jul 5, 2019
ed5d93f
Changed import names of Data-CAT and Nano-CAT
Jul 5, 2019
148db0d
Module-level docstring updates
Jul 8, 2019
37f02e2
WiP: Introduction of more tests
Jul 8, 2019
3071297
Update test_frozen_settings.py
BvB93 Jul 8, 2019
de10b3f
Update assertion_functions.py
Jul 8, 2019
4881301
Update ligand_opt.py
Jul 9, 2019
6e9fdff
Bug fixes and improved mongodb interaction
Jul 9, 2019
de72ca5
Update input_sanitizer.py
Jul 9, 2019
3a90b30
Update input_settings.yaml
Jul 9, 2019
cbf6106
Fixed import path
Jul 9, 2019
352938f
Update
Jul 9, 2019
8c7bcd0
WiP: Overhaul of the input parser
Jul 9, 2019
86ce21c
Update input_sanitizer_v2.py
Jul 9, 2019
d5d87d3
Update CHANGELOG.rst
BvB93 Jul 9, 2019
9191357
WiP: Input sanitizer overhaul
Jul 10, 2019
02d514b
Merge branch 'CAT_0.5' of https://github.com/BvB93/CAT into CAT_0.5
Jul 10, 2019
05c7174
WiP: input validation overhaul
Jul 10, 2019
6767e08
Update
Jul 10, 2019
a33722f
WiP: more tests
Jul 10, 2019
365b1f1
WiP: tests
Jul 11, 2019
1a24113
WiP: Updated tests
Jul 11, 2019
0bb2df5
Update
Jul 12, 2019
a3becfe
Update
Jul 12, 2019
b8165a7
Merge branch 'master' into CAT_0.5
Jul 12, 2019
208c813
Merge branch 'master' into CAT_0.5
Jul 12, 2019
e871ab3
Update setup.py
BvB93 Jul 12, 2019
1667b30
Update .travis.yml
BvB93 Jul 12, 2019
d43e7cb
Update .travis.yml
BvB93 Jul 12, 2019
dbe0878
Update requirements.txt
BvB93 Jul 12, 2019
4d52a9e
Update CITATION.cff
BvB93 Jul 12, 2019
d0e396c
Update requirements.txt
BvB93 Jul 12, 2019
03ca615
Update requirements.txt
BvB93 Jul 12, 2019
59f22d9
Update setup.py
BvB93 Jul 12, 2019
70af603
Update setup.py
BvB93 Jul 12, 2019
652f577
Bug fixes
Jul 12, 2019
a8ca10b
Fixed tests
Jul 12, 2019
ba1d095
Fixed documentation
Jul 12, 2019
20425ef
Update conf.py
BvB93 Jul 12, 2019
c8fce8f
Update requirements.txt
BvB93 Jul 12, 2019
70fce63
Update setup.py
BvB93 Jul 12, 2019
9f5fc8b
Update conf.py
BvB93 Jul 12, 2019
74838ee
Update conf.py
BvB93 Jul 12, 2019
a919d7b
Update conf.py
BvB93 Jul 12, 2019
d746c7b
Reverted back to sphinx 1.8
Jul 12, 2019
d3ed8eb
Added a readthedocs configuration file
Jul 12, 2019
a079f22
Moved a couple of files
Jul 12, 2019
cdee66f
Update
Jul 12, 2019
7eb5c20
Update readthedocs.yaml
BvB93 Jul 12, 2019
2a5cdbf
Update readthedocs.yaml
BvB93 Jul 12, 2019
d7c8b3c
Removed mocking
BvB93 Jul 12, 2019
72e208a
Update CHANGELOG.rst
Jul 12, 2019
45b9356
Update conf.py
BvB93 Jul 12, 2019
9894c01
Merge branch 'master' into CAT_0.5
Jul 12, 2019
937390d
Changed sphinx version to >=2.0; set html4_writer to True
Jul 12, 2019
eb8ebb7
Update requirements.txt
BvB93 Jul 12, 2019
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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ venv.bak/

# mypy
.mypy_cache/
tests/timeit_test.py
.DS_Store
docs_out/
.vscode/
.doctrees/
11 changes: 6 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
sudo: false
language: python
language:
python: 3.7

env:
global:
Expand All @@ -18,16 +19,16 @@ install:
- conda info -a

# Install virtual enviroment
- conda install -c conda-forge python==3.7
- conda install -c conda-forge h5py
- conda install -c conda-forge rdkit
- conda create -n CAT python=3.7
- conda install -n CAT -c conda-forge h5py rdkit
- source activate CAT

# Install qmflows package
- pip install .[test]

script:
# Run the unitary tests excluding the expensive computations
- pytest -m "not (slow or long)" --cov=CAT test
- pytest -m "not (slow or long)" --cov=CAT tests
- coverage xml && coverage report -m

branches:
Expand Down
38 changes: 21 additions & 17 deletions CAT/__init__.py
Original file line number Diff line number Diff line change
@@ -1,41 +1,45 @@
""" A collection of tools designed for the construction,
and subsequent analysis, of various chemical compounds. """
"""
CAT
===

__author__ = "Bas van Beek"
__email__ = 'b.f.van.beek@vu.nl'
A collection of tools designed for the construction of various chemical compounds.

"""

from .__version__ import __version__

from .analysis import (
init_asa, CRSJob, CRSResults, job_single_point, job_geometry_opt, job_freq,
init_bde, get_thermo, get_entropy, init_solv
from .jobs import (
job_single_point, job_geometry_opt, job_freq
)

from .thermo_chem import (
get_thermo, get_entropy
)

from .attachment import (
init_qd_opt, init_ligand_opt, init_qd_construction, init_ligand_anchoring
)

from .data_handling import (
Database,
mol_to_file,
read_mol, set_mol_prop,
sanitize_optional, sanitize_input_mol, sanitize_path
read_mol, set_mol_prop
)

from .base import prep

from .utils import get_template

__version__ = __version__
__author__ = "Bas van Beek"
__email__ = 'b.f.van.beek@vu.nl'

__all__ = [
'init_asa', 'CRSJob', 'CRSResults', 'job_single_point', 'job_geometry_opt', 'job_freq',
'init_bde', 'get_thermo', 'get_entropy', 'init_solv',
'job_single_point', 'job_geometry_opt', 'job_freq',

'get_thermo', 'get_entropy',

'init_qd_opt', 'init_ligand_opt', 'init_qd_construction', 'init_ligand_anchoring',

'Database',
'mol_to_file',
'read_mol', 'set_mol_prop',
'sanitize_optional', 'sanitize_input_mol', 'sanitize_path',
'read_mol', 'set_mol_prop'

'prep',

Expand Down
2 changes: 1 addition & 1 deletion CAT/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.4.6'
__version__ = '0.5.0'
47 changes: 0 additions & 47 deletions CAT/analysis/README.rst

This file was deleted.

18 changes: 0 additions & 18 deletions CAT/analysis/__init__.py

This file was deleted.

83 changes: 0 additions & 83 deletions CAT/analysis/asa.py

This file was deleted.

84 changes: 0 additions & 84 deletions CAT/analysis/crs.py

This file was deleted.

Loading