Skip to content

Commit d8f8c78

Browse files
committed
Bump python default version to 3.7
1 parent 9766c95 commit d8f8c78

File tree

14 files changed

+60
-59
lines changed

14 files changed

+60
-59
lines changed

repo2docker/buildpacks/conda/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def get_build_scripts(self):
7777

7878
major_pythons = {
7979
'2': '2.7',
80-
'3': '3.6',
80+
'3': '3.7',
8181
}
8282

8383
def get_build_script_files(self):

repo2docker/buildpacks/conda/environment.frozen.yml

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# AUTO GENERATED FROM environment.py-3.6.yml, DO NOT MANUALLY MODIFY
2-
# Frozen on 2019-01-30 18:42:13 UTC
1+
# AUTO GENERATED FROM environment.py-3.7.yml, DO NOT MANUALLY MODIFY
2+
# Frozen on 2019-02-11 20:26:36 UTC
33
name: r2d
44
channels:
55
- conda-forge
@@ -9,65 +9,66 @@ dependencies:
99
- attrs=18.2.0=py_0
1010
- backcall=0.1.0=py_0
1111
- bleach=3.1.0=py_0
12+
- bzip2=1.0.6=h14c3975_1002
1213
- ca-certificates=2018.11.29=ha4d7672_0
13-
- certifi=2018.11.29=py36_1000
14+
- certifi=2018.11.29=py37_1000
1415
- decorator=4.3.2=py_0
1516
- defusedxml=0.5.0=py_1
16-
- entrypoints=0.3=py36_1000
17+
- entrypoints=0.3=py37_1000
1718
- gmp=6.1.2=hf484d3e_1000
18-
- ipykernel=5.1.0=py36h24bf2e0_1002
19-
- ipython=7.2.0=py36h24bf2e0_1000
19+
- ipykernel=5.1.0=py37h24bf2e0_1002
20+
- ipython=7.2.0=py37h24bf2e0_1000
2021
- ipython_genutils=0.2.0=py_1
21-
- ipywidgets=7.2.1=py36_1
22-
- jedi=0.13.2=py36_1000
22+
- jedi=0.13.2=py37_1000
2323
- jinja2=2.10=py_1
24-
- jsonschema=3.0.0a3=py36_1000
24+
- jsonschema=3.0.0a3=py37_1000
2525
- jupyter_client=5.2.4=py_1
2626
- jupyter_core=4.4.0=py_0
27-
- jupyterlab=0.34.9=py36_0
2827
- jupyterlab_launcher=0.13.1=py_2
2928
- libffi=3.2.1=hf484d3e_1005
3029
- libgcc-ng=7.3.0=hdf63c60_0
3130
- libsodium=1.0.16=h14c3975_1001
3231
- libstdcxx-ng=7.3.0=hdf63c60_0
33-
- markupsafe=1.1.0=py36h14c3975_1000
34-
- mistune=0.8.4=py36h14c3975_1000
32+
- markupsafe=1.1.0=py37h14c3975_1000
33+
- mistune=0.8.4=py37h14c3975_1000
3534
- nbconvert=5.4.0=1
3635
- nbformat=4.4.0=py_1
3736
- ncurses=6.1=hf484d3e_1002
38-
- notebook=5.7.4=py36_1000
37+
- notebook=5.7.4=py37_1000
3938
- openssl=1.0.2p=h14c3975_1002
4039
- pandoc=1.19.2=0
4140
- pandocfilters=1.4.2=py_1
42-
- parso=0.3.2=py_0
43-
- pexpect=4.6.0=py36_1000
44-
- pickleshare=0.7.5=py36_1000
45-
- pip=19.0.1=py36_0
41+
- parso=0.3.3=py_0
42+
- pexpect=4.6.0=py37_1000
43+
- pickleshare=0.7.5=py37_1000
44+
- pip=19.0.2=py37_0
4645
- prometheus_client=0.5.0=py_0
4746
- prompt_toolkit=2.0.8=py_0
48-
- ptyprocess=0.6.0=py36_1000
47+
- ptyprocess=0.6.0=py37_1000
4948
- pygments=2.3.1=py_0
50-
- pyrsistent=0.14.9=py36h14c3975_1000
51-
- python=3.6.7=hd21baee_1001
52-
- python-dateutil=2.7.5=py_0
53-
- pyzmq=17.1.2=py36h6afc9c9_1001
49+
- pyrsistent=0.14.10=py37h14c3975_0
50+
- python=3.7.1=hd21baee_1000
51+
- python-dateutil=2.8.0=py_0
52+
- pyzmq=17.1.2=py37h6afc9c9_1001
5453
- readline=7.0=hf8c457e_1001
5554
- send2trash=1.5.0=py_0
56-
- setuptools=40.7.1=py36_0
57-
- six=1.12.0=py36_1000
55+
- setuptools=40.8.0=py37_0
56+
- six=1.12.0=py37_1000
5857
- sqlite=3.26.0=h67949de_1000
59-
- terminado=0.8.1=py36_1001
60-
- testpath=0.4.2=py36_1000
58+
- terminado=0.8.1=py37_1001
59+
- testpath=0.4.2=py37_1000
6160
- tk=8.6.9=h84994c4_1000
62-
- tornado=5.1.1=py36h14c3975_1000
63-
- traitlets=4.3.2=py36_1000
61+
- tornado=5.1.1=py37h14c3975_1000
62+
- traitlets=4.3.2=py37_1000
6463
- wcwidth=0.1.7=py_1
6564
- webencodings=0.5.1=py_1
66-
- wheel=0.32.3=py36_0
67-
- widgetsnbextension=3.2.1=py36_1
65+
- wheel=0.32.3=py37_0
66+
- widgetsnbextension=3.4.2=py37_1000
6867
- xz=5.2.4=h14c3975_1001
6968
- zeromq=4.2.5=hf484d3e_1006
7069
- zlib=1.2.11=h14c3975_1004
70+
- ipywidgets=7.2.1=py37_0
71+
- jupyterlab=0.34.9=py37_0
7172
- pip:
7273
- alembic==1.0.7
7374
- async-generator==1.10
@@ -77,7 +78,7 @@ dependencies:
7778
- mako==1.0.7
7879
- nteract-on-jupyter==2.0.0
7980
- pamela==1.0.0
80-
- python-editor==1.0.3
81+
- python-editor==1.0.4
8182
- python-oauth2==1.1.0
8283
- requests==2.21.0
8384
- sqlalchemy==1.2.17

repo2docker/buildpacks/conda/environment.py-2.7.frozen.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# AUTO GENERATED FROM environment.py-2.7.yml, DO NOT MANUALLY MODIFY
2-
# Frozen on 2019-01-30 18:36:55 UTC
2+
# Frozen on 2019-02-11 20:20:33 UTC
33
name: r2d
44
channels:
55
- conda-forge
@@ -28,16 +28,16 @@ dependencies:
2828
- pathlib2=2.3.3=py27_1000
2929
- pexpect=4.6.0=py27_1000
3030
- pickleshare=0.7.5=py27_1000
31-
- pip=19.0.1=py27_0
31+
- pip=19.0.2=py27_0
3232
- prompt_toolkit=1.0.15=py_1
3333
- ptyprocess=0.6.0=py27_1000
3434
- pygments=2.3.1=py_0
3535
- python=2.7.15=h938d71a_1006
36-
- python-dateutil=2.7.5=py_0
36+
- python-dateutil=2.8.0=py_0
3737
- pyzmq=17.1.2=py27h6afc9c9_1001
3838
- readline=7.0=hf8c457e_1001
3939
- scandir=1.9.0=py27h14c3975_1000
40-
- setuptools=40.7.1=py27_0
40+
- setuptools=40.8.0=py27_0
4141
- simplegeneric=0.8.1=py_1
4242
- singledispatch=3.4.0.3=py27_1000
4343
- six=1.12.0=py27_1000

repo2docker/buildpacks/conda/environment.py-3.6.frozen.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# AUTO GENERATED FROM environment.py-3.6.yml, DO NOT MANUALLY MODIFY
2-
# Frozen on 2019-01-30 18:42:13 UTC
2+
# Frozen on 2019-02-11 20:22:50 UTC
33
name: r2d
44
channels:
55
- conda-forge
@@ -39,21 +39,21 @@ dependencies:
3939
- openssl=1.0.2p=h14c3975_1002
4040
- pandoc=1.19.2=0
4141
- pandocfilters=1.4.2=py_1
42-
- parso=0.3.2=py_0
42+
- parso=0.3.3=py_0
4343
- pexpect=4.6.0=py36_1000
4444
- pickleshare=0.7.5=py36_1000
45-
- pip=19.0.1=py36_0
45+
- pip=19.0.2=py36_0
4646
- prometheus_client=0.5.0=py_0
4747
- prompt_toolkit=2.0.8=py_0
4848
- ptyprocess=0.6.0=py36_1000
4949
- pygments=2.3.1=py_0
50-
- pyrsistent=0.14.9=py36h14c3975_1000
50+
- pyrsistent=0.14.10=py36h14c3975_0
5151
- python=3.6.7=hd21baee_1001
52-
- python-dateutil=2.7.5=py_0
52+
- python-dateutil=2.8.0=py_0
5353
- pyzmq=17.1.2=py36h6afc9c9_1001
5454
- readline=7.0=hf8c457e_1001
5555
- send2trash=1.5.0=py_0
56-
- setuptools=40.7.1=py36_0
56+
- setuptools=40.8.0=py36_0
5757
- six=1.12.0=py36_1000
5858
- sqlite=3.26.0=h67949de_1000
5959
- terminado=0.8.1=py36_1001
@@ -77,7 +77,7 @@ dependencies:
7777
- mako==1.0.7
7878
- nteract-on-jupyter==2.0.0
7979
- pamela==1.0.0
80-
- python-editor==1.0.3
80+
- python-editor==1.0.4
8181
- python-oauth2==1.1.0
8282
- requests==2.21.0
8383
- sqlalchemy==1.2.17

repo2docker/buildpacks/conda/environment.py-3.6.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
2-
# Generated on 2019-01-30 18:42:13 UTC
2+
# Generated on 2019-02-11 20:22:50 UTC
33
dependencies:
44
- python=3.6.*
55
- ipywidgets==7.2.1

repo2docker/buildpacks/conda/environment.py-3.7.frozen.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# AUTO GENERATED FROM environment.py-3.7.yml, DO NOT MANUALLY MODIFY
2-
# Frozen on 2019-01-30 18:38:58 UTC
2+
# Frozen on 2019-02-11 20:26:36 UTC
33
name: r2d
44
channels:
55
- conda-forge
@@ -38,21 +38,21 @@ dependencies:
3838
- openssl=1.0.2p=h14c3975_1002
3939
- pandoc=1.19.2=0
4040
- pandocfilters=1.4.2=py_1
41-
- parso=0.3.2=py_0
41+
- parso=0.3.3=py_0
4242
- pexpect=4.6.0=py37_1000
4343
- pickleshare=0.7.5=py37_1000
44-
- pip=19.0.1=py37_0
44+
- pip=19.0.2=py37_0
4545
- prometheus_client=0.5.0=py_0
4646
- prompt_toolkit=2.0.8=py_0
4747
- ptyprocess=0.6.0=py37_1000
4848
- pygments=2.3.1=py_0
49-
- pyrsistent=0.14.9=py37h14c3975_1000
49+
- pyrsistent=0.14.10=py37h14c3975_0
5050
- python=3.7.1=hd21baee_1000
51-
- python-dateutil=2.7.5=py_0
51+
- python-dateutil=2.8.0=py_0
5252
- pyzmq=17.1.2=py37h6afc9c9_1001
5353
- readline=7.0=hf8c457e_1001
5454
- send2trash=1.5.0=py_0
55-
- setuptools=40.7.1=py37_0
55+
- setuptools=40.8.0=py37_0
5656
- six=1.12.0=py37_1000
5757
- sqlite=3.26.0=h67949de_1000
5858
- terminado=0.8.1=py37_1001
@@ -78,7 +78,7 @@ dependencies:
7878
- mako==1.0.7
7979
- nteract-on-jupyter==2.0.0
8080
- pamela==1.0.0
81-
- python-editor==1.0.3
81+
- python-editor==1.0.4
8282
- python-oauth2==1.1.0
8383
- requests==2.21.0
8484
- sqlalchemy==1.2.17

repo2docker/buildpacks/conda/environment.py-3.7.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
2-
# Generated on 2019-01-30 18:38:58 UTC
2+
# Generated on 2019-02-11 20:26:36 UTC
33
dependencies:
44
- python=3.7.*
55
- ipywidgets==7.2.1

repo2docker/buildpacks/conda/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies:
2-
- python=3.6.*
2+
- python=3.7.*
33
- ipywidgets==7.2.1
44
- jupyterlab==0.34.9
55
- nbconvert==5.4.0

repo2docker/buildpacks/conda/freeze.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def set_python(py_env_file, py):
107107

108108
if __name__ == '__main__':
109109
# allow specifying which Pythons to update on argv
110-
pys = sys.argv[1:] or ('2.7', '3.7', '3.5', '3.6')
110+
pys = sys.argv[1:] or ('2.7', '3.5', '3.6', '3.7')
111111
for py in pys:
112112
env_file = ENV_FILE_T.format(py=py)
113113
set_python(env_file, py)

tests/conda/requirements/verify

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python
22
import sys
33

4-
assert sys.version_info[:2] == (3, 6), sys.version
4+
assert sys.version_info[:2] == (3, 7), sys.version
55

66
import numpy
77
try:

0 commit comments

Comments
 (0)