From ebe8b25210b9124bfe3b9eb489f7ecea9a400131 Mon Sep 17 00:00:00 2001
From: David Baumgold <david@davidbaumgold.com>
Date: Wed, 15 Jul 2015 11:16:17 -0400
Subject: [PATCH] Upgrade setuptools to 18.0.1

This reverts commit 1a3f0958b93e2d4e726165851305447db8cd4596.
---
 common/lib/capa/setup.py    | 2 +-
 common/lib/xmodule/setup.py | 2 +-
 requirements/edx/base.txt   | 1 -
 requirements/edx/pre.txt    | 3 +++
 setup.py                    | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/common/lib/capa/setup.py b/common/lib/capa/setup.py
index dcb631e376..b9466ca101 100644
--- a/common/lib/capa/setup.py
+++ b/common/lib/capa/setup.py
@@ -4,5 +4,5 @@ setup(
     name="capa",
     version="0.1",
     packages=find_packages(exclude=["tests"]),
-    install_requires=["distribute>=0.6.28"],
+    install_requires=["setuptools"],
 )
diff --git a/common/lib/xmodule/setup.py b/common/lib/xmodule/setup.py
index fedb0e4447..e1e50daf98 100644
--- a/common/lib/xmodule/setup.py
+++ b/common/lib/xmodule/setup.py
@@ -54,7 +54,7 @@ setup(
     version="0.1",
     packages=find_packages(exclude=["tests"]),
     install_requires=[
-        'distribute',
+        'setuptools',
         'docopt',
         'capa',
         'path.py',
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index b765624902..3311d3aca6 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -13,7 +13,6 @@ celery==3.1.18
 cssselect==0.9.1
 dealer==2.0.4
 defusedxml==0.4.1
-distribute>=0.6.28, <0.7
 django-babel-underscore==0.1.0
 django-celery==3.1.16
 django-countries==3.3
diff --git a/requirements/edx/pre.txt b/requirements/edx/pre.txt
index 89bfe09890..5efe897838 100644
--- a/requirements/edx/pre.txt
+++ b/requirements/edx/pre.txt
@@ -5,6 +5,9 @@
 #   * One of @e0d, @feanil, @fredsmith, @maxrothman, or @jibsheet
 #     to check system requirements
 
+# Use a modern setuptools instead of distribute
+setuptools==18.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
diff --git a/setup.py b/setup.py
index 6dbbdd90aa..1b2ef6ec30 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ from setuptools import setup
 setup(
     name="Open edX",
     version="0.4",
-    install_requires=["distribute"],
+    install_requires=["setuptools"],
     requires=[],
     # NOTE: These are not the names we should be installing.  This tree should
     # be reorganized to be a more conventional Python tree.