From 06edcc0f9b112d005b7fb4f30700d095563aa51d Mon Sep 17 00:00:00 2001 From: John Jarvis Date: Wed, 11 Jul 2012 09:16:54 -0400 Subject: [PATCH 1/2] adding repo-requirements for modules that are checked into the repo --- requirements.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 29d166fcee..5599215767 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,9 +20,6 @@ sympy newrelic glob2 pymongo --e common/lib/capa --e common/lib/mitxmako --e common/lib/xmodule django_nose nosexcover rednose @@ -42,4 +39,5 @@ django-masquerade django-robots django-ses django-storages -django-threaded-multihost \ No newline at end of file +django-threaded-multihost +-f repo-requirements.txt From 039cc405984d18520b02a6d3b9c4ab8710a5e367 Mon Sep 17 00:00:00 2001 From: John Jarvis Date: Wed, 11 Jul 2012 09:23:20 -0400 Subject: [PATCH 2/2] rakefile updated so that python modules in the package will be installed at package install time --- rakefile | 9 ++++++++- repo-requirements.txt | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 repo-requirements.txt diff --git a/rakefile b/rakefile index b621a4c70e..ae07ef230d 100644 --- a/rakefile +++ b/rakefile @@ -25,7 +25,7 @@ PACKAGE_REPO = "packages@gp.mitx.mit.edu:/opt/pkgrepo.incoming" NORMALIZED_DEPLOY_NAME = DEPLOY_NAME.downcase().gsub(/[_\/]/, '-') INSTALL_DIR_PATH = File.join(DEPLOY_DIR, NORMALIZED_DEPLOY_NAME) - +PIP_REPO_REQUIREMENTS = "#{INSTALL_DIR_PATH}/repo-requirements.txt" # Set up the clean and clobber tasks CLOBBER.include(BUILD_DIR, REPORT_DIR, 'cover*', '.coverage', 'test_root/*_repo') CLEAN.include("#{BUILD_DIR}/*.deb", "#{BUILD_DIR}/util") @@ -150,6 +150,13 @@ task :package do ln -s #{INSTALL_DIR_PATH} #{LINK_PATH} chown makeitso:makeitso #{LINK_PATH} + # install python modules that are in the package + if [ -r #{PIP_REPO_REQUIREMENTS} ]; then + cd #{INSTALL_DIR_PATH} + pip install -r #{PIP_REPO_REQUIREMENTS} + fi + + # Delete mako temp files rm -rf /tmp/tmp*mako diff --git a/repo-requirements.txt b/repo-requirements.txt new file mode 100644 index 0000000000..74bf02b5bd --- /dev/null +++ b/repo-requirements.txt @@ -0,0 +1,3 @@ +-e common/lib/capa +-e common/lib/mitxmako +-e common/lib/xmodule