Merge pull request #134 from choderalab/release/0.0.1a5

Release 0.0.1a5
choderalab · Feb 26, 2019 · f20835c · f20835c
2 parents ee81802 + 8c5cf45
commit f20835c
Show file tree

Hide file tree

Showing 118 changed files with 162,611 additions and 2,585 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,7 @@
+repos:
+-   repo: https://github.com/ambv/black
+    rev: stable
+    hooks:
+    - id: black
+      language_version: python3.6
+      args: ["./protons"]
diff --git a/.travis.yml b/.travis.yml
@@ -30,7 +30,7 @@ script:
 
 env:
   matrix:
-    - python=3.5 CONDA_PY=35
+    - python=3.7 CONDA_PY=37
     - python=3.6 CONDA_PY=36
 
   global:

diff --git a/devtools/conda-recipe/build.sh b/devtools/conda-recipe/build.sh
diff --git a/devtools/conda-recipe/meta.yaml b/devtools/conda-recipe/meta.yaml
@@ -23,7 +23,7 @@ requirements:
     - hdf4 >4.2.11 # Pinned because of issue with netcdf4
     - joblib
     - lxml
-    - parmed <=2.7.3
+    - parmed <=2.7.3 # Newer versions break parameter generation
     - pytest
     - pytest-runner
     - pymbar
@@ -56,6 +56,7 @@ requirements:
     - saltswap >=0.5.2 # for counterion coupling
     - beautifulsoup4 # for deserialization of html tables
     - networkx # matching protonation state structures
+    - tqdm # progress bar in scripts
 
 test:
   requires:

diff --git a/devtools/travis-ci/after_success.sh b/devtools/travis-ci/after_success.sh
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,7 @@ script: @@
     env:
       matrix:
-        - python=3.5 CONDA_PY=35
+        - python=3.7 CONDA_PY=37
         - python=3.6 CONDA_PY=36
       global:
@@ Expand Down @@