kopia lustrzana https://github.com/jupyterhub/repo2docker
Bump python default version to 3.7
rodzic
9766c95455
commit
d8f8c781b2
|
@ -77,7 +77,7 @@ class CondaBuildPack(BaseImage):
|
||||||
|
|
||||||
major_pythons = {
|
major_pythons = {
|
||||||
'2': '2.7',
|
'2': '2.7',
|
||||||
'3': '3.6',
|
'3': '3.7',
|
||||||
}
|
}
|
||||||
|
|
||||||
def get_build_script_files(self):
|
def get_build_script_files(self):
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# AUTO GENERATED FROM environment.py-3.6.yml, DO NOT MANUALLY MODIFY
|
# AUTO GENERATED FROM environment.py-3.7.yml, DO NOT MANUALLY MODIFY
|
||||||
# Frozen on 2019-01-30 18:42:13 UTC
|
# Frozen on 2019-02-11 20:26:36 UTC
|
||||||
name: r2d
|
name: r2d
|
||||||
channels:
|
channels:
|
||||||
- conda-forge
|
- conda-forge
|
||||||
|
@ -9,65 +9,66 @@ dependencies:
|
||||||
- attrs=18.2.0=py_0
|
- attrs=18.2.0=py_0
|
||||||
- backcall=0.1.0=py_0
|
- backcall=0.1.0=py_0
|
||||||
- bleach=3.1.0=py_0
|
- bleach=3.1.0=py_0
|
||||||
|
- bzip2=1.0.6=h14c3975_1002
|
||||||
- ca-certificates=2018.11.29=ha4d7672_0
|
- ca-certificates=2018.11.29=ha4d7672_0
|
||||||
- certifi=2018.11.29=py36_1000
|
- certifi=2018.11.29=py37_1000
|
||||||
- decorator=4.3.2=py_0
|
- decorator=4.3.2=py_0
|
||||||
- defusedxml=0.5.0=py_1
|
- defusedxml=0.5.0=py_1
|
||||||
- entrypoints=0.3=py36_1000
|
- entrypoints=0.3=py37_1000
|
||||||
- gmp=6.1.2=hf484d3e_1000
|
- gmp=6.1.2=hf484d3e_1000
|
||||||
- ipykernel=5.1.0=py36h24bf2e0_1002
|
- ipykernel=5.1.0=py37h24bf2e0_1002
|
||||||
- ipython=7.2.0=py36h24bf2e0_1000
|
- ipython=7.2.0=py37h24bf2e0_1000
|
||||||
- ipython_genutils=0.2.0=py_1
|
- ipython_genutils=0.2.0=py_1
|
||||||
- ipywidgets=7.2.1=py36_1
|
- jedi=0.13.2=py37_1000
|
||||||
- jedi=0.13.2=py36_1000
|
|
||||||
- jinja2=2.10=py_1
|
- jinja2=2.10=py_1
|
||||||
- jsonschema=3.0.0a3=py36_1000
|
- jsonschema=3.0.0a3=py37_1000
|
||||||
- jupyter_client=5.2.4=py_1
|
- jupyter_client=5.2.4=py_1
|
||||||
- jupyter_core=4.4.0=py_0
|
- jupyter_core=4.4.0=py_0
|
||||||
- jupyterlab=0.34.9=py36_0
|
|
||||||
- jupyterlab_launcher=0.13.1=py_2
|
- jupyterlab_launcher=0.13.1=py_2
|
||||||
- libffi=3.2.1=hf484d3e_1005
|
- libffi=3.2.1=hf484d3e_1005
|
||||||
- libgcc-ng=7.3.0=hdf63c60_0
|
- libgcc-ng=7.3.0=hdf63c60_0
|
||||||
- libsodium=1.0.16=h14c3975_1001
|
- libsodium=1.0.16=h14c3975_1001
|
||||||
- libstdcxx-ng=7.3.0=hdf63c60_0
|
- libstdcxx-ng=7.3.0=hdf63c60_0
|
||||||
- markupsafe=1.1.0=py36h14c3975_1000
|
- markupsafe=1.1.0=py37h14c3975_1000
|
||||||
- mistune=0.8.4=py36h14c3975_1000
|
- mistune=0.8.4=py37h14c3975_1000
|
||||||
- nbconvert=5.4.0=1
|
- nbconvert=5.4.0=1
|
||||||
- nbformat=4.4.0=py_1
|
- nbformat=4.4.0=py_1
|
||||||
- ncurses=6.1=hf484d3e_1002
|
- ncurses=6.1=hf484d3e_1002
|
||||||
- notebook=5.7.4=py36_1000
|
- notebook=5.7.4=py37_1000
|
||||||
- openssl=1.0.2p=h14c3975_1002
|
- openssl=1.0.2p=h14c3975_1002
|
||||||
- pandoc=1.19.2=0
|
- pandoc=1.19.2=0
|
||||||
- pandocfilters=1.4.2=py_1
|
- pandocfilters=1.4.2=py_1
|
||||||
- parso=0.3.2=py_0
|
- parso=0.3.3=py_0
|
||||||
- pexpect=4.6.0=py36_1000
|
- pexpect=4.6.0=py37_1000
|
||||||
- pickleshare=0.7.5=py36_1000
|
- pickleshare=0.7.5=py37_1000
|
||||||
- pip=19.0.1=py36_0
|
- pip=19.0.2=py37_0
|
||||||
- prometheus_client=0.5.0=py_0
|
- prometheus_client=0.5.0=py_0
|
||||||
- prompt_toolkit=2.0.8=py_0
|
- prompt_toolkit=2.0.8=py_0
|
||||||
- ptyprocess=0.6.0=py36_1000
|
- ptyprocess=0.6.0=py37_1000
|
||||||
- pygments=2.3.1=py_0
|
- pygments=2.3.1=py_0
|
||||||
- pyrsistent=0.14.9=py36h14c3975_1000
|
- pyrsistent=0.14.10=py37h14c3975_0
|
||||||
- python=3.6.7=hd21baee_1001
|
- python=3.7.1=hd21baee_1000
|
||||||
- python-dateutil=2.7.5=py_0
|
- python-dateutil=2.8.0=py_0
|
||||||
- pyzmq=17.1.2=py36h6afc9c9_1001
|
- pyzmq=17.1.2=py37h6afc9c9_1001
|
||||||
- readline=7.0=hf8c457e_1001
|
- readline=7.0=hf8c457e_1001
|
||||||
- send2trash=1.5.0=py_0
|
- send2trash=1.5.0=py_0
|
||||||
- setuptools=40.7.1=py36_0
|
- setuptools=40.8.0=py37_0
|
||||||
- six=1.12.0=py36_1000
|
- six=1.12.0=py37_1000
|
||||||
- sqlite=3.26.0=h67949de_1000
|
- sqlite=3.26.0=h67949de_1000
|
||||||
- terminado=0.8.1=py36_1001
|
- terminado=0.8.1=py37_1001
|
||||||
- testpath=0.4.2=py36_1000
|
- testpath=0.4.2=py37_1000
|
||||||
- tk=8.6.9=h84994c4_1000
|
- tk=8.6.9=h84994c4_1000
|
||||||
- tornado=5.1.1=py36h14c3975_1000
|
- tornado=5.1.1=py37h14c3975_1000
|
||||||
- traitlets=4.3.2=py36_1000
|
- traitlets=4.3.2=py37_1000
|
||||||
- wcwidth=0.1.7=py_1
|
- wcwidth=0.1.7=py_1
|
||||||
- webencodings=0.5.1=py_1
|
- webencodings=0.5.1=py_1
|
||||||
- wheel=0.32.3=py36_0
|
- wheel=0.32.3=py37_0
|
||||||
- widgetsnbextension=3.2.1=py36_1
|
- widgetsnbextension=3.4.2=py37_1000
|
||||||
- xz=5.2.4=h14c3975_1001
|
- xz=5.2.4=h14c3975_1001
|
||||||
- zeromq=4.2.5=hf484d3e_1006
|
- zeromq=4.2.5=hf484d3e_1006
|
||||||
- zlib=1.2.11=h14c3975_1004
|
- zlib=1.2.11=h14c3975_1004
|
||||||
|
- ipywidgets=7.2.1=py37_0
|
||||||
|
- jupyterlab=0.34.9=py37_0
|
||||||
- pip:
|
- pip:
|
||||||
- alembic==1.0.7
|
- alembic==1.0.7
|
||||||
- async-generator==1.10
|
- async-generator==1.10
|
||||||
|
@ -77,7 +78,7 @@ dependencies:
|
||||||
- mako==1.0.7
|
- mako==1.0.7
|
||||||
- nteract-on-jupyter==2.0.0
|
- nteract-on-jupyter==2.0.0
|
||||||
- pamela==1.0.0
|
- pamela==1.0.0
|
||||||
- python-editor==1.0.3
|
- python-editor==1.0.4
|
||||||
- python-oauth2==1.1.0
|
- python-oauth2==1.1.0
|
||||||
- requests==2.21.0
|
- requests==2.21.0
|
||||||
- sqlalchemy==1.2.17
|
- sqlalchemy==1.2.17
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# AUTO GENERATED FROM environment.py-2.7.yml, DO NOT MANUALLY MODIFY
|
# AUTO GENERATED FROM environment.py-2.7.yml, DO NOT MANUALLY MODIFY
|
||||||
# Frozen on 2019-01-30 18:36:55 UTC
|
# Frozen on 2019-02-11 20:20:33 UTC
|
||||||
name: r2d
|
name: r2d
|
||||||
channels:
|
channels:
|
||||||
- conda-forge
|
- conda-forge
|
||||||
|
@ -28,16 +28,16 @@ dependencies:
|
||||||
- pathlib2=2.3.3=py27_1000
|
- pathlib2=2.3.3=py27_1000
|
||||||
- pexpect=4.6.0=py27_1000
|
- pexpect=4.6.0=py27_1000
|
||||||
- pickleshare=0.7.5=py27_1000
|
- pickleshare=0.7.5=py27_1000
|
||||||
- pip=19.0.1=py27_0
|
- pip=19.0.2=py27_0
|
||||||
- prompt_toolkit=1.0.15=py_1
|
- prompt_toolkit=1.0.15=py_1
|
||||||
- ptyprocess=0.6.0=py27_1000
|
- ptyprocess=0.6.0=py27_1000
|
||||||
- pygments=2.3.1=py_0
|
- pygments=2.3.1=py_0
|
||||||
- python=2.7.15=h938d71a_1006
|
- python=2.7.15=h938d71a_1006
|
||||||
- python-dateutil=2.7.5=py_0
|
- python-dateutil=2.8.0=py_0
|
||||||
- pyzmq=17.1.2=py27h6afc9c9_1001
|
- pyzmq=17.1.2=py27h6afc9c9_1001
|
||||||
- readline=7.0=hf8c457e_1001
|
- readline=7.0=hf8c457e_1001
|
||||||
- scandir=1.9.0=py27h14c3975_1000
|
- scandir=1.9.0=py27h14c3975_1000
|
||||||
- setuptools=40.7.1=py27_0
|
- setuptools=40.8.0=py27_0
|
||||||
- simplegeneric=0.8.1=py_1
|
- simplegeneric=0.8.1=py_1
|
||||||
- singledispatch=3.4.0.3=py27_1000
|
- singledispatch=3.4.0.3=py27_1000
|
||||||
- six=1.12.0=py27_1000
|
- six=1.12.0=py27_1000
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# AUTO GENERATED FROM environment.py-3.6.yml, DO NOT MANUALLY MODIFY
|
# AUTO GENERATED FROM environment.py-3.6.yml, DO NOT MANUALLY MODIFY
|
||||||
# Frozen on 2019-01-30 18:42:13 UTC
|
# Frozen on 2019-02-11 20:22:50 UTC
|
||||||
name: r2d
|
name: r2d
|
||||||
channels:
|
channels:
|
||||||
- conda-forge
|
- conda-forge
|
||||||
|
@ -39,21 +39,21 @@ dependencies:
|
||||||
- openssl=1.0.2p=h14c3975_1002
|
- openssl=1.0.2p=h14c3975_1002
|
||||||
- pandoc=1.19.2=0
|
- pandoc=1.19.2=0
|
||||||
- pandocfilters=1.4.2=py_1
|
- pandocfilters=1.4.2=py_1
|
||||||
- parso=0.3.2=py_0
|
- parso=0.3.3=py_0
|
||||||
- pexpect=4.6.0=py36_1000
|
- pexpect=4.6.0=py36_1000
|
||||||
- pickleshare=0.7.5=py36_1000
|
- pickleshare=0.7.5=py36_1000
|
||||||
- pip=19.0.1=py36_0
|
- pip=19.0.2=py36_0
|
||||||
- prometheus_client=0.5.0=py_0
|
- prometheus_client=0.5.0=py_0
|
||||||
- prompt_toolkit=2.0.8=py_0
|
- prompt_toolkit=2.0.8=py_0
|
||||||
- ptyprocess=0.6.0=py36_1000
|
- ptyprocess=0.6.0=py36_1000
|
||||||
- pygments=2.3.1=py_0
|
- pygments=2.3.1=py_0
|
||||||
- pyrsistent=0.14.9=py36h14c3975_1000
|
- pyrsistent=0.14.10=py36h14c3975_0
|
||||||
- python=3.6.7=hd21baee_1001
|
- python=3.6.7=hd21baee_1001
|
||||||
- python-dateutil=2.7.5=py_0
|
- python-dateutil=2.8.0=py_0
|
||||||
- pyzmq=17.1.2=py36h6afc9c9_1001
|
- pyzmq=17.1.2=py36h6afc9c9_1001
|
||||||
- readline=7.0=hf8c457e_1001
|
- readline=7.0=hf8c457e_1001
|
||||||
- send2trash=1.5.0=py_0
|
- send2trash=1.5.0=py_0
|
||||||
- setuptools=40.7.1=py36_0
|
- setuptools=40.8.0=py36_0
|
||||||
- six=1.12.0=py36_1000
|
- six=1.12.0=py36_1000
|
||||||
- sqlite=3.26.0=h67949de_1000
|
- sqlite=3.26.0=h67949de_1000
|
||||||
- terminado=0.8.1=py36_1001
|
- terminado=0.8.1=py36_1001
|
||||||
|
@ -77,7 +77,7 @@ dependencies:
|
||||||
- mako==1.0.7
|
- mako==1.0.7
|
||||||
- nteract-on-jupyter==2.0.0
|
- nteract-on-jupyter==2.0.0
|
||||||
- pamela==1.0.0
|
- pamela==1.0.0
|
||||||
- python-editor==1.0.3
|
- python-editor==1.0.4
|
||||||
- python-oauth2==1.1.0
|
- python-oauth2==1.1.0
|
||||||
- requests==2.21.0
|
- requests==2.21.0
|
||||||
- sqlalchemy==1.2.17
|
- sqlalchemy==1.2.17
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
|
# AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
|
||||||
# Generated on 2019-01-30 18:42:13 UTC
|
# Generated on 2019-02-11 20:22:50 UTC
|
||||||
dependencies:
|
dependencies:
|
||||||
- python=3.6.*
|
- python=3.6.*
|
||||||
- ipywidgets==7.2.1
|
- ipywidgets==7.2.1
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# AUTO GENERATED FROM environment.py-3.7.yml, DO NOT MANUALLY MODIFY
|
# AUTO GENERATED FROM environment.py-3.7.yml, DO NOT MANUALLY MODIFY
|
||||||
# Frozen on 2019-01-30 18:38:58 UTC
|
# Frozen on 2019-02-11 20:26:36 UTC
|
||||||
name: r2d
|
name: r2d
|
||||||
channels:
|
channels:
|
||||||
- conda-forge
|
- conda-forge
|
||||||
|
@ -38,21 +38,21 @@ dependencies:
|
||||||
- openssl=1.0.2p=h14c3975_1002
|
- openssl=1.0.2p=h14c3975_1002
|
||||||
- pandoc=1.19.2=0
|
- pandoc=1.19.2=0
|
||||||
- pandocfilters=1.4.2=py_1
|
- pandocfilters=1.4.2=py_1
|
||||||
- parso=0.3.2=py_0
|
- parso=0.3.3=py_0
|
||||||
- pexpect=4.6.0=py37_1000
|
- pexpect=4.6.0=py37_1000
|
||||||
- pickleshare=0.7.5=py37_1000
|
- pickleshare=0.7.5=py37_1000
|
||||||
- pip=19.0.1=py37_0
|
- pip=19.0.2=py37_0
|
||||||
- prometheus_client=0.5.0=py_0
|
- prometheus_client=0.5.0=py_0
|
||||||
- prompt_toolkit=2.0.8=py_0
|
- prompt_toolkit=2.0.8=py_0
|
||||||
- ptyprocess=0.6.0=py37_1000
|
- ptyprocess=0.6.0=py37_1000
|
||||||
- pygments=2.3.1=py_0
|
- pygments=2.3.1=py_0
|
||||||
- pyrsistent=0.14.9=py37h14c3975_1000
|
- pyrsistent=0.14.10=py37h14c3975_0
|
||||||
- python=3.7.1=hd21baee_1000
|
- python=3.7.1=hd21baee_1000
|
||||||
- python-dateutil=2.7.5=py_0
|
- python-dateutil=2.8.0=py_0
|
||||||
- pyzmq=17.1.2=py37h6afc9c9_1001
|
- pyzmq=17.1.2=py37h6afc9c9_1001
|
||||||
- readline=7.0=hf8c457e_1001
|
- readline=7.0=hf8c457e_1001
|
||||||
- send2trash=1.5.0=py_0
|
- send2trash=1.5.0=py_0
|
||||||
- setuptools=40.7.1=py37_0
|
- setuptools=40.8.0=py37_0
|
||||||
- six=1.12.0=py37_1000
|
- six=1.12.0=py37_1000
|
||||||
- sqlite=3.26.0=h67949de_1000
|
- sqlite=3.26.0=h67949de_1000
|
||||||
- terminado=0.8.1=py37_1001
|
- terminado=0.8.1=py37_1001
|
||||||
|
@ -78,7 +78,7 @@ dependencies:
|
||||||
- mako==1.0.7
|
- mako==1.0.7
|
||||||
- nteract-on-jupyter==2.0.0
|
- nteract-on-jupyter==2.0.0
|
||||||
- pamela==1.0.0
|
- pamela==1.0.0
|
||||||
- python-editor==1.0.3
|
- python-editor==1.0.4
|
||||||
- python-oauth2==1.1.0
|
- python-oauth2==1.1.0
|
||||||
- requests==2.21.0
|
- requests==2.21.0
|
||||||
- sqlalchemy==1.2.17
|
- sqlalchemy==1.2.17
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
|
# AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
|
||||||
# Generated on 2019-01-30 18:38:58 UTC
|
# Generated on 2019-02-11 20:26:36 UTC
|
||||||
dependencies:
|
dependencies:
|
||||||
- python=3.7.*
|
- python=3.7.*
|
||||||
- ipywidgets==7.2.1
|
- ipywidgets==7.2.1
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
dependencies:
|
dependencies:
|
||||||
- python=3.6.*
|
- python=3.7.*
|
||||||
- ipywidgets==7.2.1
|
- ipywidgets==7.2.1
|
||||||
- jupyterlab==0.34.9
|
- jupyterlab==0.34.9
|
||||||
- nbconvert==5.4.0
|
- nbconvert==5.4.0
|
||||||
|
|
|
@ -107,7 +107,7 @@ def set_python(py_env_file, py):
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
# allow specifying which Pythons to update on argv
|
# allow specifying which Pythons to update on argv
|
||||||
pys = sys.argv[1:] or ('2.7', '3.7', '3.5', '3.6')
|
pys = sys.argv[1:] or ('2.7', '3.5', '3.6', '3.7')
|
||||||
for py in pys:
|
for py in pys:
|
||||||
env_file = ENV_FILE_T.format(py=py)
|
env_file = ENV_FILE_T.format(py=py)
|
||||||
set_python(env_file, py)
|
set_python(env_file, py)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
assert sys.version_info[:2] == (3, 6), sys.version
|
assert sys.version_info[:2] == (3, 7), sys.version
|
||||||
|
|
||||||
import numpy
|
import numpy
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
assert sys.version_info[:2] == (3, 6), sys.version
|
assert sys.version_info[:2] == (3, 7), sys.version
|
||||||
|
|
||||||
# verify that we have Python 2 and Python 3 kernelspecs
|
# verify that we have Python 2 and Python 3 kernelspecs
|
||||||
from jupyter_client.kernelspec import KernelSpecManager
|
from jupyter_client.kernelspec import KernelSpecManager
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
assert sys.version_info[:2] == (3, 6), sys.version
|
assert sys.version_info[:2] == (3, 7), sys.version
|
||||||
|
|
||||||
import numpy
|
import numpy
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# Verify that the default just provides a py3 environment with jupyter
|
# Verify that the default just provides a py3 environment with jupyter
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
assert sys.version_info[:2] == (3, 6), sys.version
|
assert sys.version_info[:2] == (3, 7), sys.version
|
||||||
import jupyter
|
import jupyter
|
||||||
|
|
||||||
with open('/tmp/appendix') as f:
|
with open('/tmp/appendix') as f:
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
assert sys.version_info[:2] == (3, 6)
|
assert sys.version_info[:2] == (3, 7)
|
||||||
|
|
||||||
import numpy
|
import numpy
|
||||||
|
|
Ładowanie…
Reference in New Issue