Merge pull request #14396 from edx/ned/pip9

Try pip 9.0.1 and setuptools 34.0.2

common/lib/calc/setup.py

@@ -5,7 +5,7 @@ setup(
     version="0.2",
     packages=["calc"],
     install_requires=[
-        "pyparsing==2.0.1",
+        "pyparsing==2.0.7",
         "numpy==1.6.2",
         "scipy==0.14.0",
     ],

common/lib/chem/setup.py

@@ -5,7 +5,7 @@ setup(
     version="0.1.1",
     packages=["chem"],
     install_requires=[
-        "pyparsing==2.0.1",
+        "pyparsing==2.0.7",
         "numpy==1.6.2",
         "scipy==0.14.0",
         "nltk==2.0.6",

pavelib/prereqs.py

@@ -185,6 +185,7 @@ PACKAGES_TO_UNINSTALL = [
     "django-storages",
     "django-oauth2-provider",       # Because now it's called edx-django-oauth2-provider.
     "edx-oauth2-provider",          # Because it moved from github to pypi
+    "i18n-tools",                   # Because now it's called edx-i18n-tools
 ]
 
 

requirements/edx-sandbox/base.txt

@@ -4,10 +4,15 @@
 #   * @edx/ospr - to check licensing
 #   * @edx/devops - to check system requirements
 
+# Pin packaging tools the same as edxapp.  Keep them in sync for our sanity.
+setuptools==34.0.2
+pip==9.0.1
+
+
 numpy==1.6.2
 networkx==1.7
 sympy==0.7.1
-pyparsing==2.0.1
+pyparsing==2.0.7
 matplotlib==1.3.1
 
 # We forked NLTK just to make it work with setuptools instead of distribute

requirements/edx/base.txt

@@ -81,7 +81,6 @@ pygments==2.0.1
 pygraphviz==1.1
 PyJWT==1.4.0
 pymongo==2.9.1
-pyparsing==2.0.1
 python-memcached==1.48
 python-openid==2.2.5
 python-dateutil==2.1

requirements/edx/github.txt

@@ -55,14 +55,14 @@ git+https://github.com/edx/nltk.git@2.0.6#egg=nltk==2.0.6
 -e git+https://github.com/appliedsec/pygeoip.git@95e69341cebf5a6a9fbf7c4f5439d458898bdc3b#egg=pygeoip
 -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme
 git+https://github.com/edx/django-pyfs.git@1.0.3#egg=django-pyfs==1.0.3
-git+https://github.com/mitodl/django-cas.git@v2.1.1#egg=django-cas
+git+https://github.com/mitodl/django-cas.git@v2.1.1#egg=django-cas==2.1.1
 -e git+https://github.com/dgrtwo/ParsePy.git@7949b9f754d1445eff8e8f20d0e967b9a6420639#egg=parse_rest
 # Master pyfs has a bug working with VPC auth. This is a fix. We should switch
 # back to master when and if this fix is merged back.
 # fs==0.4.0
-git+https://github.com/pmitros/pyfs.git@96e1922348bfe6d99201b9512a9ed946c87b7e0b
+git+https://github.com/pmitros/pyfs.git@96e1922348bfe6d99201b9512a9ed946c87b7e0b#egg=fs==0.4.0
 # The officially released version of django-debug-toolbar-mongo doesn't support DJDT 1.x. This commit does.
-git+https://github.com/hmarr/django-debug-toolbar-mongo.git@b0686a76f1ce3532088c4aee6e76b9abe61cc808
+git+https://github.com/hmarr/django-debug-toolbar-mongo.git@b0686a76f1ce3532088c4aee6e76b9abe61cc808#egg=django-debug-toolbar-mongo==0.1.10
 
 # NOTE (CCB): This must remain. There is one commit on the upstream repo that has not been released to PyPI.
 git+https://github.com/edx/rfc6266.git@v0.0.5-edx#egg=rfc6266==0.0.5-edx
@@ -79,7 +79,7 @@ git+https://github.com/edx/XBlock.git@xblock-0.4.13#egg=XBlock==0.4.13
 git+https://github.com/edx/edx-ora2.git@1.1.13#egg=ora2==1.1.13
 -e git+https://github.com/edx/edx-submissions.git@1.1.4#egg=edx-submissions==1.1.4
 git+https://github.com/edx/ease.git@release-2015-07-14#egg=ease==0.1.3
-git+https://github.com/edx/i18n-tools.git@v0.3.7#egg=i18n-tools==v0.3.7
+git+https://github.com/edx/i18n-tools.git@v0.3.7#egg=edx-i18n-tools==v0.3.7
 git+https://github.com/edx/edx-val.git@0.0.12#egg=edxval==0.0.12
 git+https://github.com/pmitros/RecommenderXBlock.git@v1.1#egg=recommender-xblock==1.1
 git+https://github.com/solashirai/crowdsourcehinter.git@518605f0a95190949fe77bd39158450639e2e1dc#egg=crowdsourcehinter-xblock==0.1
@@ -90,7 +90,7 @@ git+https://github.com/edx/xblock-utils.git@v1.0.3#egg=xblock-utils==1.0.3
 -e git+https://github.com/edx-solutions/xblock-google-drive.git@138e6fa0bf3a2013e904a085b9fed77dab7f3f21#egg=xblock-google-drive
 -e git+https://github.com/edx/edx-reverification-block.git@0.0.5#egg=edx-reverification-block==0.0.5
 git+https://github.com/edx/edx-user-state-client.git@1.0.1#egg=edx-user-state-client==1.0.1
-git+https://github.com/edx/xblock-lti-consumer.git@v1.1.1#egg=xblock-lti-consumer==1.1.1
+git+https://github.com/edx/xblock-lti-consumer.git@v1.1.1#egg=lti_consumer-xblock==1.1.1
 git+https://github.com/edx/edx-proctoring.git@0.17.0#egg=edx-proctoring==0.17.0
 
 # Third Party XBlocks

requirements/edx/pre.txt

@@ -4,15 +4,14 @@
 #   * @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.
+pyparsing==2.0.7
+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