Merge pull request #3487 from edx/ammar/fix-paver-python-prereq-paths

Fix paver python prereq paths
2014-05-28 20:17:19 +05:00
parent 1208f27102 69c1b8997d
commit 8809c5f0e0
3 changed files with 2 additions and 4 deletions
--- a/pavelib/prereqs.py
+++ b/pavelib/prereqs.py
@@ -13,6 +13,8 @@ PREREQS_MD5_DIR = os.getenv('PREREQ_CACHE_DIR', Env.REPO_ROOT / '.prereqs_cache'
 NPM_REGISTRY = "http://registry.npmjs.org/"
 PYTHON_REQ_FILES = [
    'requirements/edx/pre.txt',
+    'requirements/edx/github.txt',
+    'requirements/edx/local.txt',
    'requirements/edx/base.txt',
    'requirements/edx/post.txt',
 ]
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -4,8 +4,6 @@
 #   * @jtauber - to check licensing
 #   * One of @e0d, @jarv, or @feanil - to check system requirements

-r repo.txt
-
 beautifulsoup4==4.1.3
 beautifulsoup==3.2.1
 bleach==1.4
--- a/requirements/edx/repo.txt
+++ b/requirements/edx/repo.txt
@@ -1,2 +0,0 @@
-r github.txt
-r local.txt