From 337f109af7a9ca2d4ff6f6d6c5a6a1a45439ccfc Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Thu, 16 Aug 2012 10:52:15 -0400 Subject: [PATCH 1/2] Moved django-wiki submodule to be a pip install from git. --- .gitmodules | 3 --- lms/djangoapps/django-wiki | 1 - requirements.txt | 1 + 3 files changed, 1 insertion(+), 4 deletions(-) delete mode 160000 lms/djangoapps/django-wiki diff --git a/.gitmodules b/.gitmodules index 76d1f7d672..72ec77d0e2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "askbot"] path = askbot url = git@github.com:MITx/askbot-devel.git -[submodule "lms/djangoapps/django-wiki"] - path = lms/djangoapps/django-wiki - url = git@github.com:benjaoming/django-wiki.git diff --git a/lms/djangoapps/django-wiki b/lms/djangoapps/django-wiki deleted file mode 160000 index 484ff1ce49..0000000000 --- a/lms/djangoapps/django-wiki +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 484ff1ce497574045e78d4e3ea0ff55ac9b4bd30 diff --git a/requirements.txt b/requirements.txt index 983b4c5547..1362b5b808 100644 --- a/requirements.txt +++ b/requirements.txt @@ -44,4 +44,5 @@ django-ses django-storages django-threaded-multihost django-sekizai<0.7 +git+git://github.com/benjaoming/django-wiki.git@484ff1ce49 -r repo-requirements.txt From c4b362ca71117fc9985eae723ddf0b1615373863 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Thu, 16 Aug 2012 10:56:33 -0400 Subject: [PATCH 2/2] Removed old path include for django-wiki. --- lms/envs/common.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lms/envs/common.py b/lms/envs/common.py index 4d30870a66..48fe931869 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -84,7 +84,6 @@ sys.path.append(REPO_ROOT) sys.path.append(ASKBOT_ROOT) sys.path.append(ASKBOT_ROOT / "askbot" / "deps") sys.path.append(PROJECT_ROOT / 'djangoapps') -sys.path.append(PROJECT_ROOT / 'djangoapps' / 'django-wiki') sys.path.append(PROJECT_ROOT / 'lib') sys.path.append(COMMON_ROOT / 'djangoapps') sys.path.append(COMMON_ROOT / 'lib')