Merge pull request #8961 from edx/cypress-setuptools

lxml and setuptools for Cypress

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"],
 )

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',

docs/shared/requirements.txt

@@ -34,7 +34,7 @@ feedparser==5.1.3
 git+https://github.com/pmitros/pyfs.git@96e1922348bfe6d99201b9512a9ed946c87b7e0b
 GitPython==0.3.2.RC1
 glob2==0.3
-lxml==3.3.6
+lxml==3.4.4
 mako==0.7.3
 Markdown==2.2.1
 mock==1.0.1

requirements/edx-sandbox/post.txt

@@ -6,4 +6,4 @@
 
 # Packages to install in the Python sandbox for secured execution.
 scipy==0.14.0
-lxml==3.3.6
+lxml==3.4.4

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
@@ -45,13 +44,13 @@ glob2==0.3
 gunicorn==0.17.4
 httpretty==0.8.3
 lazy==1.1
-lxml==3.3.6
 mako==0.9.1
 Markdown==2.2.1
 --allow-external meliae
 --allow-unverified meliae
 meliae==0.4.0
 mongoengine==0.7.10
+MySQL-python==1.2.5
 networkx==1.7
 nltk==2.0.5
 nose==1.3.3
@@ -70,7 +69,6 @@ python-memcached==1.48
 python-openid==2.2.5
 python-dateutil==2.1
 python-social-auth==0.2.11
-python-saml==2.1.3
 pytz==2015.2
 pysrt==0.4.7
 PyYAML==3.10
@@ -92,6 +90,9 @@ unicodecsv==0.9.4
 django-require==1.0.6
 pyuca==1.1
 
+# This needs to be installed *after* Cython, which is in pre.txt
+lxml==3.4.4
+
 # Used for shopping cart's pdf invoice/receipt generation
 reportlab==3.1.44
 

requirements/edx/github.txt

@@ -38,10 +38,10 @@ git+https://github.com/hmarr/django-debug-toolbar-mongo.git@b0686a76f1ce3532088c
 -e git+https://github.com/edx/event-tracking.git@0.2.0#egg=event-tracking
 -e git+https://github.com/edx-solutions/django-splash.git@7579d052afcf474ece1239153cffe1c89935bc4f#egg=django-splash
 -e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock
--e git+https://github.com/edx/edx-ora2.git@release-2015-05-08T16.15#egg=edx-ora2
+-e git+https://github.com/edx/edx-ora2.git@release-2015-07-14T11.10#egg=edx-ora2
 -e git+https://github.com/edx/edx-submissions.git@7c766502058e04bc9094e6cbe286e949794b80b3#egg=edx-submissions
 -e git+https://github.com/edx/opaque-keys.git@df0dd602869e498e512659bb4bd243309e30e19a#egg=opaque-keys
--e git+https://github.com/edx/ease.git@b67d2928a26fe497826b6ea359b9a3d0371548a7#egg=ease==0.1.3
+git+https://github.com/edx/ease.git@release-2015-07-14#egg=ease==0.1.3
 -e git+https://github.com/edx/i18n-tools.git@v0.1.1#egg=i18n-tools
 -e git+https://github.com/edx/edx-oauth2-provider.git@0.5.1#egg=oauth2-provider
 -e git+https://github.com/edx/edx-val.git@v0.0.5#egg=edx-val

requirements/edx/post.txt

 # DON'T JUST ADD NEW DEPENDENCIES!!!
 #
 # If you open a pull request that adds a new dependency, you should notify:
-#   * @mollydb to check licensing
-#   * One of @e0d, @feanil, @fredsmith, @maxrothman, or @jibsheet
-#     to check system requirements
+#   * @mollydb - to check licensing
+#   * support@edx.org - to check system requirements
 
-# This must be installed after distribute has been updated.
-MySQL-python==1.2.4
+# This needs to be installed *after* lxml, which is in base.txt.
+# python-saml pulls in lxml as a dependency, and due to a bug in setuptools,
+# trying to compile lxml as a dependency causes setuptools to go into an
+# infinite loop and run out of memory. Because why would you trust a
+# dependency management tool to manage dependencies for you?
+python-saml==2.1.3

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

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.