Use PyTorch 1.3 for CI (#1467)

* Use PyTorch 1.3 for CI

* Try fixing TravisCI

* Revert rebase to master to old state

* Try pinning lastest anaconda that was working, there was a new package out yesterday that might have breaken up things

* Try removing conda update conda

.circleci/config.yml

@@ -20,7 +20,8 @@ commands:
             set -ex
             BRANCH=$(git rev-parse --abbrev-ref HEAD)
             if [[ "$BRANCH" != "master" ]]; then
-              git merge origin/master
+              git fetch --force origin ${CIRCLE_BRANCH}/merge:merged/${CIRCLE_BRANCH}
+              git checkout "merged/$CIRCLE_BRANCH"
             fi
 
 binary_common: &binary_common
@@ -31,9 +32,9 @@ binary_common: &binary_common
       type: string
       default: ""
     pytorch_version:
-      description: "PyTorch version to build against; by default, use a nightly"
+      description: "PyTorch version to build against; by default, use 1.3. Use empty string for nightly"
       type: string
-      default: ""
+      default: "1.3"
     # Don't edit these
     python_version:
       description: "Python version to build against (e.g., 3.7)"

.circleci/config.yml.in

@@ -20,7 +20,8 @@ commands:
             set -ex
             BRANCH=$(git rev-parse --abbrev-ref HEAD)
             if [[ "$BRANCH" != "master" ]]; then
-              git merge origin/master
+              git fetch --force origin ${CIRCLE_BRANCH}/merge:merged/${CIRCLE_BRANCH}
+              git checkout "merged/$CIRCLE_BRANCH"
             fi
 
 binary_common: &binary_common
@@ -31,9 +32,9 @@ binary_common: &binary_common
       type: string
       default: ""
     pytorch_version:
-      description: "PyTorch version to build against; by default, use a nightly"
+      description: "PyTorch version to build against; by default, use 1.3. Use empty string for nightly"
       type: string
-      default: ""
+      default: "1.3"
     # Don't edit these
     python_version:
       description: "Python version to build against (e.g., 3.7)"

.travis.yml

@@ -39,11 +39,10 @@ before_install:
   - export PATH="$HOME/miniconda/bin:$PATH"
   - hash -r
   - conda config --set always_yes yes --set changeps1 no
-  - conda update -q conda
   # Useful for debugging any issues with conda
   - conda info -a
 
-  - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION pytorch scipy -c pytorch-nightly
+  - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION pytorch scipy -c pytorch
   - source activate test-environment
   - |
     if [[ "$IMAGE_BACKEND" == "Pillow-SIMD" ]]; then