From caf64d5dd089a2397c51725debcba216a4d94e7a Mon Sep 17 00:00:00 2001 From: John Jarvis Date: Thu, 16 May 2013 12:06:31 -0400 Subject: [PATCH 1/3] moving requirements files to a directory that corresponds with the virtualenv name --- requirements/{ => edx}/base.txt | 0 requirements/{ => edx}/github.txt | 0 requirements/{ => edx}/local.txt | 0 requirements/{ => edx}/post.txt | 0 requirements/{ => edx}/repo.txt | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename requirements/{ => edx}/base.txt (100%) rename requirements/{ => edx}/github.txt (100%) rename requirements/{ => edx}/local.txt (100%) rename requirements/{ => edx}/post.txt (100%) rename requirements/{ => edx}/repo.txt (100%) diff --git a/requirements/base.txt b/requirements/edx/base.txt similarity index 100% rename from requirements/base.txt rename to requirements/edx/base.txt diff --git a/requirements/github.txt b/requirements/edx/github.txt similarity index 100% rename from requirements/github.txt rename to requirements/edx/github.txt diff --git a/requirements/local.txt b/requirements/edx/local.txt similarity index 100% rename from requirements/local.txt rename to requirements/edx/local.txt diff --git a/requirements/post.txt b/requirements/edx/post.txt similarity index 100% rename from requirements/post.txt rename to requirements/edx/post.txt diff --git a/requirements/repo.txt b/requirements/edx/repo.txt similarity index 100% rename from requirements/repo.txt rename to requirements/edx/repo.txt From 50160592f7def3b6c86b8b44bfe22005ec2d1888 Mon Sep 17 00:00:00 2001 From: John Jarvis Date: Thu, 16 May 2013 12:13:40 -0400 Subject: [PATCH 2/3] new location for requirement files --- README.md | 4 ++-- rakefiles/prereqs.rake | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 90b82ff07a..ed52c21fb2 100644 --- a/README.md +++ b/README.md @@ -77,8 +77,8 @@ environment), and Node has a library installer called Once you've got your languages and virtual environments set up, install the libraries like so: - $ pip install -r requirements/base.txt - $ pip install -r requirements/post.txt + $ pip install -r requirements/edx/base.txt + $ pip install -r requirements/edx/post.txt $ bundle install $ npm install diff --git a/rakefiles/prereqs.rake b/rakefiles/prereqs.rake index 430e650127..9a2d7ccd17 100644 --- a/rakefiles/prereqs.rake +++ b/rakefiles/prereqs.rake @@ -28,12 +28,12 @@ desc "Install all python prerequisites for the lms and cms" task :install_python_prereqs => "ws:migrate" do when_changed('requirements/**') do ENV['PIP_DOWNLOAD_CACHE'] ||= '.pip_download_cache' - sh('pip install --exists-action w -r requirements/base.txt') - sh('pip install --exists-action w -r requirements/post.txt') + sh('pip install --exists-action w -r requirements/edx/base.txt') + sh('pip install --exists-action w -r requirements/edx/post.txt') # Check for private-requirements.txt: used to install our libs as working dirs, # or personal-use tools. if File.file?("requirements/private.txt") sh('pip install -r requirements/private.txt') end end unless ENV['NO_PREREQ_INSTALL'] -end \ No newline at end of file +end From a30e31213b2ef7cc46606891a4db5e0fb9d563fe Mon Sep 17 00:00:00 2001 From: John Jarvis Date: Thu, 16 May 2013 12:16:21 -0400 Subject: [PATCH 3/3] rakefile updates --- rakefiles/django.rake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rakefiles/django.rake b/rakefiles/django.rake index 594c7d6ec3..1a021c71b8 100644 --- a/rakefiles/django.rake +++ b/rakefiles/django.rake @@ -5,7 +5,7 @@ default_options = { task :predjango => :install_python_prereqs do sh("find . -type f -name *.pyc -delete") - sh('pip install -q --no-index -r requirements/local.txt') + sh('pip install -q --no-index -r requirements/edx/local.txt') end @@ -122,4 +122,4 @@ namespace :cms do "Example: \`rake cms:export COURSE_ID=MITx/12345/name OUTPUT_PATH=foo.tar.gz\`" end end -end \ No newline at end of file +end