Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
martinvoegele committed Sep 30, 2023
1 parent 0f4b73a commit faed54f
Show file tree
Hide file tree
Showing 20 changed files with 12 additions and 62 deletions.
11 changes: 7 additions & 4 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ channels:
- conda-forge
- defaults
dependencies:
- python==3.7
- mdtraj==1.9.3
- mdshare
- pyemma
- python==3.9
- scipy>=1.2
- numpy
- pandas
- matplotlib
- MDAnalysis
- deeptime
- biotite
4 changes: 0 additions & 4 deletions pensa/clusters/clustering.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import numpy as np
import scipy as sp
import scipy.stats
import mdshare
import deeptime
import MDAnalysis as mda
import matplotlib.pyplot as plt


Expand Down
8 changes: 0 additions & 8 deletions pensa/clusters/trajectory.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
import numpy as np
import scipy as sp
import scipy.stats
import mdshare
import pyemma
from pyemma.util.contexts import settings
import MDAnalysis as mda
import matplotlib.pyplot as plt




def write_cluster_traj(cluster_idx, top_file, trj_file, out_name, start_frame=0):
Expand Down
8 changes: 0 additions & 8 deletions pensa/clusters/wss.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
import numpy as np
import scipy as sp
import scipy.stats
import mdshare
import pyemma
from pyemma.util.contexts import settings
import MDAnalysis as mda
import matplotlib.pyplot as plt

from pensa.clusters import obtain_clusters, obtain_combined_clusters




def wss_over_number_of_clusters(data, algorithm='kmeans',
max_iter=100, num_repeats = 5, max_num_clusters = 12,
plot_file = None):
Expand Down
2 changes: 0 additions & 2 deletions pensa/comparison/metrics.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
from pensa import *
from pensa.comparison import *
from pensa.dimensionality import *
import random
import math


"""
Expand Down
3 changes: 0 additions & 3 deletions pensa/comparison/relative_entropy.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
import scipy.stats
import scipy.spatial
import scipy.spatial.distance
import MDAnalysis as mda
import matplotlib.pyplot as plt
import os
from pensa.features import *


Expand Down
3 changes: 1 addition & 2 deletions pensa/comparison/statespecific.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import numpy as np
from tqdm import tqdm
import numpy as np
from pensa.features import *
from pensa.statesinfo import *

Expand Down
3 changes: 0 additions & 3 deletions pensa/comparison/statistics.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
import scipy.stats
import scipy.spatial
import scipy.spatial.distance
import MDAnalysis as mda
import matplotlib.pyplot as plt
import os
from pensa.features import *


Expand Down
1 change: 0 additions & 1 deletion pensa/comparison/visualization.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import scipy.spatial.distance
import MDAnalysis as mda
import matplotlib.pyplot as plt
import os
from pensa.features import *


Expand Down
3 changes: 1 addition & 2 deletions pensa/dimensionality/pca.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import warnings
import numpy as np
import MDAnalysis as mda
import matplotlib.pyplot as plt
from sklearn.decomposition import PCA
from pensa.preprocessing import sort_coordinates, merge_and_sort_coordinates
from pensa.preprocessing import merge_and_sort_coordinates
from pensa.comparison import feature_correlation
from .visualization import project_on_eigenvector_pca, sort_traj_along_projection

Expand Down
3 changes: 1 addition & 2 deletions pensa/dimensionality/tica.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import numpy as np
import deeptime
import MDAnalysis as mda
import matplotlib.pyplot as plt
from pensa.preprocessing import sort_coordinates, merge_and_sort_coordinates
from pensa.preprocessing import merge_and_sort_coordinates
from .visualization import project_on_eigenvector_tica, sort_traj_along_projection


Expand Down
5 changes: 1 addition & 4 deletions pensa/dimensionality/visualization.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import numpy as np
import pyemma
from sklearn.decomposition import PCA
import deeptime
from pyemma.util.contexts import settings
import MDAnalysis as mda
import matplotlib.pyplot as plt
from pensa.preprocessing import sort_coordinates, merge_and_sort_coordinates
from pensa.preprocessing import sort_coordinates


def project_on_eigenvector_tica(data, ev_idx, ana):
Expand Down
1 change: 0 additions & 1 deletion pensa/features/mda_distances.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import numpy as np
import MDAnalysis as mda
import MDAnalysis.lib.distances as ld
import matplotlib.pyplot as plt
import gpcrmining.gpcrdb as db


Expand Down
3 changes: 0 additions & 3 deletions pensa/features/processing.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@
import scipy.stats
import scipy.spatial
import scipy.spatial.distance
import MDAnalysis as mda
import matplotlib.pyplot as plt
import os
import warnings
from pensa.preprocessing import sort_coordinates


Expand Down
1 change: 0 additions & 1 deletion pensa/features/water_features.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import MDAnalysis as mda
import numpy as np
import itertools as it
from gridData import Grid
from tqdm import tqdm
import os
Expand Down
2 changes: 0 additions & 2 deletions pensa/preprocessing/coordinates.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import MDAnalysis as mda
import numpy as np
import os
import requests
from MDAnalysis.analysis import align


Expand Down
2 changes: 0 additions & 2 deletions pensa/preprocessing/density.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
from MDAnalysis.analysis import align
import biotite.structure as struc
import biotite.structure.io as strucio
# from pensa import *
# from pensa.features.processing import *
from tqdm import tqdm

# -- Processing trajectories for density analysis
Expand Down
2 changes: 0 additions & 2 deletions pensa/preprocessing/download.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import MDAnalysis as mda
import numpy as np
import os
import requests

Expand Down
5 changes: 0 additions & 5 deletions pensa/preprocessing/selection.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
import MDAnalysis as mda
import pyemma
import numpy as np
import os
import requests



def range_to_string(a, b):
Expand Down
4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@
install_requires=[
'numpy',
'scipy>=1.2',
'mdtraj==1.9.9',
'mdshare',
'pyemma',
'deeptime',
'MDAnalysis',
'matplotlib',
'biotite',
Expand Down

0 comments on commit faed54f

Please sign in to comment.