From 1219bd757e54dac667afead2f57ba42a7ce06565 Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Wed, 19 Mar 2014 15:17:45 -0400 Subject: [PATCH] Pull Paver requirements out into a separate file --- rakelib/assets_deprecated.rake | 2 +- rakelib/devstack_deprecated.rake | 2 +- rakelib/django_deprecated.rake | 2 +- rakelib/docs_deprecated.rake | 2 +- rakelib/prereqs_deprecated.rake | 2 +- requirements/edx/base.txt | 2 -- requirements/edx/paver.txt | 5 +++++ 7 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 requirements/edx/paver.txt diff --git a/rakelib/assets_deprecated.rake b/rakelib/assets_deprecated.rake index 7af0a60b96..fe712d25d2 100644 --- a/rakelib/assets_deprecated.rake +++ b/rakelib/assets_deprecated.rake @@ -7,7 +7,7 @@ def deprecated(deprecated, deprecated_by, *args) task deprecated, [:system, :env] do |t,args| # Need to install paver dependencies for the commands to work! - sh("pip install Paver==1.2.1 psutil==1.2.1 lazy==1.1 path.py==3.0.1") + sh("pip install -r requirements/edx/paver.txt") args.with_defaults(:system => "lms", :env => "dev") diff --git a/rakelib/devstack_deprecated.rake b/rakelib/devstack_deprecated.rake index 46bcc039a9..34c506de86 100644 --- a/rakelib/devstack_deprecated.rake +++ b/rakelib/devstack_deprecated.rake @@ -7,7 +7,7 @@ def deprecated(deprecated, deprecated_by, *args) task deprecated, [:system] do |t,args| # Need to install paver dependencies for the commands to work! - sh("pip install Paver==1.2.1 psutil==1.2.1 lazy==1.1 path.py==3.0.1") + sh("pip install -r requirements/edx/paver.txt") args.with_defaults(:system => 'lms') deprecated_by = "#{deprecated_by} #{args.system}" diff --git a/rakelib/django_deprecated.rake b/rakelib/django_deprecated.rake index c00feb58c0..45f73bd689 100644 --- a/rakelib/django_deprecated.rake +++ b/rakelib/django_deprecated.rake @@ -7,7 +7,7 @@ def deprecated(deprecated, deprecated_by) task deprecated, [:arg1, :arg2, :arg3, :arg4] do |t,args| # Need to install paver dependencies for the commands to work! - sh("pip install Paver==1.2.1 psutil==1.2.1 lazy==1.1 path.py==3.0.1") + sh("pip install -r requirements/edx/paver.txt") if deprecated == "cms" or deprecated == "lms" args.with_defaults(:arg1 => "dev", :arg2 => "") diff --git a/rakelib/docs_deprecated.rake b/rakelib/docs_deprecated.rake index a6d9ab0fe6..bc4bf0dda5 100644 --- a/rakelib/docs_deprecated.rake +++ b/rakelib/docs_deprecated.rake @@ -7,7 +7,7 @@ def deprecated(deprecated, deprecated_by) task deprecated, [:type, :quiet] do |t,args| # Need to install paver dependencies for the commands to work! - sh("pip install Paver==1.2.1 psutil==1.2.1 lazy==1.1 path.py==3.0.1") + sh("pip install -r requirements/edx/paver.txt") args.with_defaults(:quiet => "quiet") new_cmd = [deprecated_by] diff --git a/rakelib/prereqs_deprecated.rake b/rakelib/prereqs_deprecated.rake index 792fdc9298..8f9a8f5154 100644 --- a/rakelib/prereqs_deprecated.rake +++ b/rakelib/prereqs_deprecated.rake @@ -7,7 +7,7 @@ def deprecated(deprecated, deprecated_by) task deprecated do # Need to install paver dependencies for the commands to work! - sh("pip install Paver==1.2.1 psutil==1.2.1 lazy==1.1 path.py==3.0.1") + sh("pip install -r requirements/edx/paver.txt") puts("Task #{deprecated} has been deprecated. Use #{deprecated_by} instead.".red) sh(deprecated_by) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index cfd93c8071..91c3f77ba9 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -49,11 +49,9 @@ nltk==2.0.4 oauthlib==0.5.1 paramiko==1.9.0 path.py==3.0.1 -Paver==1.2.1 Pillow==1.7.8 pip>=1.4 polib==1.0.3 -psutil==1.2.1 pycrypto>=2.6 pygments==1.6 pygraphviz==1.1 diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt new file mode 100644 index 0000000000..01ee9edeb0 --- /dev/null +++ b/requirements/edx/paver.txt @@ -0,0 +1,5 @@ +# Requirements to run Paver +Paver==1.2.1 +psutil==1.2.1 +lazy==1.1 +path.py==3.0.1