diff --git a/.gitignore b/.gitignore index 166646d1..f075f26d 100644 --- a/.gitignore +++ b/.gitignore @@ -26,7 +26,6 @@ generated/ test_file_text.txt # Untracked artifacts from the conda script -repo2docker/buildpacks/conda/environment.py-3.5.yml repo2docker/buildpacks/conda/environment.py-3.6.yml \.vscode/ diff --git a/repo2docker/buildpacks/conda/environment.frozen.yml b/repo2docker/buildpacks/conda/environment.frozen.yml index b6333ff2..06b161f1 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-11-12 20:48:01 UTC +# Frozen on 2018-11-20 06:19:21 UTC name: r2d channels: - conda-forge @@ -35,7 +35,7 @@ dependencies: - nbconvert=5.4.0=1 - nbformat=4.4.0=py_1 - ncurses=6.1=hfc679d8_1 - - notebook=5.6.0=py36_1 + - notebook=5.7.2=py36_1000 - openssl=1.0.2p=h470a237_1 - pandoc=1.19.2=0 - pandocfilters=1.4.2=py_1 @@ -47,29 +47,29 @@ dependencies: - prompt_toolkit=2.0.7=py_0 - ptyprocess=0.6.0=py36_1000 - pygments=2.2.0=py_1 - - pyrsistent=0.14.5=py36h470a237_1 + - pyrsistent=0.14.6=py36h470a237_0 - python=3.6.6=h5001a0f_3 - python-dateutil=2.7.5=py_0 - pyzmq=17.1.2=py36hae99301_1 - readline=7.0=haf1bffa_1 - send2trash=1.5.0=py_0 - - setuptools=40.5.0=py36_0 + - setuptools=40.6.2=py36_0 - six=1.11.0=py36_1001 - sqlite=3.25.3=hb1c47c0_0 - terminado=0.8.1=py36_1001 - testpath=0.4.2=py36_1000 - - tk=8.6.8=ha92aebf_0 - - tornado=4.5.3=py36_0 + - tk=8.6.9=ha92aebf_0 + - tornado=5.1.1=py36h470a237_0 - traitlets=4.3.2=py36_1000 - wcwidth=0.1.7=py_1 - webencodings=0.5.1=py_1 - - wheel=0.32.2=py36_0 + - wheel=0.32.3=py36_0 - widgetsnbextension=3.2.1=py36_1 - xz=5.2.4=h470a237_1 - zeromq=4.2.5=hfc679d8_6 - zlib=1.2.11=h470a237_3 - pip: - - alembic==1.0.2 + - alembic==1.0.3 - async-generator==1.10 - chardet==3.0.4 - idna==2.7 diff --git a/repo2docker/buildpacks/conda/environment.py-2.7.frozen.yml b/repo2docker/buildpacks/conda/environment.py-2.7.frozen.yml index 73314907..7e016a80 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 2018-11-12 20:35:26 UTC +# Frozen on 2018-11-20 06:11:34 UTC name: r2d channels: - conda-forge @@ -13,6 +13,7 @@ dependencies: - certifi=2018.10.15=py27_1000 - decorator=4.3.0=py_0 - enum34=1.1.6=py27_1001 + - futures=3.2.0=py27_1000 - ipykernel=4.8.2=py27_0 - ipython=5.8.0=py27_0 - ipython_genutils=0.2.0=py_1 @@ -36,20 +37,17 @@ dependencies: - pyzmq=17.1.2=py27hae99301_1 - readline=7.0=haf1bffa_1 - scandir=1.9.0=py27h470a237_0 - - setuptools=40.5.0=py27_0 + - setuptools=40.6.2=py27_0 - simplegeneric=0.8.1=py_1 - singledispatch=3.4.0.3=py27_1000 - six=1.11.0=py27_1001 - sqlite=3.25.3=hb1c47c0_0 - - ssl_match_hostname=3.5.0.1=py27_1001 - - tk=8.6.8=ha92aebf_0 - - tornado=4.5.3=py27_0 + - tk=8.6.9=ha92aebf_0 + - tornado=5.1.1=py27h470a237_0 - traitlets=4.3.2=py27_1000 - wcwidth=0.1.7=py_1 - - wheel=0.32.2=py27_0 + - wheel=0.32.3=py27_0 - zeromq=4.2.5=hfc679d8_6 - zlib=1.2.11=h470a237_3 - - pip: - - backports.ssl-match-hostname==3.5.0.1 prefix: /opt/conda/envs/r2d diff --git a/repo2docker/buildpacks/conda/environment.py-2.7.yml b/repo2docker/buildpacks/conda/environment.py-2.7.yml index e6c5bd26..9e1ecfaa 100644 --- a/repo2docker/buildpacks/conda/environment.py-2.7.yml +++ b/repo2docker/buildpacks/conda/environment.py-2.7.yml @@ -1,4 +1,3 @@ dependencies: - python=2.7.* - ipykernel==4.8.2 -- tornado==4.5.3 diff --git a/repo2docker/buildpacks/conda/environment.py-3.5.frozen.yml b/repo2docker/buildpacks/conda/environment.py-3.5.frozen.yml index 6f774c78..44b53712 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-11-12 20:43:21 UTC +# Frozen on 2018-11-20 06:16:12 UTC name: r2d channels: - conda-forge @@ -35,7 +35,7 @@ dependencies: - nbconvert=5.4.0=1 - nbformat=4.4.0=py_1 - ncurses=6.1=hfc679d8_1 - - notebook=5.6.0=py35_1 + - notebook=5.7.0=py35_0 - openssl=1.0.2p=h470a237_1 - pandoc=1.19.2=0 - pandocfilters=1.4.2=py_1 @@ -58,8 +58,8 @@ dependencies: - sqlite=3.25.3=hb1c47c0_0 - terminado=0.8.1=py35_1 - testpath=0.3.1=py35_1 - - tk=8.6.8=ha92aebf_0 - - tornado=4.5.3=py35_0 + - tk=8.6.9=ha92aebf_0 + - tornado=5.1.1=py35h470a237_0 - traitlets=4.3.2=py35_0 - wcwidth=0.1.7=py_1 - webencodings=0.5.1=py_1 @@ -69,7 +69,7 @@ dependencies: - zeromq=4.2.5=hfc679d8_6 - zlib=1.2.11=h470a237_3 - pip: - - alembic==1.0.2 + - alembic==1.0.3 - async-generator==1.10 - chardet==3.0.4 - idna==2.7 diff --git a/repo2docker/buildpacks/conda/environment.py-3.5.yml b/repo2docker/buildpacks/conda/environment.py-3.5.yml new file mode 100644 index 00000000..9681cea7 --- /dev/null +++ b/repo2docker/buildpacks/conda/environment.py-3.5.yml @@ -0,0 +1,11 @@ +dependencies: +- python=3.5.* +- ipywidgets==7.2.1 +- jupyterlab==0.34.9 +- nbconvert==5.4.0 +- pip: + # conda-forge dropped python 3.5 support so we use the pip package + # for notebook + - notebook==5.7.2 + - nteract_on_jupyter==1.9.6 + - jupyterhub==0.9.4 diff --git a/repo2docker/buildpacks/conda/environment.py-3.6.frozen.yml b/repo2docker/buildpacks/conda/environment.py-3.6.frozen.yml index b6333ff2..06b161f1 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-11-12 20:48:01 UTC +# Frozen on 2018-11-20 06:19:21 UTC name: r2d channels: - conda-forge @@ -35,7 +35,7 @@ dependencies: - nbconvert=5.4.0=1 - nbformat=4.4.0=py_1 - ncurses=6.1=hfc679d8_1 - - notebook=5.6.0=py36_1 + - notebook=5.7.2=py36_1000 - openssl=1.0.2p=h470a237_1 - pandoc=1.19.2=0 - pandocfilters=1.4.2=py_1 @@ -47,29 +47,29 @@ dependencies: - prompt_toolkit=2.0.7=py_0 - ptyprocess=0.6.0=py36_1000 - pygments=2.2.0=py_1 - - pyrsistent=0.14.5=py36h470a237_1 + - pyrsistent=0.14.6=py36h470a237_0 - python=3.6.6=h5001a0f_3 - python-dateutil=2.7.5=py_0 - pyzmq=17.1.2=py36hae99301_1 - readline=7.0=haf1bffa_1 - send2trash=1.5.0=py_0 - - setuptools=40.5.0=py36_0 + - setuptools=40.6.2=py36_0 - six=1.11.0=py36_1001 - sqlite=3.25.3=hb1c47c0_0 - terminado=0.8.1=py36_1001 - testpath=0.4.2=py36_1000 - - tk=8.6.8=ha92aebf_0 - - tornado=4.5.3=py36_0 + - tk=8.6.9=ha92aebf_0 + - tornado=5.1.1=py36h470a237_0 - traitlets=4.3.2=py36_1000 - wcwidth=0.1.7=py_1 - webencodings=0.5.1=py_1 - - wheel=0.32.2=py36_0 + - wheel=0.32.3=py36_0 - widgetsnbextension=3.2.1=py36_1 - xz=5.2.4=h470a237_1 - zeromq=4.2.5=hfc679d8_6 - zlib=1.2.11=h470a237_3 - pip: - - alembic==1.0.2 + - alembic==1.0.3 - async-generator==1.10 - chardet==3.0.4 - idna==2.7 diff --git a/repo2docker/buildpacks/conda/environment.py-3.7.frozen.yml b/repo2docker/buildpacks/conda/environment.py-3.7.frozen.yml index 00d996c7..0365b7ad 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 2018-11-12 20:38:27 UTC +# Frozen on 2018-11-20 06:13:10 UTC name: r2d channels: - conda-forge @@ -34,7 +34,7 @@ dependencies: - nbconvert=5.4.0=1 - nbformat=4.4.0=py_1 - ncurses=6.1=hfc679d8_1 - - notebook=5.6.0=py37_1 + - notebook=5.7.2=py37_1000 - openssl=1.0.2p=h470a237_1 - pandoc=1.19.2=0 - pandocfilters=1.4.2=py_1 @@ -46,31 +46,31 @@ dependencies: - prompt_toolkit=2.0.7=py_0 - ptyprocess=0.6.0=py37_1000 - pygments=2.2.0=py_1 - - pyrsistent=0.14.5=py37h470a237_1 - - python=3.7.0=h5001a0f_6 + - pyrsistent=0.14.6=py37h470a237_0 + - python=3.7.1=h5001a0f_0 - python-dateutil=2.7.5=py_0 - pyzmq=17.1.2=py37hae99301_1 - readline=7.0=haf1bffa_1 - send2trash=1.5.0=py_0 - - setuptools=40.5.0=py37_0 + - setuptools=40.6.2=py37_0 - six=1.11.0=py37_1001 - sqlite=3.25.3=hb1c47c0_0 - terminado=0.8.1=py37_1001 - testpath=0.4.2=py37_1000 - - tk=8.6.8=ha92aebf_0 + - tk=8.6.9=ha92aebf_0 + - tornado=5.1.1=py37h470a237_0 - traitlets=4.3.2=py37_1000 - wcwidth=0.1.7=py_1 - webencodings=0.5.1=py_1 - - wheel=0.32.2=py37_0 + - wheel=0.32.3=py37_0 - widgetsnbextension=3.4.2=py37_1000 - xz=5.2.4=h470a237_1 - zeromq=4.2.5=hfc679d8_6 - zlib=1.2.11=h470a237_3 - ipywidgets=7.2.1=py37_0 - jupyterlab=0.34.9=py37_0 - - tornado=4.5.3=py37_0 - pip: - - alembic==1.0.2 + - alembic==1.0.3 - async-generator==1.10 - chardet==3.0.4 - idna==2.7 @@ -84,3 +84,4 @@ dependencies: - sqlalchemy==1.2.14 - urllib3==1.24.1 prefix: /opt/conda/envs/r2d + diff --git a/repo2docker/buildpacks/conda/environment.py-3.7.yml b/repo2docker/buildpacks/conda/environment.py-3.7.yml index f9245add..a957401c 100644 --- a/repo2docker/buildpacks/conda/environment.py-3.7.yml +++ b/repo2docker/buildpacks/conda/environment.py-3.7.yml @@ -1,12 +1,11 @@ # AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY -# Generated on 2018-11-12 20:38:27 UTC +# Generated on 2018-11-20 06:13:10 UTC dependencies: - python=3.7.* - ipywidgets==7.2.1 - jupyterlab==0.34.9 - nbconvert==5.4.0 -- tornado==4.5.3 -- notebook==5.6.0 +- notebook==5.7.2 - pip: - nteract_on_jupyter==1.9.6 - jupyterhub==0.9.4 diff --git a/repo2docker/buildpacks/conda/environment.yml b/repo2docker/buildpacks/conda/environment.yml index 71ee2a44..9af58159 100644 --- a/repo2docker/buildpacks/conda/environment.yml +++ b/repo2docker/buildpacks/conda/environment.yml @@ -3,8 +3,7 @@ dependencies: - ipywidgets==7.2.1 - jupyterlab==0.34.9 - nbconvert==5.4.0 - - tornado==4.5.3 - - notebook==5.6.0 + - notebook==5.7.2 - pip: - nteract_on_jupyter==1.9.6 - jupyterhub==0.9.4