Fix nightly builds (#1374)

* Fix nightly builds

* Fix lint

* Disable video_reader tests on Travis

* Disable one more test that segfaults on Travis

* Fix typo in expression

.circleci/config.yml

@@ -18,8 +18,11 @@ commands:
           name: Checkout merge branch
           command: |
             set -ex
-            git fetch --force origin ${CIRCLE_BRANCH}/merge:merged/${CIRCLE_BRANCH}
-            git checkout "merged/$CIRCLE_BRANCH"
+            BRANCH=$(git rev-parse --abbrev-ref HEAD)
+            if [[ "$BRANCH" != "master" ]]; then
+              git fetch --force origin ${CIRCLE_BRANCH}/merge:merged/${CIRCLE_BRANCH}
+              git checkout "merged/$CIRCLE_BRANCH"
+            fi
 
 binary_common: &binary_common
   parameters:

.circleci/config.yml.in

@@ -18,8 +18,11 @@ commands:
           name: Checkout merge branch
           command: |
             set -ex
-            git fetch --force origin ${CIRCLE_BRANCH}/merge:merged/${CIRCLE_BRANCH}
-            git checkout "merged/$CIRCLE_BRANCH"
+            BRANCH=$(git rev-parse --abbrev-ref HEAD)
+            if [[ "$BRANCH" != "master" ]]; then
+              git fetch --force origin ${CIRCLE_BRANCH}/merge:merged/${CIRCLE_BRANCH}
+              git checkout "merged/$CIRCLE_BRANCH"
+            fi
 
 binary_common: &binary_common
   parameters:

.travis.yml

@@ -76,7 +76,7 @@ install:
     cd -
 
 script:
-  - pytest --cov-config .coveragerc --cov torchvision --cov $TV_INSTALL_PATH test
+  - pytest --cov-config .coveragerc --cov torchvision --cov $TV_INSTALL_PATH -k 'not TestVideoReader and not TestVideoTransforms' test
   - pytest test/test_hub.py
 
 after_success:

test/test_transforms_video.py

@@ -11,7 +11,7 @@ except ImportError:
     stats = None
 
 
-class Tester(unittest.TestCase):
+class TestVideoTransforms(unittest.TestCase):
 
     def test_random_crop_video(self):
         numFrames = random.randint(4, 128)

torchvision/datasets/utils.py

@@ -229,7 +229,7 @@ def extract_archive(from_path, to_path=None, remove_finished=False):
         with tarfile.open(from_path, 'r:gz') as tar:
             tar.extractall(path=to_path)
     elif _is_tarxz(from_path) and PY3:
-        # .tar.xz archive only supported in Python 3.x  
+        # .tar.xz archive only supported in Python 3.x
         with tarfile.open(from_path, 'r:xz') as tar:
             tar.extractall(path=to_path)
     elif _is_gzip(from_path):