From 041fede3340ac569b531d0d8cec1308734616e53 Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@edx.org>
Date: Wed, 25 Jan 2017 15:04:22 -0500
Subject: [PATCH] Try the latest of pip and setuptools

---
 requirements/edx/pre.txt | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/requirements/edx/pre.txt b/requirements/edx/pre.txt
index 2cea13c611..5ee8cc9af8 100644
--- a/requirements/edx/pre.txt
+++ b/requirements/edx/pre.txt
@@ -4,15 +4,13 @@
 #   * @edx/ospr - to check licensing
 #   * @edx/devops - to check system requirements
 
-# Use a modern setuptools instead of distribute
-setuptools==18.0.1
+# Packaging pre-requisites.
+setuptools==34.0.2
+pip==9.0.1
 
 # Numpy and scipy can't be installed in the same pip run.
 # Install numpy before other things to help resolve the problem.
 numpy==1.6.2
 
-# Needed to make sure that options in base.txt are allowed
-pip==7.1.2
-
 # Needed for meliae
 Cython==0.21.2