From b73c96eecf27424bf3a28d6198113f6d7bb93a11 Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Mon, 22 Feb 2021 13:31:29 +0100
Subject: [PATCH] refreeze with strict channel priority

make sure we don't get any packages from 'defaults'
---
 .../buildpacks/conda/environment.frozen.yml      | 14 +++++++-------
 .../conda/environment.py-2.7.frozen.yml          | 16 +++++++++-------
 .../conda/environment.py-3.6.frozen.yml          | 14 +++++++-------
 .../buildpacks/conda/environment.py-3.6.yml      |  2 +-
 .../conda/environment.py-3.7.frozen.yml          | 14 +++++++-------
 .../buildpacks/conda/environment.py-3.7.yml      |  2 +-
 .../conda/environment.py-3.8.frozen.yml          | 14 +++++++-------
 .../buildpacks/conda/environment.py-3.8.yml      |  2 +-
 .../conda/environment.py-3.9.frozen.yml          | 14 +++++++-------
 .../buildpacks/conda/environment.py-3.9.yml      |  2 +-
 10 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/repo2docker/buildpacks/conda/environment.frozen.yml b/repo2docker/buildpacks/conda/environment.frozen.yml
index 82aa231f..daca3f21 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.7.yml, DO NOT MANUALLY MODIFY
-# Frozen on 2021-02-22 10:03:32 UTC
+# Frozen on 2021-02-22 12:26:46 UTC
 name: r2d
 channels:
   - conda-forge
@@ -21,7 +21,7 @@ dependencies:
   - blinker=1.4=py_1
   - brotlipy=0.7.0=py37hb5d75c8_1001
   - c-ares=1.17.1=h36c2ea0_0
-  - ca-certificates=2021.1.19=h06a4308_0
+  - ca-certificates=2020.12.5=ha878542_0
   - certifi=2020.12.5=py37h89c1867_1
   - certipy=0.1.3=py_0
   - cffi=1.14.5=py37hc58025e_0
@@ -73,15 +73,15 @@ dependencies:
   - nbconvert=6.0.7=py37h89c1867_3
   - nbformat=5.1.2=pyhd8ed1ab_1
   - ncurses=6.2=h58526e2_4
-  - nest-asyncio=1.5.1=pyhd3eb1b0_0
+  - nest-asyncio=1.4.3=pyhd8ed1ab_0
   - notebook=6.2.0=py37h89c1867_0
   - nteract_on_jupyter=2.1.3=py_0
-  - oauthlib=3.1.0=py_0
+  - oauthlib=3.0.1=py_0
   - openssl=1.1.1j=h7f98852_0
   - packaging=20.9=pyh44b312d_0
   - pamela=1.0.0=py_0
   - pandoc=2.11.4=h7f98852_0
-  - pandocfilters=1.4.3=py37h06a4308_1
+  - pandocfilters=1.4.2=py_1
   - parso=0.8.1=pyhd8ed1ab_0
   - pexpect=4.8.0=py37hc8dfbb8_1
   - pickleshare=0.7.5=py37hc8dfbb8_1002
@@ -105,12 +105,12 @@ dependencies:
   - python_abi=3.7=1_cp37m
   - pytz=2021.1=pyhd8ed1ab_0
   - pyzmq=22.0.3=py37h499b945_0
-  - readline=8.1=h27cfd23_0
+  - readline=8.0=he28a2e2_2
   - requests=2.25.1=pyhd3deb0d_0
   - ruamel.yaml=0.16.12=py37h5e8e339_2
   - ruamel.yaml.clib=0.2.2=py37h5e8e339_2
   - send2trash=1.5.0=py_0
-  - setuptools=52.0.0=py37h06a4308_0
+  - setuptools=49.6.0=py37h89c1867_3
   - six=1.15.0=pyh9f0ad1d_0
   - sniffio=1.2.0=py37h89c1867_1
   - sqlalchemy=1.3.23=py37h5e8e339_0
diff --git a/repo2docker/buildpacks/conda/environment.py-2.7.frozen.yml b/repo2docker/buildpacks/conda/environment.py-2.7.frozen.yml
index 79156064..816f8c87 100644
--- a/repo2docker/buildpacks/conda/environment.py-2.7.frozen.yml
+++ b/repo2docker/buildpacks/conda/environment.py-2.7.frozen.yml
@@ -1,5 +1,5 @@
 # AUTO GENERATED FROM environment.py-2.7.yml, DO NOT MANUALLY MODIFY
-# Frozen on 2021-02-22 10:00:47 UTC
+# Frozen on 2021-02-22 12:21:22 UTC
 name: r2d
 channels:
   - conda-forge
@@ -11,9 +11,9 @@ dependencies:
   - backports=1.0=py27_1
   - backports.shutil_get_terminal_size=1.0.0=py27_1
   - backports_abc=0.5=py27_0
-  - ca-certificates=2021.1.19=h06a4308_0
-  - certifi=2020.6.20=pyhd3eb1b0_3
-  - configparser=4.0.2=py27_0
+  - ca-certificates=2020.12.5=ha878542_0
+  - certifi=2019.11.28=py27h8c360ce_1
+  - configparser=3.7.3=py27h8c360ce_2
   - decorator=4.4.2=py_0
   - entrypoints=0.3=py27h8c360ce_1001
   - enum34=1.1.10=py27h8c360ce_1
@@ -23,12 +23,14 @@ dependencies:
   - ipython_genutils=0.2.0=py27_0
   - jupyter_client=5.3.4=py27_1
   - jupyter_core=4.6.3=py27h8c360ce_1
-  - libffi=3.3=h58526e2_2
+  - ld_impl_linux-64=2.35.1=hea4e1c9_2
+  - libffi=3.2.1=he1b5a44_1007
   - libgcc-ng=9.3.0=h2828fa1_18
   - libgomp=9.3.0=h2828fa1_18
   - libsodium=1.0.17=h516909a_0
   - libstdcxx-ng=9.3.0=h6de172a_18
   - ncurses=6.2=h58526e2_4
+  - openssl=1.1.1j=h7f98852_0
   - pathlib2=2.3.5=py27h8c360ce_1
   - pexpect=4.8.0=py27h8c360ce_1
   - pickleshare=0.7.5=py27h8c360ce_1001
@@ -36,11 +38,11 @@ dependencies:
   - prompt_toolkit=1.0.15=py27_0
   - ptyprocess=0.7.0=pyhd3deb0d_0
   - pygments=2.5.2=py_0
-  - python=2.7.18=h15b4118_1
+  - python=2.7.15=h5a48372_1011_cpython
   - python-dateutil=2.8.1=py_0
   - python_abi=2.7=1_cp27mu
   - pyzmq=19.0.0=py27h76efe43_1
-  - readline=8.1=h27cfd23_0
+  - readline=8.0=he28a2e2_2
   - scandir=1.10.0=py27hdf8410d_1
   - setuptools=44.0.0=py27_0
   - simplegeneric=0.8.1=py27_0
diff --git a/repo2docker/buildpacks/conda/environment.py-3.6.frozen.yml b/repo2docker/buildpacks/conda/environment.py-3.6.frozen.yml
index 7b4aebd3..58a285d9 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 2021-02-22 10:01:26 UTC
+# Frozen on 2021-02-22 12:25:15 UTC
 name: r2d
 channels:
   - conda-forge
@@ -21,7 +21,7 @@ dependencies:
   - blinker=1.4=py_1
   - brotlipy=0.7.0=py36he6145b8_1001
   - c-ares=1.17.1=h36c2ea0_0
-  - ca-certificates=2021.1.19=h06a4308_0
+  - ca-certificates=2020.12.5=ha878542_0
   - certifi=2020.12.5=py36h5fab9bb_1
   - certipy=0.1.3=py_0
   - cffi=1.14.5=py36hc120d54_0
@@ -76,15 +76,15 @@ dependencies:
   - nbconvert=6.0.7=py36h5fab9bb_3
   - nbformat=5.1.2=pyhd8ed1ab_1
   - ncurses=6.2=h58526e2_4
-  - nest-asyncio=1.5.1=pyhd3eb1b0_0
+  - nest-asyncio=1.4.3=pyhd8ed1ab_0
   - notebook=6.2.0=py36h5fab9bb_0
   - nteract_on_jupyter=2.1.3=py_0
-  - oauthlib=3.1.0=py_0
+  - oauthlib=3.0.1=py_0
   - openssl=1.1.1j=h7f98852_0
   - packaging=20.9=pyh44b312d_0
   - pamela=1.0.0=py_0
   - pandoc=2.11.4=h7f98852_0
-  - pandocfilters=1.4.3=py36h06a4308_1
+  - pandocfilters=1.4.2=py36_0
   - parso=0.7.1=pyh9f0ad1d_0
   - pexpect=4.8.0=py36h9f0ad1d_1
   - pickleshare=0.7.5=py36h9f0ad1d_1002
@@ -108,12 +108,12 @@ dependencies:
   - python_abi=3.6=1_cp36m
   - pytz=2021.1=pyhd8ed1ab_0
   - pyzmq=22.0.3=py36h81c33ee_0
-  - readline=8.1=h27cfd23_0
+  - readline=8.0=he28a2e2_2
   - requests=2.25.1=pyhd3deb0d_0
   - ruamel.yaml=0.16.12=py36h8f6f2f9_2
   - ruamel.yaml.clib=0.2.2=py36h8f6f2f9_2
   - send2trash=1.5.0=py_0
-  - setuptools=52.0.0=py36h06a4308_0
+  - setuptools=49.6.0=py36h5fab9bb_3
   - six=1.15.0=pyh9f0ad1d_0
   - sniffio=1.2.0=py36h5fab9bb_1
   - sqlalchemy=1.3.23=py36h8f6f2f9_0
diff --git a/repo2docker/buildpacks/conda/environment.py-3.6.yml b/repo2docker/buildpacks/conda/environment.py-3.6.yml
index 87c3a2aa..acae085b 100644
--- a/repo2docker/buildpacks/conda/environment.py-3.6.yml
+++ b/repo2docker/buildpacks/conda/environment.py-3.6.yml
@@ -1,5 +1,5 @@
 # AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
-# Generated on 2021-02-22 10:01:26 UTC
+# Generated on 2021-02-22 12:25:15 UTC
 dependencies:
 - python=3.6.*
 - ipywidgets==7.6.3
diff --git a/repo2docker/buildpacks/conda/environment.py-3.7.frozen.yml b/repo2docker/buildpacks/conda/environment.py-3.7.frozen.yml
index 82aa231f..daca3f21 100644
--- a/repo2docker/buildpacks/conda/environment.py-3.7.frozen.yml
+++ b/repo2docker/buildpacks/conda/environment.py-3.7.frozen.yml
@@ -1,5 +1,5 @@
 # AUTO GENERATED FROM environment.py-3.7.yml, DO NOT MANUALLY MODIFY
-# Frozen on 2021-02-22 10:03:32 UTC
+# Frozen on 2021-02-22 12:26:46 UTC
 name: r2d
 channels:
   - conda-forge
@@ -21,7 +21,7 @@ dependencies:
   - blinker=1.4=py_1
   - brotlipy=0.7.0=py37hb5d75c8_1001
   - c-ares=1.17.1=h36c2ea0_0
-  - ca-certificates=2021.1.19=h06a4308_0
+  - ca-certificates=2020.12.5=ha878542_0
   - certifi=2020.12.5=py37h89c1867_1
   - certipy=0.1.3=py_0
   - cffi=1.14.5=py37hc58025e_0
@@ -73,15 +73,15 @@ dependencies:
   - nbconvert=6.0.7=py37h89c1867_3
   - nbformat=5.1.2=pyhd8ed1ab_1
   - ncurses=6.2=h58526e2_4
-  - nest-asyncio=1.5.1=pyhd3eb1b0_0
+  - nest-asyncio=1.4.3=pyhd8ed1ab_0
   - notebook=6.2.0=py37h89c1867_0
   - nteract_on_jupyter=2.1.3=py_0
-  - oauthlib=3.1.0=py_0
+  - oauthlib=3.0.1=py_0
   - openssl=1.1.1j=h7f98852_0
   - packaging=20.9=pyh44b312d_0
   - pamela=1.0.0=py_0
   - pandoc=2.11.4=h7f98852_0
-  - pandocfilters=1.4.3=py37h06a4308_1
+  - pandocfilters=1.4.2=py_1
   - parso=0.8.1=pyhd8ed1ab_0
   - pexpect=4.8.0=py37hc8dfbb8_1
   - pickleshare=0.7.5=py37hc8dfbb8_1002
@@ -105,12 +105,12 @@ dependencies:
   - python_abi=3.7=1_cp37m
   - pytz=2021.1=pyhd8ed1ab_0
   - pyzmq=22.0.3=py37h499b945_0
-  - readline=8.1=h27cfd23_0
+  - readline=8.0=he28a2e2_2
   - requests=2.25.1=pyhd3deb0d_0
   - ruamel.yaml=0.16.12=py37h5e8e339_2
   - ruamel.yaml.clib=0.2.2=py37h5e8e339_2
   - send2trash=1.5.0=py_0
-  - setuptools=52.0.0=py37h06a4308_0
+  - setuptools=49.6.0=py37h89c1867_3
   - six=1.15.0=pyh9f0ad1d_0
   - sniffio=1.2.0=py37h89c1867_1
   - sqlalchemy=1.3.23=py37h5e8e339_0
diff --git a/repo2docker/buildpacks/conda/environment.py-3.7.yml b/repo2docker/buildpacks/conda/environment.py-3.7.yml
index 09454971..de07e850 100644
--- a/repo2docker/buildpacks/conda/environment.py-3.7.yml
+++ b/repo2docker/buildpacks/conda/environment.py-3.7.yml
@@ -1,5 +1,5 @@
 # AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
-# Generated on 2021-02-22 10:03:32 UTC
+# Generated on 2021-02-22 12:26:46 UTC
 dependencies:
 - python=3.7.*
 - ipywidgets==7.6.3
diff --git a/repo2docker/buildpacks/conda/environment.py-3.8.frozen.yml b/repo2docker/buildpacks/conda/environment.py-3.8.frozen.yml
index 54c832c0..9457d0ed 100644
--- a/repo2docker/buildpacks/conda/environment.py-3.8.frozen.yml
+++ b/repo2docker/buildpacks/conda/environment.py-3.8.frozen.yml
@@ -1,5 +1,5 @@
 # AUTO GENERATED FROM environment.py-3.8.yml, DO NOT MANUALLY MODIFY
-# Frozen on 2021-02-22 10:05:25 UTC
+# Frozen on 2021-02-22 12:22:38 UTC
 name: r2d
 channels:
   - conda-forge
@@ -21,7 +21,7 @@ dependencies:
   - blinker=1.4=py_1
   - brotlipy=0.7.0=py38h497a2fe_1001
   - c-ares=1.17.1=h36c2ea0_0
-  - ca-certificates=2021.1.19=h06a4308_0
+  - ca-certificates=2020.12.5=ha878542_0
   - certifi=2020.12.5=py38h578d9bd_1
   - certipy=0.1.3=py_0
   - cffi=1.14.5=py38ha65f79e_0
@@ -73,15 +73,15 @@ dependencies:
   - nbconvert=6.0.7=py38h578d9bd_3
   - nbformat=5.1.2=pyhd8ed1ab_1
   - ncurses=6.2=h58526e2_4
-  - nest-asyncio=1.5.1=pyhd3eb1b0_0
+  - nest-asyncio=1.4.3=pyhd8ed1ab_0
   - notebook=6.2.0=py38h578d9bd_0
   - nteract_on_jupyter=2.1.3=py_0
-  - oauthlib=3.1.0=py_0
+  - oauthlib=3.0.1=py_0
   - openssl=1.1.1j=h7f98852_0
   - packaging=20.9=pyh44b312d_0
   - pamela=1.0.0=py_0
   - pandoc=2.11.4=h7f98852_0
-  - pandocfilters=1.4.3=py38h06a4308_1
+  - pandocfilters=1.4.2=py_1
   - parso=0.8.1=pyhd8ed1ab_0
   - pexpect=4.8.0=py38h32f6830_1
   - pickleshare=0.7.5=py38h32f6830_1002
@@ -105,12 +105,12 @@ dependencies:
   - python_abi=3.8=1_cp38
   - pytz=2021.1=pyhd8ed1ab_0
   - pyzmq=22.0.3=py38h3d7ac18_0
-  - readline=8.1=h27cfd23_0
+  - readline=8.0=he28a2e2_2
   - requests=2.25.1=pyhd3deb0d_0
   - ruamel.yaml=0.16.12=py38h497a2fe_2
   - ruamel.yaml.clib=0.2.2=py38h497a2fe_2
   - send2trash=1.5.0=py_0
-  - setuptools=52.0.0=py38h06a4308_0
+  - setuptools=49.6.0=py38h578d9bd_3
   - six=1.15.0=pyh9f0ad1d_0
   - sniffio=1.2.0=py38h578d9bd_1
   - sqlalchemy=1.3.23=py38h497a2fe_0
diff --git a/repo2docker/buildpacks/conda/environment.py-3.8.yml b/repo2docker/buildpacks/conda/environment.py-3.8.yml
index e24f81eb..c7e8d084 100644
--- a/repo2docker/buildpacks/conda/environment.py-3.8.yml
+++ b/repo2docker/buildpacks/conda/environment.py-3.8.yml
@@ -1,5 +1,5 @@
 # AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
-# Generated on 2021-02-22 10:05:25 UTC
+# Generated on 2021-02-22 12:22:38 UTC
 dependencies:
 - python=3.8.*
 - ipywidgets==7.6.3
diff --git a/repo2docker/buildpacks/conda/environment.py-3.9.frozen.yml b/repo2docker/buildpacks/conda/environment.py-3.9.frozen.yml
index ec10043e..0d7513c7 100644
--- a/repo2docker/buildpacks/conda/environment.py-3.9.frozen.yml
+++ b/repo2docker/buildpacks/conda/environment.py-3.9.frozen.yml
@@ -1,5 +1,5 @@
 # AUTO GENERATED FROM environment.py-3.9.yml, DO NOT MANUALLY MODIFY
-# Frozen on 2021-02-22 10:07:07 UTC
+# Frozen on 2021-02-22 12:28:32 UTC
 name: r2d
 channels:
   - conda-forge
@@ -21,7 +21,7 @@ dependencies:
   - blinker=1.4=py_1
   - brotlipy=0.7.0=py39h3811e60_1001
   - c-ares=1.17.1=h36c2ea0_0
-  - ca-certificates=2021.1.19=h06a4308_0
+  - ca-certificates=2020.12.5=ha878542_0
   - certifi=2020.12.5=py39hf3d152e_1
   - certipy=0.1.3=py_0
   - cffi=1.14.5=py39he32792d_0
@@ -73,15 +73,15 @@ dependencies:
   - nbconvert=6.0.7=py39hf3d152e_3
   - nbformat=5.1.2=pyhd8ed1ab_1
   - ncurses=6.2=h58526e2_4
-  - nest-asyncio=1.5.1=pyhd3eb1b0_0
+  - nest-asyncio=1.4.3=pyhd8ed1ab_0
   - notebook=6.2.0=py39hf3d152e_0
   - nteract_on_jupyter=2.1.3=py_0
-  - oauthlib=3.1.0=py_0
+  - oauthlib=3.0.1=py_0
   - openssl=1.1.1j=h7f98852_0
   - packaging=20.9=pyh44b312d_0
   - pamela=1.0.0=py_0
   - pandoc=2.11.4=h7f98852_0
-  - pandocfilters=1.4.3=py39h06a4308_1
+  - pandocfilters=1.4.2=py_1
   - parso=0.8.1=pyhd8ed1ab_0
   - pexpect=4.8.0=pyh9f0ad1d_2
   - pickleshare=0.7.5=py39hde42818_1002
@@ -105,12 +105,12 @@ dependencies:
   - python_abi=3.9=1_cp39
   - pytz=2021.1=pyhd8ed1ab_0
   - pyzmq=22.0.3=py39hea8fd45_0
-  - readline=8.1=h27cfd23_0
+  - readline=8.0=he28a2e2_2
   - requests=2.25.1=pyhd3deb0d_0
   - ruamel.yaml=0.16.12=py39h3811e60_2
   - ruamel.yaml.clib=0.2.2=py39h3811e60_2
   - send2trash=1.5.0=py_0
-  - setuptools=52.0.0=py39h06a4308_0
+  - setuptools=49.6.0=py39hf3d152e_3
   - six=1.15.0=pyh9f0ad1d_0
   - sniffio=1.2.0=py39hf3d152e_1
   - sqlalchemy=1.3.23=py39h3811e60_0
diff --git a/repo2docker/buildpacks/conda/environment.py-3.9.yml b/repo2docker/buildpacks/conda/environment.py-3.9.yml
index f9ac01ed..94144d4d 100644
--- a/repo2docker/buildpacks/conda/environment.py-3.9.yml
+++ b/repo2docker/buildpacks/conda/environment.py-3.9.yml
@@ -1,5 +1,5 @@
 # AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
-# Generated on 2021-02-22 10:07:07 UTC
+# Generated on 2021-02-22 12:28:32 UTC
 dependencies:
 - python=3.9.*
 - ipywidgets==7.6.3