Merge remote-tracking branch 'origin/master' into py37

Author: jchodera

.travis.yml

@@ -49,9 +49,9 @@ script:
   - chmod +x conda-build-all
   # Select upload destination
   - if [[ "${TRAVIS_PULL_REQUEST}" == "false" && "${TRAVIS_BRANCH}" == "master" ]]; then
-        export UPLOAD="--upload omnia --force";
+        export UPLOAD="--upload omnia";
     else
-        export UPLOAD="--force";
+        export UPLOAD="";
     fi
   - echo $UPLOAD
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then

openmm/meta.yaml

@@ -1,12 +1,15 @@
 package:
   name: openmm
-  version: 7.3.0
+  version: 7.4.0
 
 source:
   git_url: https://github.com/pandegroup/openmm.git
+  #git_tag : 10aba26
 
 extra:
-  upload: cuda{{ CUDA_SHORT_VERSION }}{{ ",dev" if CUDA_SHORT_VERSION == "92" else ""}}
+  #upload: betacuda{{ CUDA_SHORT_VERSION }}{{ ",beta" if CUDA_SHORT_VERSION == "92" else ""}}
+  upload: devcuda{{ CUDA_SHORT_VERSION }}{{ ",dev" if CUDA_SHORT_VERSION == "92" else ""}}
+  force_upload: True
 
 build:
   number: 0