Skip to content

Commit b911af2

Browse files
committed
Modified setup.py and requirements.txt
1 parent 986172e commit b911af2

File tree

4 files changed

+15
-17
lines changed

4 files changed

+15
-17
lines changed

.circleci/config.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,13 @@ jobs:
5454
pip3 install "pybind11>=2.6" "setuptools>=42.0"
5555
python3 -m pip install --upgrade pip setuptools
5656
pip3 install --upgrade mpi4py
57-
#GROMACS_DIR=$HOME/pkgs
58-
#CMAKE_ARGS="-Dgmxapi_ROOT=$GROMACS_DIR -C $GROMACS_DIR/share/cmake/gromacs/gromacs-hints.cmake"
59-
# cd ../python_packaging/gmxapi
60-
# pip3 install .
6157
gmxapi_ROOT=$HOME/pkgs pip3 install gmxapi==0.4.0rc2
6258
python3 -c "import gmxapi; print(gmxapi.__version__)"
6359
6460
- run:
6561
name: Install the ensemble_md package
6662
command: |
67-
python3 -m pip install . --no-deps
68-
if [ -f requirements.txt ]; then pip3 install -r requirements.txt; fi
63+
python3 -m pip install .
6964
7065
- run:
7166
name: Run unit tests

ensemble_md/analysis/analyze_traj.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def extract_state_traj(dhdl):
4040

4141
def stitch_trajs(files, rep_trajs, shifts=None, dhdl=True, col_idx=-1):
4242
"""
43-
Stitches the state-space/CV-space trajectories for each configuration from DHDL files
43+
Stitches the state-space/CV-space trajectories for each configuration from DHDL files
4444
or PLUMED output files generated at different iterations.
4545
4646
Parameters

requirements.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +0,0 @@
1-
numpy
2-
natsort
3-
argparse
4-
pymbar==4.0.1
5-
alchemlyb==2.0.0
6-
pyyaml
7-
seaborn
8-
matplotlib
9-
pyemma

setup.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,19 @@
5555

5656
# Additional entries you may want simply uncomment the lines you want and fill in the data
5757
# url='http://www.my_package.com', # Website
58-
# install_requires=[], # Required packages, pulls from pip if needed; do not use for Conda deployment
58+
59+
# Required packages, pulls from pip if needed; do not use for Conda deployment
60+
install_requires=[
61+
'nummpy',
62+
'natsort',
63+
'argparse',
64+
'pymbar>=4.0.1',
65+
'alchemlyb>=2.0.0',
66+
'pyyaml',
67+
'seaborn',
68+
'matplotlib',
69+
'pyemma',
70+
],
5971
# platforms=['Linux',
6072
# 'Mac OS-X',
6173
# 'Unix',

0 commit comments

Comments
 (0)