From 9fa8f216681ef71e5f2b8f6f4d8722b9f7d3982c Mon Sep 17 00:00:00 2001
From: yuvipanda <yuvipanda@gmail.com>
Date: Wed, 10 Jan 2018 23:50:40 -0800
Subject: [PATCH] Refreeze conda environment

This broke out of the blue, causing CI to fail - see
https://github.com/jupyter/repo2docker/pull/180#issuecomment-356805582
---
 repo2docker/buildpacks/conda/environment.frozen.yml       | 8 ++++----
 .../buildpacks/conda/environment.py-2.7.frozen.yml        | 7 ++++---
 .../buildpacks/conda/environment.py-3.5.frozen.yml        | 8 ++++----
 .../buildpacks/conda/environment.py-3.6.frozen.yml        | 8 ++++----
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/repo2docker/buildpacks/conda/environment.frozen.yml b/repo2docker/buildpacks/conda/environment.frozen.yml
index 338909e5..834cb12e 100644
--- a/repo2docker/buildpacks/conda/environment.frozen.yml
+++ b/repo2docker/buildpacks/conda/environment.frozen.yml
@@ -1,5 +1,5 @@
 # AUTO GENERATED FROM environment.py-3.6.yml, DO NOT MANUALLY MODIFY
-# Frozen on 2018-01-08 13:27:23 UTC
+# Frozen on 2018-01-11 02:59:03 UTC
 name: r2d
 channels:
 - conda-forge
@@ -32,7 +32,7 @@ dependencies:
 - ncurses=5.9=10
 - notebook=5.2.2=py36_1
 - openssl=1.0.2n=0
-- pandoc=2.0.5=0
+- pandoc=2.1=0
 - pandocfilters=1.4.1=py36_0
 - pexpect=4.3.1=py36_0
 - pickleshare=0.7.4=py36_0
@@ -42,7 +42,7 @@ dependencies:
 - pygments=2.2.0=py36_0
 - python=3.6.4=0
 - python-dateutil=2.6.1=py36_0
-- pyzmq=16.0.2=py36_2
+- pyzmq=16.0.2=py36_3
 - readline=7.0=0
 - setuptools=38.4.0=py36_0
 - simplegeneric=0.8.1=py36_0
@@ -51,7 +51,7 @@ dependencies:
 - terminado=0.8.1=py36_0
 - testpath=0.3.1=py36_0
 - tk=8.6.7=0
-- tornado=4.5.2=py36_0
+- tornado=4.5.3=py36_0
 - traitlets=4.3.2=py36_0
 - wcwidth=0.1.7=py36_0
 - webencodings=0.5=py36_0
diff --git a/repo2docker/buildpacks/conda/environment.py-2.7.frozen.yml b/repo2docker/buildpacks/conda/environment.py-2.7.frozen.yml
index d04468db..e59f214a 100644
--- a/repo2docker/buildpacks/conda/environment.py-2.7.frozen.yml
+++ b/repo2docker/buildpacks/conda/environment.py-2.7.frozen.yml
@@ -1,9 +1,10 @@
 # AUTO GENERATED FROM environment.py-2.7.yml, DO NOT MANUALLY MODIFY
-# Frozen on 2018-01-08 13:23:37 UTC
+# Frozen on 2018-01-11 02:55:46 UTC
 name: r2d
 channels:
 - conda-forge
 - defaults
+- conda-forge/label/broken
 dependencies:
 - backports=1.0=py27_1
 - backports.shutil_get_terminal_size=1.0.0=py_3
@@ -29,7 +30,7 @@ dependencies:
 - pygments=2.2.0=py27_0
 - python=2.7.14=4
 - python-dateutil=2.6.1=py27_0
-- pyzmq=16.0.2=py27_2
+- pyzmq=16.0.2=py27_3
 - readline=7.0=0
 - scandir=1.6=py27_0
 - setuptools=38.4.0=py27_0
@@ -39,7 +40,7 @@ dependencies:
 - sqlite=3.20.1=2
 - ssl_match_hostname=3.5.0.1=py27_1
 - tk=8.6.7=0
-- tornado=4.5.2=py27_0
+- tornado=4.5.3=py27_0
 - traitlets=4.3.2=py27_0
 - wcwidth=0.1.7=py27_0
 - wheel=0.30.0=py27_2
diff --git a/repo2docker/buildpacks/conda/environment.py-3.5.frozen.yml b/repo2docker/buildpacks/conda/environment.py-3.5.frozen.yml
index 2476eeb5..e4c5e44b 100644
--- a/repo2docker/buildpacks/conda/environment.py-3.5.frozen.yml
+++ b/repo2docker/buildpacks/conda/environment.py-3.5.frozen.yml
@@ -1,5 +1,5 @@
 # AUTO GENERATED FROM environment.py-3.5.yml, DO NOT MANUALLY MODIFY
-# Frozen on 2018-01-08 13:25:03 UTC
+# Frozen on 2018-01-11 02:57:06 UTC
 name: r2d
 channels:
 - conda-forge
@@ -32,7 +32,7 @@ dependencies:
 - ncurses=5.9=10
 - notebook=5.2.2=py35_1
 - openssl=1.0.2n=0
-- pandoc=2.0.5=0
+- pandoc=2.1=0
 - pandocfilters=1.4.1=py35_0
 - pexpect=4.3.1=py35_0
 - pickleshare=0.7.4=py35_0
@@ -42,7 +42,7 @@ dependencies:
 - pygments=2.2.0=py35_0
 - python=3.5.4=3
 - python-dateutil=2.6.1=py35_0
-- pyzmq=16.0.2=py35_2
+- pyzmq=16.0.2=py35_3
 - readline=7.0=0
 - setuptools=38.4.0=py35_0
 - simplegeneric=0.8.1=py35_0
@@ -51,7 +51,7 @@ dependencies:
 - terminado=0.8.1=py35_0
 - testpath=0.3.1=py35_0
 - tk=8.6.7=0
-- tornado=4.5.2=py35_0
+- tornado=4.5.3=py35_0
 - traitlets=4.3.2=py35_0
 - wcwidth=0.1.7=py35_0
 - webencodings=0.5=py35_0
diff --git a/repo2docker/buildpacks/conda/environment.py-3.6.frozen.yml b/repo2docker/buildpacks/conda/environment.py-3.6.frozen.yml
index 338909e5..834cb12e 100644
--- a/repo2docker/buildpacks/conda/environment.py-3.6.frozen.yml
+++ b/repo2docker/buildpacks/conda/environment.py-3.6.frozen.yml
@@ -1,5 +1,5 @@
 # AUTO GENERATED FROM environment.py-3.6.yml, DO NOT MANUALLY MODIFY
-# Frozen on 2018-01-08 13:27:23 UTC
+# Frozen on 2018-01-11 02:59:03 UTC
 name: r2d
 channels:
 - conda-forge
@@ -32,7 +32,7 @@ dependencies:
 - ncurses=5.9=10
 - notebook=5.2.2=py36_1
 - openssl=1.0.2n=0
-- pandoc=2.0.5=0
+- pandoc=2.1=0
 - pandocfilters=1.4.1=py36_0
 - pexpect=4.3.1=py36_0
 - pickleshare=0.7.4=py36_0
@@ -42,7 +42,7 @@ dependencies:
 - pygments=2.2.0=py36_0
 - python=3.6.4=0
 - python-dateutil=2.6.1=py36_0
-- pyzmq=16.0.2=py36_2
+- pyzmq=16.0.2=py36_3
 - readline=7.0=0
 - setuptools=38.4.0=py36_0
 - simplegeneric=0.8.1=py36_0
@@ -51,7 +51,7 @@ dependencies:
 - terminado=0.8.1=py36_0
 - testpath=0.3.1=py36_0
 - tk=8.6.7=0
-- tornado=4.5.2=py36_0
+- tornado=4.5.3=py36_0
 - traitlets=4.3.2=py36_0
 - wcwidth=0.1.7=py36_0
 - webencodings=0.5=py36_0