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

Separate environments #417

Open
wants to merge 98 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
469bdd3
T023: add minimal working env
mbackenkoehler Jan 26, 2024
373edfb
T024: minimal environment
mbackenkoehler Jan 26, 2024
f32951e
T025: minimal environment
mbackenkoehler Jan 26, 2024
e8989eb
T026: minimal environment
mbackenkoehler Jan 26, 2024
35bf094
T027: minimal environment
mbackenkoehler Jan 26, 2024
4928416
environment talktorial t002
PaulaKramer Jan 26, 2024
c8c3ab6
T028: minimal environment
mbackenkoehler Jan 26, 2024
38428e6
create env t034
joschka-gross Jan 26, 2024
aea9bc0
environment t003
PaulaKramer Jan 26, 2024
0da94f9
environment t004
PaulaKramer Jan 26, 2024
a8a9451
T019: minimal environment
mbackenkoehler Jan 26, 2024
a7e5bd0
T020: minimal environment
mbackenkoehler Jan 26, 2024
79af0e0
environment t005
PaulaKramer Jan 26, 2024
f6325e4
seperate evn t035
joschka-gross Jan 26, 2024
20bde49
environment t006
PaulaKramer Jan 26, 2024
c050a1e
removed nbval from smarts cell
PaulaKramer Jan 26, 2024
bd8ff07
environment t007
PaulaKramer Jan 26, 2024
3a2f604
Env and minor fixes in notebook
Jan 26, 2024
335d2db
env t021, sklearn code fix
PaulaKramer Jan 26, 2024
86d217b
Env and minor fixes in notebook
Jan 26, 2024
235332b
separate env t036
joschka-gross Jan 26, 2024
b843670
add new models
joschka-gross Jan 26, 2024
538e36a
T025: environment fixes, changed difference matrix code
mbackenkoehler Jan 26, 2024
19db821
separate env t037
joschka-gross Jan 26, 2024
f29472e
T025: minor clean up
mbackenkoehler Jan 26, 2024
53cc3f0
separate env t033
joschka-gross Jan 26, 2024
e3ad38c
T026: dist matrix fixes
mbackenkoehler Jan 26, 2024
d89f4ad
T025: updated data
mbackenkoehler Jan 26, 2024
880e55d
environment t022
PaulaKramer Jan 26, 2024
5e01594
separate env
joschka-gross Jan 26, 2024
e125b25
add results
joschka-gross Jan 26, 2024
6e4a586
Env and minor fixes in notebook
Jan 26, 2024
b80e26e
Env and minor fixes in notebook
Jan 26, 2024
ff2d458
t016: added environment, got rid of utils dependency
azmtag Jan 26, 2024
f37ecd6
t014: separate env
azmtag Jan 26, 2024
f9a217c
t015: separate env
azmtag Jan 26, 2024
bc8ae3e
t017: separate env
azmtag Jan 26, 2024
7d6b41a
first version of (Env and minor fixes in notebook)
Jan 26, 2024
24843be
Env and minor fixes in notebook
Jan 26, 2024
7bb2401
Env and minor fixes in notebook
Jan 26, 2024
4155719
first version of (Env and minor fixes in notebook)
Jan 26, 2024
285ecfc
second version of (Env and minor fixes in notebook)
Jan 26, 2024
d5c03d4
pdb-parsing related exception fixed
Feb 5, 2024
112e07a
ignore DeprecationWarning and FutureWarning warnings in all internal/…
AAriam Feb 15, 2024
9b56ad6
Remove OpenCADD dependency
AAriam Feb 15, 2024
4577c80
Create environment.yml
AAriam Feb 15, 2024
1e36271
Suppress deprecation warnings in plip
AAriam Feb 15, 2024
62dcbf8
rerun notebook and adopt text
AAriam Feb 15, 2024
d3396e2
CI: talktorial testing in python script
mbackenkoehler Feb 27, 2024
2f6f6be
rename environment to fit scheme
mbackenkoehler Feb 27, 2024
393fe24
Merge branch 'sepenv-t001' into separate-environments
mbackenkoehler Feb 27, 2024
e26bb3b
CI: fix path in test script
mbackenkoehler Feb 27, 2024
d2ab772
CI: test T001
mbackenkoehler Feb 27, 2024
50046a1
Merge remote-tracking branch 'origin/sepenv-t002' into separate-envir…
mbackenkoehler Feb 27, 2024
39cfbba
Merge remote-tracking branch 'origin/sepenv-t003' into separate-envir…
mbackenkoehler Feb 27, 2024
c3e84d2
Merge remote-tracking branch 'origin/sepenv-t004' into separate-envir…
mbackenkoehler Feb 27, 2024
34880b0
Merge remote-tracking branch 'origin/sepenv-t005' into separate-envir…
mbackenkoehler Feb 27, 2024
1166943
Merge remote-tracking branch 'origin/sepenv-t006' into separate-envir…
mbackenkoehler Feb 27, 2024
da549ac
Merge remote-tracking branch 'origin/sepenv-t007' into separate-envir…
mbackenkoehler Feb 27, 2024
0f47599
Merge remote-tracking branch 'origin/sepenv-t008' into separate-envir…
mbackenkoehler Feb 27, 2024
52f5ed3
Merge remote-tracking branch 'origin/sepenv-t010' into separate-envir…
mbackenkoehler Feb 27, 2024
40802a8
Merge remote-tracking branch 'origin/sepenv-t009' into separate-envir…
mbackenkoehler Feb 27, 2024
98df9e1
Merge remote-tracking branch 'origin/sepenv-t011' into separate-envir…
mbackenkoehler Feb 27, 2024
e4615b3
Merge remote-tracking branch 'origin/sepenv-t012' into separate-envir…
mbackenkoehler Feb 27, 2024
b01a272
Merge remote-tracking branch 'origin/sepenv-t013' into separate-envir…
mbackenkoehler Feb 27, 2024
2d37454
Merge remote-tracking branch 'origin/sepenv-t014' into separate-envir…
mbackenkoehler Feb 27, 2024
502ac96
Merge remote-tracking branch 'origin/sepenv-t015' into separate-envir…
mbackenkoehler Feb 27, 2024
192b125
CI: test script dev
mbackenkoehler Feb 27, 2024
4aacca5
CI: environment merging [0..15] / 11
mbackenkoehler Feb 27, 2024
f17a388
Merge remote-tracking branch 'origin/sepenv-t016' into separate-envir…
mbackenkoehler Feb 28, 2024
b6e713b
Merge remote-tracking branch 'origin/sepenv-t017' into separate-envir…
mbackenkoehler Feb 28, 2024
69b33ee
Merge remote-tracking branch 'origin/sepenv-t019' into separate-envir…
mbackenkoehler Feb 28, 2024
092174c
Merge pull request #416 from AAriam/dev
mbackenkoehler Feb 28, 2024
5a91800
Merge remote-tracking branch 'origin/sepenv-t020' into separate-envir…
mbackenkoehler Feb 28, 2024
ecf35b2
Merge remote-tracking branch 'origin/sepenv-t021' into separate-envir…
mbackenkoehler Feb 28, 2024
6a16698
Merge remote-tracking branch 'origin/sepenv-t022' into separate-envir…
mbackenkoehler Feb 28, 2024
234a45b
Merge remote-tracking branch 'origin/sepenv-t023' into separate-envir…
mbackenkoehler Feb 28, 2024
910e00e
Merge remote-tracking branch 'origin/sepenv-t024' into separate-envir…
mbackenkoehler Feb 28, 2024
93b3252
Merge remote-tracking branch 'origin/sepenv-t025' into separate-envir…
mbackenkoehler Feb 28, 2024
f454c29
Merge remote-tracking branch 'origin/sepenv-t026' into separate-envir…
mbackenkoehler Feb 28, 2024
0ac531c
Merge remote-tracking branch 'origin/sepenv-t027' into separate-envir…
mbackenkoehler Feb 28, 2024
d4d9fe3
Merge remote-tracking branch 'origin/sepenv-t028' into separate-envir…
mbackenkoehler Feb 28, 2024
10c5b07
Merge remote-tracking branch 'origin/sepenv-t033' into separate-envir…
mbackenkoehler Feb 28, 2024
6e20b5a
CI: fix black version
mbackenkoehler Feb 28, 2024
25569b3
CI: integrating more talktorials
mbackenkoehler Feb 28, 2024
c0c76e3
Merge remote-tracking branch 'origin/sepenv-t034' into separate-envir…
mbackenkoehler Feb 28, 2024
092ea73
Merge remote-tracking branch 'origin/sepenv-t035' into separate-envir…
mbackenkoehler Feb 28, 2024
7a0c78f
Merge remote-tracking branch 'origin/sepenv-t036' into separate-envir…
mbackenkoehler Feb 28, 2024
1acb994
Merge remote-tracking branch 'origin/sepenv-t037' into separate-envir…
mbackenkoehler Feb 28, 2024
a420000
Merge remote-tracking branch 'origin/sepenv-t038' into separate-envir…
mbackenkoehler Feb 28, 2024
a45f2d1
Mensch Joschker...
mbackenkoehler Feb 28, 2024
276415d
CI: include DL edition nbs
mbackenkoehler Feb 28, 2024
b6ff928
CI: black 9, 10, 11, 27
mbackenkoehler Feb 28, 2024
3538cba
CI: black 35, 36
mbackenkoehler Feb 28, 2024
e452ec3
CI: add 11, 18
mbackenkoehler Feb 28, 2024
5dffb3c
CI: basic env
mbackenkoehler Feb 28, 2024
24182c0
CI: no mamba postinstall
mbackenkoehler Feb 28, 2024
3f61add
CI: remove pyg dep
mbackenkoehler Feb 28, 2024
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
88 changes: 13 additions & 75 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,103 +21,41 @@ jobs:
matrix:
cfg:
- os: ubuntu-latest
python-version: "3.8"
- os: ubuntu-latest
python-version: "3.9"
- os: macos-latest
python-version: "3.8"
- os: windows-latest
python-version: "3.8"

env:
PYVER: ${{ matrix.cfg.python-version }}
PACKAGE: teachopencadd

steps:
- uses: actions/checkout@v3
- name: Checkout repository
uses: actions/checkout@v4

- uses: conda-incubator/setup-miniconda@v2
- name: Setup Conda
uses: conda-incubator/setup-miniconda@v3
with:
python-version: ${{ matrix.cfg.python-version }}
miniforge-variant: Mambaforge
miniforge-version: latest
mamba-version: "*"
channels: conda-forge,defaults
channel-priority: true
activate-environment: teachopencadd
environment-file: devtools/test_env.yml

- name: Additional info about the build
shell: bash
run: |
uname -a
df -h
ulimit -a

- name: Install package
shell: bash -l {0}
run: |
pip install . --no-deps -vv

- name: Environment Information
shell: bash -l {0}
- name: Run Talktorials
shell: bash -el {0}
run: |
conda info --all
conda list

- name: Test CLI
shell: bash -l {0}
run: |
teachopencadd -h
pytest -v --cov=${PACKAGE} --cov-report=xml --color=yes ${PACKAGE}/tests/

- name: Run tests
shell: bash -l {0}
run: |
PYTEST_ARGS="--nbval-lax --current-env --dist loadscope --numprocesses 2"

PYTEST_IGNORE_T001="--ignore=teachopencadd/talktorials/T001_query_chembl/talktorial.ipynb"
PYTEST_IGNORE_T018="--ignore=teachopencadd/talktorials/T018_automated_cadd_pipeline/talktorial.ipynb"
PYTEST_IGNORE_T019="--ignore=teachopencadd/talktorials/T019_md_simulation/talktorial.ipynb"
PYTEST_IGNORE_T020="--ignore=teachopencadd/talktorials/T020_md_analysis/talktorial.ipynb"
PYTEST_IGNORE_T035="--ignore=teachopencadd/talktorials/T035_graph_neural_networks/talktorial.ipynb"
PYTEST_IGNORE_T036="--ignore=teachopencadd/talktorials/T036_e3_equivariant_gnn/talktorial.ipynb"
PYTEST_IGNORE_T038="--ignore=teachopencadd/talktorials/T038_protein_ligand_interaction_prediction/talktorial.ipynb"

IGNORE="$PYTEST_IGNORE_T001"

if [ "$RUNNER_OS" == "Windows" ]; then
# Ignore T019 under Windows, see https://github.com/volkamerlab/teachopencadd/issues/313
IGNORE="$IGNORE $PYTEST_IGNORE_T019"
IGNORE="$IGNORE $PYTEST_IGNORE_T035"
IGNORE="$IGNORE $PYTEST_IGNORE_T036"
IGNORE="$IGNORE $PYTEST_IGNORE_T038"
fi

if [ "$RUNNER_OS" == "Linux" ]; then
IGNORE="$IGNORE $PYTEST_IGNORE_T018" # see 385
fi

if [ "$RUNNER_OS" == "macOS" ]; then
IGNORE="$IGNORE $PYTEST_IGNORE_T018" # see 385
IGNORE="$IGNORE $PYTEST_IGNORE_T019"
IGNORE="$IGNORE $PYTEST_IGNORE_T035" # may cause kernel dying in pytest
IGNORE="$IGNORE $PYTEST_IGNORE_T036" # may cause kernel dying in pytest
fi

pytest $PYTEST_ARGS teachopencadd/talktorials/ $IGNORE
python devtools/test_talktorials.py

format:
name: Black
name: Talktorial Formatting
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
- name: Install format dependencies
run: python -m pip install black-nb shyaml
run: python -m pip install 'black<23.1.0' black-nb shyaml
- name: Run black-nb
run: |
black-nb -l 99 --check teachopencadd/talktorials/T*/talktorial.ipynb

readmes:
name: READMEs
name: README consistency
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
16 changes: 16 additions & 0 deletions devtools/environment_a.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: teachopencadd-a

channels:
- conda-forge
- defaults

dependencies:
- python=3.11
- jupyterlab
- notebook=7
- pandas=2.
- rdkit=2023.9
- chembl_webresource_client=0.10
- iprogress
- ipywidgets=8
- tqdm
23 changes: 23 additions & 0 deletions devtools/environment_b.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: teachopencadd-b

channels:
- conda-forge
- defaults

dependencies:
- python=3.11
- pip
- jupyterlab
- numpy
- pandas=2.0
- rdkit
- pyarrow
- ipywidgets
- tqdm
- scikit-learn
- pdbfixer
- tensorflow
- seaborn
- biotite
- pip:
- ..
30 changes: 30 additions & 0 deletions devtools/environment_c.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: teachopencadd-c

channels:
- conda-forge
- defaults

dependencies:
- python=3.9
- jupyterlab
- pandas=2.1.4
- numpy
- notebook=7
- tqdm
- pyarrow
- ipywidgets=8
- matplotlib=3.8
- rdkit=2023.9
- opencadd
- pypdb=2
- redo=2
- nglview=3
- requests-cache
- bravado=11
- matplotlib-venn
- plip
- openbabel
- smina
- seaborn
- scikit-learn
- kissim
15 changes: 15 additions & 0 deletions devtools/environment_d.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: teachopencadd-d

channels:
- conda-forge
- defaults

dependencies:
- python=3.11
- jupyterlab
- notebook>=7
- rdkit=2023.9
- pandas>=2.1
- pyarrow
- nglview=3
- scikit-learn=1.4
19 changes: 19 additions & 0 deletions devtools/environment_e.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: teachopencadd-e

channels:
- conda-forge
- defaults

dependencies:
- python=3.9
- jupyterlab
- pandas=2.0
- notebook=7
- pyarrow
- rdkit=2022.9
- opencadd
- pypdb=2
- redo=2
- nglview=3
- numpy=1.21
- mdanalysis=2
14 changes: 14 additions & 0 deletions devtools/environment_f.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: teachopencadd-e

channels:
- conda-forge
- defaults

dependencies:
- python=3.11
- jupyterlab
- pandas
- pyarrow
- seaborn
- biotite
- scikit-learn
21 changes: 21 additions & 0 deletions devtools/environment_g.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: teachopencadd-g
channels:
- conda-forge
dependencies:
- python=3.11
- matplotlib
- numpy
- pandas
- pytorch
- tqdm
- pytorch_geometric
- torch-scatter
- scipy
- seaborn
- rdkit
- jupyterlab
- pyarrow
- nglview
- biotite
- pypdb
- chembl_webresource_client
16 changes: 16 additions & 0 deletions devtools/environment_h.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: teachopencadd-h

channels:
- conda-forge
- defaults

dependencies:
- python=3.11
- jupyterlab
- notebook=7
- pandas=2.1
- pyarrow
- nglview=3
- scikit-learn=1.4
- biopython
- bravado
21 changes: 21 additions & 0 deletions devtools/environment_i.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: teachopencadd-i
channels:
- conda-forge
- defaults
dependencies:
- python = 3.12.1
- jupyterlab = 4.1.1
- numpy = 1.26.4
- pandas = 2.1.4 # not 2.2.x due to this problem in RDKit: https://github.com/rdkit/rdkit/pull/7165
- matplotlib = 3.8.2
- rdkit = 2023.09.5
- nglview = 3.1.1
- openbabel = 3.1.1
- biopandas = 0.4.1
- pypdb = 2.3
- mdanalysis = 2.7.0
- plip = 2.3.0
- smina = 2020.12.10
- requests = 2.31.0
- redo = 2.0.4
- ipywidgets = 8.1.2
60 changes: 60 additions & 0 deletions devtools/test_configurations.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
environments:
- name: teachopencadd-a
file: environment_a.yml
notebooks:
- T001_query_chembl
- name: teachopencadd-b
file: environment_b.yml
notebooks:
- T002_compound_adme
- T003_compound_unwanted_substructures
- T004_compound_similarity
- T005_compound_clustering
- T006_compound_maximum_common_substructures
- T007_compound_activity_machine_learning
- T013_query_pubchem
# - T019_md_simulation
- T021_one_hot_encoding
- T027_kinase_similarity_ligand_profile
- name: teachopencadd-c
file: environment_c.yml
notebooks:
- T008_query_pdb
- T012_query_klifs
- T014_binding_site_detection
- T015_protein_ligand_docking
- T016_protein_ligand_interactions
- T017_advanced_nglview_usage
- T023_what_is_a_kinase
- T025_kinase_similarity_kissim
- T026_kinase_similarity_ifp
- name: teachopencadd-d
file: environment_d.yml
notebooks:
- T009_compound_ensemble_pharmacophores
- name: teachopencadd-e
file: environment_e.yml
notebooks:
- T010_binding_site_comparison
- name: teachopencadd-f
file: environment_f.yml
notebooks:
- T024_kinase_similarity_sequence
- T028_kinase_similarity_compare_perspectiv
- name: teachopencadd-g
file: environment_g.yml
notebooks:
- T033_molecular_representations
- T034_recurrent_neural_networks
- T035_graph_neural_networks
- T036_e3_equivariant_gnn
- T037_uncertainty_estimation
- T038_protein_ligand_interaction_prediction
- name: teachopencadd-h
file: environment_h.yml
notebooks:
- T011_query_online_api_webservices
- name: teachopencadd-i
file: environment_i.yml
notebooks:
- T018_automated_cadd_pipeline
Loading
Loading