Commits

Luke Plant committed 85a5d99 Merge

Merged from default

Comments (0)

Files changed (2)

 #  project/    - holds a checkout of this repository
 #                i.e. fabfile.py and siblings live in that dir.
 #
-#  deps/       - holds all dependendencies that I have had to fork to add fixes,
-#                or that don't have proper packages.  These are all mirrored on
-#                github or bitbucket under the account 'spookylukey'.  Currently
-#                includes:
-#                 - diff_match_patch from google
-#
-#                These can be symlinks
-#
 #  usermedia/  - corresponds to MEDIA_ROOT
 #
 #  secure_downloads/     - corresponds to SECUREDOWNLOAD_SERVE_ROOT
 #       src-2010-10-11_07-20-34/
 #          env/                    # virtualenv dir
 #          project/                # uploaded from local
-#          deps/
-#            django/
-#            django-mailer/        # etc
 #          static/                 # built once uploaded
 #       current/                   # symlink to src-???
 
 
 # The path (relative to parent_dir) to where the project source code is stored:
 project_dir = 'project'
-# The relative path to where the dependencies source code is stored (for those
-# not installed using pip)
-deps_dir = 'deps'
 usermedia_local = os.path.join(parent_dir, 'usermedia')
 usermedia_production = os.path.join(webapps_root, 'cciw_usermedia')
 
-def _get_subdirs(dirname):
-    return [f for f in os.listdir(dirname)
-            if os.path.isdir(join(dirname, f))]
-
-deps = _get_subdirs(join(parent_dir, deps_dir))
-
 class Target(object):
     """
     Represents a place where the project is deployed to.
         # src_dir - the root of all sources for this version
         self.src_dir = src_dir
         # venv_dir - note that _update_virtualenv assumes this relative layout
-        # of the 'env' dir and the 'project' and 'deps' dirs.
+        # of the 'env' dir and the 'project' dir
         self.venv_dir = join(self.src_dir, 'env')
         # project_dir - where the CCIW project srcs are stored.
         self.project_dir = join(self.src_dir, project_dir)
-        # deps_dir - where additional dependencies are stored
-        self.deps_dir = join(self.src_dir, deps_dir)
         # static_dir - this is defined with way in settings.py
         self.static_dir = join(self.src_dir, 'static')
 
-        self.additional_sys_paths = [join(deps_dir, d) for d in deps] + [project_dir]
+        self.additional_sys_paths = [project_dir]
 
 STAGING = Target(
     django_app = "cciw_staging",
             with cd(version.project_dir):
                 run_venv("pip install -r requirements.txt")
 
-        # Need to add project and deps to path.
-        # Could do 'python setup.py develop' but not all projects support it
+        # Need to add project to path.
         pth_file = '\n'.join("../../../../" + n for n in version.additional_sys_paths)
         pth_name = "deps.pth"
         with open(pth_name, "w") as fd:
     with lcd(parent_dir):
         # rsync the project.
         rsync_dir(project_dir, version.project_dir)
-        # rsync the deps
-        rsync_dir(deps_dir, version.deps_dir)
 
 
 def _copy_protected_downloads():
 -e git://github.com/jtauber/django-mailer.git@840d25bb9d#egg=django-mailer
 -e hg+https://bitbucket.org/spookylukey/django-autocomplete/@28490de155fb#egg=django-autocomplete
 -e git://github.com/spookylukey/djiki.git@fa8031ee46#egg=djiki
+diff-match-patch
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.