Skip to content

Re-upgrade to setuptools #8934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
singingwolfboy merged 3 commits into from
Jul 31, 2015
Merged

Re-upgrade to setuptools #8934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebe8b25
Upgrade setuptools to 18.0.1
singingwolfboy Jul 15, 2015
957c814
Upgrade MySQL-python to 1.2.5
singingwolfboy Jul 15, 2015
afeef4c
Fix setuptools infinite loop bug triggered by python-saml
singingwolfboy Jul 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/lib/capa/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
name="capa",
version="0.1",
packages=find_packages(exclude=["tests"]),
install_requires=["distribute>=0.6.28"],
install_requires=["setuptools"],
)
2 changes: 1 addition & 1 deletion common/lib/xmodule/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
version="0.1",
packages=find_packages(exclude=["tests"]),
install_requires=[
'distribute',
'setuptools',
'docopt',
'capa',
'path.py',
Expand Down
7 changes: 4 additions & 3 deletions requirements/edx/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -45,13 +44,13 @@ glob2==0.3
gunicorn==0.17.4
httpretty==0.8.3
lazy==1.1
lxml==3.4.4
mako==0.9.1
Markdown==2.2.1
--allow-external meliae
--allow-unverified meliae
meliae==0.4.0
mongoengine==0.10.0
MySQL-python==1.2.5
networkx==1.7
nose==1.3.3
oauthlib==0.7.2
Expand All @@ -69,7 +68,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
Expand All @@ -90,6 +88,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

Expand Down
13 changes: 8 additions & 5 deletions requirements/edx/post.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
# 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

@feanil feanil Jul 15, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: You can also mention @edx/devops

@singingwolfboy singingwolfboy Jul 15, 2015

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe that only people in the @edx/devops team are able to mention it. Anyway, this is just copied from the header of requirements/edx/base.txt.


# 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
3 changes: 3 additions & 0 deletions requirements/edx/pre.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
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.
Expand Down