Merge branch 'master' of github.com:iterative/dvc

.travis.yml

@@ -60,6 +60,24 @@ matrix:
     env:
     - PYTHON_VER=3.5.0
     - PYTHON_CONFIGURE_OPTS="--enable-framework"
+  - if: type = cron OR tag is present
+    os: osx
+    osx_image: xcode10.1
+    language: ruby
+    rvm: 2.4.0
+    env:
+    - PYTHON_VER=2.7.10
+    - CPPFLAGS="-I/usr/local/opt/openssl/include $CPPFLAGS"
+    - LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
+    - PYTHON_CONFIGURE_OPTS="--enable-framework"
+  - if: type = cron OR tag is present
+    os: osx
+    osx_image: xcode10.1
+    language: ruby
+    rvm: 2.4.0
+    env:
+    - PYTHON_VER=3.5.0
+    - PYTHON_CONFIGURE_OPTS="--enable-framework"
 before_install:
   - bash ./scripts/ci/before_install.sh
   - source env.sh
@@ -69,7 +87,7 @@ install:
 script:
   - bash ./scripts/ci/script.sh
 deploy:
-  condition: "[[ $(python -c 'import sys; print(sys.version_info[0])') == '2' ]]"
+  condition: "[[ $(./scripts/ci/deploy_condition.sh) == 'true' ]]"
   provider: releases
   api_key:
     secure: nyo17gF4Xl6DFL/KVkMewC805Cv+eK99L7SiYCU+WUAYDIzzFL3YJm7fm8bznPeor7DmpO7uSLSveMnJETBtdurW6JWhCTUss4yD66yFzpk6Z5cvHf/1UA5pdMHkkMM54fRaTRt6L2Yal7RPwGEQTBECLXW1Xmf78Y6+0l8lTvXQ9jXOQSRO/63VDKI5Zww2+XytVicUFlr0hLMGKUuaCjjXcQlAPzBgQz3/5Iz6EtzeTf2o+gTPjocbRbSFPikfiBXUn8XlJ8jBj7i114XJRJffw59KxYGDzxp+enfLBULGNoW0Np2hZqkKkPUIdB08C8XVbRXlFYX8cEYBczjqhv8A05p5F5CnltnqQ0KazcoUP2awPVqn68dWNRF+kqrnMBus8euYKIZ4dy/6bVEKJRa84ESJXZVDcwXTAXRqyovSxOlXqg9ZgAImMKBfKn/fpDX2xIvQPaXcnJxKbmcePfdbC1d0HYJ5jkbNaxKE/T15VvhzIho7mJ2WAv1r8QouQUuzqtpzIGbRn/KXHRUzCtyP0k4+eMKMLFOPzg848WsDarP3v8VYiSy4nFY7ZP7DRd3KttvW5bgVbSeO4jPmTgS6TnnpRwual9BJXSG7bjbfpIMii3bNZ7jWL4zpKT9Jfm8w9RGKLcX9HqkZ3+y60+LtYdhEfBvqsIlWQoIJBXg=

dvc/__init__.py

@@ -10,7 +10,7 @@
 import warnings
 
 
-VERSION_BASE = "0.28.0"
+VERSION_BASE = "0.28.1"
 __version__ = VERSION_BASE
 
 PACKAGEPATH = os.path.abspath(os.path.dirname(__file__))

dvc/remote/local.py

@@ -412,8 +412,8 @@ def _save_dir(self, path, md5):
 
             self.link(c, p)
 
-            self.state.update(p, md5)
-            self.state.update(c, md5)
+            self.state.update(p, m)
+            self.state.update(c, m)
 
             if bar:
                 progress.update_target(dir_relpath, processed, dir_size)

scripts/ci/deploy_condition.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+python_ver="$(python -c 'import sys; print(sys.version_info[0])')"
+
+if [[ $python_ver != "2" ]]; then
+    echo false
+    exit 0
+fi
+
+if [[ $TRAVIS_OS_NAME == "osx" && $TRAVIS_OSX_IMAGE != "xcode10.1" ]]; then
+    echo false
+    exit 0
+fi
+
+echo true