From ac1c92758d3392509eee2a929132cb484b53ae90 Mon Sep 17 00:00:00 2001 From: e0d Date: Tue, 1 Apr 2014 12:50:15 -0400 Subject: [PATCH 1/2] General requirements re-organization rolling back local changes. bad cnp --- pavelib/prereqs.py | 4 +++- requirements/edx/base.txt | 1 - requirements/edx/github.txt | 2 ++ requirements/edx/local.txt | 14 +++++++------- requirements/edx/post.txt | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/pavelib/prereqs.py b/pavelib/prereqs.py index c0efdff3a86..3fc601f88d3 100644 --- a/pavelib/prereqs.py +++ b/pavelib/prereqs.py @@ -16,7 +16,9 @@ 'requirements/edx/github.txt', 'requirements/edx/local.txt', 'requirements/edx/base.txt', - 'requirements/edx/post.txt', + 'requirements/edx/github.txt', + 'requirements/edx/local.txt', + 'requirements/edx/post.txt' ] # Developers can have private requirements, for local copies of github repos, diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 3db4fd4afe9..7c7ad6c4dae 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -11,7 +11,6 @@ html5lib==0.999 boto==2.13.3 celery==3.0.19 dealer==0.2.3 -distribute>=0.6.28, <0.7 django-babel-underscore==0.1.0 django-celery==3.0.17 django-countries==1.5 diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 1815a418e49..455d743cfa9 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -7,6 +7,8 @@ # Python libraries to install directly from github # Third-party: +git+https://github.com/mitocw/django-cas.git +git+https://github.com/mfogel/django-settings-context-processor.git -e git+https://github.com/edx/django-staticfiles.git@d89aae2a82f2b#egg=django-staticfiles -e git+https://github.com/edx/django-pipeline.git@88ec8a011e481918fdc9d2682d4017c835acd8be#egg=django-pipeline -e git+https://github.com/edx/django-wiki.git@cd0b2b31997afccde519fe5b3365e61a9edb143f#egg=django-wiki diff --git a/requirements/edx/local.txt b/requirements/edx/local.txt index 0e775d04e3f..02999f5eeaf 100644 --- a/requirements/edx/local.txt +++ b/requirements/edx/local.txt @@ -1,8 +1,8 @@ # Python libraries to install that are local to the edx-platform repo --e . --e common/lib/calc --e common/lib/capa --e common/lib/chem --e common/lib/sandbox-packages --e common/lib/symmath --e common/lib/xmodule + -e . + -e common/lib/calc + -e common/lib/capa + -e common/lib/chem + -e common/lib/sandbox-packages + -e common/lib/symmath + -e common/lib/xmodule diff --git a/requirements/edx/post.txt b/requirements/edx/post.txt index 402d80e621b..39dc60355e8 100644 --- a/requirements/edx/post.txt +++ b/requirements/edx/post.txt @@ -5,4 +5,4 @@ # * One of @e0d, @jarv, or @feanil - to check system requirements # This must be installed after distribute has been updated. -MySQL-python==1.2.4 +MySQL-python==1.2.5 From 9eca68e0b72d3e04c7be81e8b31d0dca3559b117 Mon Sep 17 00:00:00 2001 From: e0d Date: Thu, 8 May 2014 13:50:40 -0400 Subject: [PATCH 2/2] rebasing removing extra space trailing comma reverting mysql upgrade adding -e for ora2 making Xblock editable source making splash editable source --- pavelib/prereqs.py | 2 +- requirements/edx/github.txt | 36 +++++++++++++++++------------------- requirements/edx/local.txt | 14 +++++++------- requirements/edx/post.txt | 2 +- 4 files changed, 26 insertions(+), 28 deletions(-) diff --git a/pavelib/prereqs.py b/pavelib/prereqs.py index 3fc601f88d3..5a400efa60d 100644 --- a/pavelib/prereqs.py +++ b/pavelib/prereqs.py @@ -18,7 +18,7 @@ 'requirements/edx/base.txt', 'requirements/edx/github.txt', 'requirements/edx/local.txt', - 'requirements/edx/post.txt' + 'requirements/edx/post.txt', ] # Developers can have private requirements, for local copies of github repos, diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 455d743cfa9..4d6538b4088 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -7,28 +7,26 @@ # Python libraries to install directly from github # Third-party: -git+https://github.com/mitocw/django-cas.git -git+https://github.com/mfogel/django-settings-context-processor.git --e git+https://github.com/edx/django-staticfiles.git@d89aae2a82f2b#egg=django-staticfiles --e git+https://github.com/edx/django-pipeline.git@88ec8a011e481918fdc9d2682d4017c835acd8be#egg=django-pipeline --e git+https://github.com/edx/django-wiki.git@cd0b2b31997afccde519fe5b3365e61a9edb143f#egg=django-wiki --e git+https://github.com/gabrielfalcao/lettuce.git@cccc3978ad2df82a78b6f9648fe2e9baddd22f88#egg=lettuce --e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev --e git+https://github.com/eventbrite/zendesk.git@d53fe0e81b623f084e91776bcf6369f8b7b63879#egg=zendesk --e git+https://github.com/un33k/django-ipware.git@42cb1bb1dc680a60c6452e8bb2b843c2a0382c90#egg=django-ipware --e git+https://github.com/appliedsec/pygeoip.git@95e69341cebf5a6a9fbf7c4f5439d458898bdc3b#egg=pygeoip +git+https://github.com/edx/django-staticfiles.git@d89aae2a82f2b#egg=django-staticfiles +git+https://github.com/edx/django-pipeline.git@88ec8a011e481918fdc9d2682d4017c835acd8be#egg=django-pipeline +git+https://github.com/edx/django-wiki.git@cd0b2b31997afccde519fe5b3365e61a9edb143f#egg=django-wiki +git+https://github.com/gabrielfalcao/lettuce.git@cccc3978ad2df82a78b6f9648fe2e9baddd22f88#egg=lettuce +git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev +git+https://github.com/eventbrite/zendesk.git@d53fe0e81b623f084e91776bcf6369f8b7b63879#egg=zendesk +git+https://github.com/un33k/django-ipware.git@42cb1bb1dc680a60c6452e8bb2b843c2a0382c90#egg=django-ipware +git+https://github.com/appliedsec/pygeoip.git@95e69341cebf5a6a9fbf7c4f5439d458898bdc3b#egg=pygeoip # Our libraries: -e git+https://github.com/edx/XBlock.git@aed7a2c51a59836e435259ad0fb41f8e865fa530#egg=XBlock --e git+https://github.com/edx/codejail.git@71f5c5616e2a73ae8cecd1ff2362774a773d3665#egg=codejail --e git+https://github.com/edx/diff-cover.git@v0.5.0#egg=diff_cover --e git+https://github.com/edx/js-test-tool.git@v0.1.5#egg=js_test_tool --e git+https://github.com/edx/django-waffle.git@823a102e48#egg=django-waffle --e git+https://github.com/edx/event-tracking.git@0.1.0#egg=event-tracking --e git+https://github.com/edx/edx-analytics-api-client.git@0.1.0#egg=analytics-client --e git+https://github.com/edx/bok-choy.git@821d3b0ac742c204a93d802a8732be024a0bce22#egg=bok_choy --e git+https://github.com/edx-solutions/django-splash.git@9965a53c269666a30bb4e2b3f6037c138aef2a55#egg=django-splash --e git+https://github.com/edx/acid-block.git@459aff7b63db8f2c5decd1755706c1a64fb4ebb1#egg=acid-xblock +git+https://github.com/edx/codejail.git@71f5c5616e2a73ae8cecd1ff2362774a773d3665#egg=codejail +git+https://github.com/edx/diff-cover.git@v0.5.0#egg=diff_cover +git+https://github.com/edx/js-test-tool.git@v0.1.5#egg=js_test_tool +git+https://github.com/edx/django-waffle.git@823a102e48#egg=django-waffle +git+https://github.com/edx/event-tracking.git@0.1.0#egg=event-tracking +git+https://github.com/edx/edx-analytics-api-client.git@0.1.0#egg=analytics-client +git+https://github.com/edx/bok-choy.git@821d3b0ac742c204a93d802a8732be024a0bce22#egg=bok_choy +git+https://github.com/edx-solutions/django-splash.git@9965a53c269666a30bb4e2b3f6037c138aef2a55#egg=django-splash +git+https://github.com/edx/acid-block.git@459aff7b63db8f2c5decd1755706c1a64fb4ebb1#egg=acid-xblock -e git+https://github.com/edx/edx-ora2.git@release-2014-07-28T12.09#egg=edx-ora2 -e git+https://github.com/edx/opaque-keys.git@454bd984d9539550c6290020e92ee2d6094038d0#egg=opaque-keys -e git+https://github.com/edx/ease.git@97de68448e5495385ba043d3091f570a699d5b5f#egg=ease diff --git a/requirements/edx/local.txt b/requirements/edx/local.txt index 02999f5eeaf..0e775d04e3f 100644 --- a/requirements/edx/local.txt +++ b/requirements/edx/local.txt @@ -1,8 +1,8 @@ # Python libraries to install that are local to the edx-platform repo - -e . - -e common/lib/calc - -e common/lib/capa - -e common/lib/chem - -e common/lib/sandbox-packages - -e common/lib/symmath - -e common/lib/xmodule +-e . +-e common/lib/calc +-e common/lib/capa +-e common/lib/chem +-e common/lib/sandbox-packages +-e common/lib/symmath +-e common/lib/xmodule diff --git a/requirements/edx/post.txt b/requirements/edx/post.txt index 39dc60355e8..402d80e621b 100644 --- a/requirements/edx/post.txt +++ b/requirements/edx/post.txt @@ -5,4 +5,4 @@ # * One of @e0d, @jarv, or @feanil - to check system requirements # This must be installed after distribute has been updated. -MySQL-python==1.2.5 +MySQL-python==1.2.4