From 09843f5439b259435ebf911459dd3fab0f199748 Mon Sep 17 00:00:00 2001
From: yuvipanda <yuvipanda@gmail.com>
Date: Wed, 17 Jan 2018 17:11:29 -0800
Subject: [PATCH 1/4] Bump to artful

Zesty fell out of support on Jan 13, and the packages have
started disappearing from http://archive.ubuntu.com/ubuntu/ and
other mirrors as of today. This will totally screw up our
build processes whenever it hits the mirror we use.
---
 repo2docker/buildpacks/base.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/repo2docker/buildpacks/base.py b/repo2docker/buildpacks/base.py
index c587e94c..abb88376 100644
--- a/repo2docker/buildpacks/base.py
+++ b/repo2docker/buildpacks/base.py
@@ -10,7 +10,7 @@ import re
 import docker
 
 TEMPLATE = r"""
-FROM buildpack-deps:zesty
+FROM buildpack-deps:artful
 
 # Set up locales properly
 RUN apt-get update && \
@@ -151,7 +151,6 @@ class BuildPack(LoggingConfigurable):
             # FIXME: Use npm from nodesource!
             # Everything seems to depend on npm these days, unfortunately.
             "npm",
-            "nodejs-legacy"
         },
         help="""
         Base set of apt packages that are installed for all images.

From 293be022a5a9538023790730b66eab40fda1408b Mon Sep 17 00:00:00 2001
From: yuvipanda <yuvipanda@gmail.com>
Date: Wed, 17 Jan 2018 17:22:48 -0800
Subject: [PATCH 2/4] Bump version checks to work with new python 3.6

---
 tests/venv/default/verify | 2 +-
 tests/venv/numpy/verify   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/venv/default/verify b/tests/venv/default/verify
index 73190acb..f815f7b9 100755
--- a/tests/venv/default/verify
+++ b/tests/venv/default/verify
@@ -2,5 +2,5 @@
 # Verify that the default just provides a py3 environment with jupyter
 import sys
 
-assert sys.version_info[:2] == (3, 5)
+assert sys.version_info[:2] == (3, 6)
 import jupyter
diff --git a/tests/venv/numpy/verify b/tests/venv/numpy/verify
index 660c1f48..4ad54bfd 100755
--- a/tests/venv/numpy/verify
+++ b/tests/venv/numpy/verify
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 import sys
 
-assert sys.version_info[:2] == (3, 5)
+assert sys.version_info[:2] == (3, 6)
 
 import numpy

From 98b365c868934d8c8a386082bc56d1892bee3e6a Mon Sep 17 00:00:00 2001
From: yuvipanda <yuvipanda@gmail.com>
Date: Wed, 17 Jan 2018 17:29:11 -0800
Subject: [PATCH 3/4] Remove DataScienceHandbook from our CI

It'll be broken by python3.6 move, needs https://github.com/jakevdp/PythonDataScienceHandbook/issues/108
to be fixed before we can re-enable.
---
 tests/external/datasci.repos.yaml | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 tests/external/datasci.repos.yaml

diff --git a/tests/external/datasci.repos.yaml b/tests/external/datasci.repos.yaml
deleted file mode 100644
index aeeed4e0..00000000
--- a/tests/external/datasci.repos.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-# A bunch of external datascience related repos we care about!
-- name: Jake's Data Science Book
-  url: https://github.com/jakevdp/PythonDataScienceHandbook
-  ref: de0cc6bd31
-  verify: python -c 'import matplotlib'

From d55d46c563a687c04aa3b6b776f134f0e88b032c Mon Sep 17 00:00:00 2001
From: yuvipanda <yuvipanda@gmail.com>
Date: Wed, 17 Jan 2018 17:43:15 -0800
Subject: [PATCH 4/4] Bump external testing dockerfile to artful too

---
 tests/memlimit/dockerfile/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/memlimit/dockerfile/Dockerfile b/tests/memlimit/dockerfile/Dockerfile
index 62275bba..0cb02777 100644
--- a/tests/memlimit/dockerfile/Dockerfile
+++ b/tests/memlimit/dockerfile/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:zesty
+FROM ubuntu:artful
 
 RUN apt-get update && apt-get install --yes python3