From 30354f4c8cf69f4500703f58e6fa66f33e9ecb4f Mon Sep 17 00:00:00 2001
From: Casper da Costa-Luis <casper.dcl@physics.org>
Date: Mon, 6 Jan 2020 14:10:25 +0530
Subject: [PATCH 1/3] Snap classic approval!

- approval: https://forum.snapcraft.io/t/classic-confinement-request-for-dvc/14124
- partially reverts commit a0ac129d5fbba4b491033d4a397a2ad02dccccfb.
---
 .travis.yml |  8 ++++++++
 README.rst  | 11 +++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 65c71f665b..bdd377a5f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -94,6 +94,14 @@ jobs:
     - sudo snapcraft --use-lxd
     after_failure:
     - sudo journalctl -u snapd
+    #uncomment after classic approval
+    #<>
+    #stage: deploy
+    #deploy:
+    #- provider: snap
+    #  snap: dvc_*.snap
+    #  channel: ${SOURCE_TAG:+stable}${SOURCE_TAG:-edge}
+    #  skip_cleanup: true
   # deploy jobs
   - name: "Pypi pkgs"
     if: tag is present
diff --git a/README.rst b/README.rst
index 7cf724923b..5caa9d644a 100644
--- a/README.rst
+++ b/README.rst
@@ -153,17 +153,12 @@ Currently, this includes support for Python versions 2.7, 3.6 and 3.7.
 Snap (Snapcraft)
 ----------------
 
-Download the latest ``dvc_*.snap`` from the
-GitHub `releases page <https://github.com/iterative/dvc/releases>`_.
-
 .. code-block:: bash
 
-   snap install dvc_*.snap --dangerous --classic
+   snap install dvc --classic
 
-Once ``dvc`` is released on the snap store
-(`pending request <https://forum.snapcraft.io/t/classic-confinement-request-for-dvc/14124>`_)
-there will be no need to download ``dvc_*.snap`` or use ``--dangerous``
-(``snap install dvc --classic`` would suffice).
+This corresponds to the latest tagged release.
+Add ``--edge`` for the latest ``master`` version.
 
 Package
 -------

From 55f9a54bff1fd293b1e248dace3104154efecede Mon Sep 17 00:00:00 2001
From: Casper da Costa-Luis <casper.dcl@physics.org>
Date: Mon, 6 Jan 2020 14:32:39 +0530
Subject: [PATCH 2/3] integrate snap deploy

---
 .travis.yml | 53 +++++++++++++++++++++++++----------------------------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bdd377a5f4..a1b9b56f22 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -75,33 +75,6 @@ jobs:
     language: python
     python: 3.7
     script: ./scripts/build_package.sh
-  - name: Snapcraft snap
-    addons:
-     snaps:
-     - name: snapcraft
-       channel: stable
-       confinement: classic
-     - name: lxd
-       channel: stable
-    env:
-    - SNAPCRAFT_IMAGE_INFO: '{"build_url": "$TRAVIS_BUILD_URL"}'
-    before_install:
-    - sudo /snap/bin/lxd.migrate -yes
-    - sudo /snap/bin/lxd waitready
-    - sudo /snap/bin/lxd init --auto
-    install:
-    script:
-    - sudo snapcraft --use-lxd
-    after_failure:
-    - sudo journalctl -u snapd
-    #uncomment after classic approval
-    #<>
-    #stage: deploy
-    #deploy:
-    #- provider: snap
-    #  snap: dvc_*.snap
-    #  channel: ${SOURCE_TAG:+stable}${SOURCE_TAG:-edge}
-    #  skip_cleanup: true
   # deploy jobs
   - name: "Pypi pkgs"
     if: tag is present
@@ -124,6 +97,31 @@ jobs:
       on:
         tags: true
         repo: iterative/dvc
+  - name: Snapcraft snap
+    addons:
+     snaps:
+     - name: snapcraft
+       channel: stable
+       confinement: classic
+     - name: lxd
+       channel: stable
+    env:
+    - SNAPCRAFT_IMAGE_INFO: '{"build_url": "$TRAVIS_BUILD_URL"}'
+    before_install:
+    - sudo /snap/bin/lxd.migrate -yes
+    - sudo /snap/bin/lxd waitready
+    - sudo /snap/bin/lxd init --auto
+    install:
+    script:
+    - sudo snapcraft --use-lxd
+    after_failure:
+    - sudo journalctl -u snapd
+    stage: deploy
+    deploy:
+    - provider: snap
+      snap: dvc_*.snap
+      channel: ${SOURCE_TAG:+stable}${SOURCE_TAG:-edge}
+      skip_cleanup: true
 
 before_install:
   - bash ./scripts/ci/before_install.sh
@@ -144,7 +142,6 @@ deploy:
       - dvc*.deb
       - dvc*.pkg
       - dvc*.exe
-      - dvc*.snap
     skip_cleanup: true
     on:
       tags: true

From be762e70c217700a7ad44a1affa16c42db3837a5 Mon Sep 17 00:00:00 2001
From: Casper da Costa-Luis <casper.dcl@physics.org>
Date: Mon, 6 Jan 2020 14:56:16 +0530
Subject: [PATCH 3/3] remove unneeded stage

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a1b9b56f22..51b72be6c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -116,7 +116,6 @@ jobs:
     - sudo snapcraft --use-lxd
     after_failure:
     - sudo journalctl -u snapd
-    stage: deploy
     deploy:
     - provider: snap
       snap: dvc_*.snap