Commit 8fd9b05e by Calen Pennington

Merge pull request #164 from MITx/dormsbee/multicourse

Dormsbee/multicourse
parents 488e3575 61e593ca
...@@ -25,7 +25,7 @@ PACKAGE_REPO = "packages@gp.mitx.mit.edu:/opt/pkgrepo.incoming" ...@@ -25,7 +25,7 @@ PACKAGE_REPO = "packages@gp.mitx.mit.edu:/opt/pkgrepo.incoming"
NORMALIZED_DEPLOY_NAME = DEPLOY_NAME.downcase().gsub(/[_\/]/, '-') NORMALIZED_DEPLOY_NAME = DEPLOY_NAME.downcase().gsub(/[_\/]/, '-')
INSTALL_DIR_PATH = File.join(DEPLOY_DIR, NORMALIZED_DEPLOY_NAME) 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 # Set up the clean and clobber tasks
CLOBBER.include(BUILD_DIR, REPORT_DIR, 'cover*', '.coverage', 'test_root/*_repo') CLOBBER.include(BUILD_DIR, REPORT_DIR, 'cover*', '.coverage', 'test_root/*_repo')
CLEAN.include("#{BUILD_DIR}/*.deb", "#{BUILD_DIR}/util") CLEAN.include("#{BUILD_DIR}/*.deb", "#{BUILD_DIR}/util")
...@@ -150,6 +150,13 @@ task :package do ...@@ -150,6 +150,13 @@ task :package do
ln -s #{INSTALL_DIR_PATH} #{LINK_PATH} ln -s #{INSTALL_DIR_PATH} #{LINK_PATH}
chown makeitso:makeitso #{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 # Delete mako temp files
rm -rf /tmp/tmp*mako rm -rf /tmp/tmp*mako
......
-e common/lib/capa
-e common/lib/mitxmako
-e common/lib/xmodule
...@@ -20,9 +20,6 @@ sympy ...@@ -20,9 +20,6 @@ sympy
newrelic newrelic
glob2 glob2
pymongo pymongo
-e common/lib/capa
-e common/lib/mitxmako
-e common/lib/xmodule
django_nose django_nose
nosexcover nosexcover
rednose rednose
...@@ -42,4 +39,5 @@ django-masquerade ...@@ -42,4 +39,5 @@ django-masquerade
django-robots django-robots
django-ses django-ses
django-storages django-storages
django-threaded-multihost django-threaded-multihost
\ No newline at end of file -f repo-requirements.txt
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment