Skip to content

Revert setuptools upgrade #8929

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 2 commits into from
Jul 14, 2015
Merged

Revert setuptools upgrade #8929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffb0a6a
Revert setuptools upgrade
singingwolfboy Jul 14, 2015
ee8913a
Revert MySQL-python upgrade
singingwolfboy Jul 14, 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=["setuptools"],
install_requires=["distribute>=0.6.28"],
)
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=[
'setuptools',
'distribute',
'docopt',
'capa',
'path.py',
Expand Down
1 change: 1 addition & 0 deletions pavelib/prereqs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
'requirements/edx/github.txt',
'requirements/edx/local.txt',
'requirements/edx/base.txt',
'requirements/edx/post.txt',
]

# Developers can have private requirements, for local copies of github repos,
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ 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 @@ -51,7 +52,6 @@ Markdown==2.2.1
--allow-unverified meliae
meliae==0.4.0
mongoengine==0.7.10
MySQL-python==1.2.5
networkx==1.7
nose==1.3.3
oauthlib==0.7.2
Expand Down
9 changes: 9 additions & 0 deletions requirements/edx/post.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# 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

# This must be installed after distribute has been updated.
MySQL-python==1.2.4
3 changes: 0 additions & 3 deletions requirements/edx/pre.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
# * 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=["setuptools"],
install_requires=["distribute"],
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