Permalink
Browse files

* Added figleaf and coverage to the code quality requirements section

* Fixed the framework_path - static files are working
  • Loading branch information...
1 parent fd878ab commit b0fc3da5d377f90ef50cbd0282829f2f846719ac @zalun zalun committed Oct 14, 2010
Showing with 12 additions and 10 deletions.
  1. +2 −0 .gitignore
  2. +3 −1 requirements/development.txt
  3. +4 −6 settings.py
  4. +3 −3 urls.py
View
@@ -15,3 +15,5 @@ flightdeck/jetpack/media/media
upload
sdk_versions
settings_local.py
+.coverage
+.figleaf
@@ -16,8 +16,10 @@ nose
mock
# translate-toolkit==1.6.0
-#editing
+# code quality
pylint
+coverage
+figleaf
# check before commit
-e git://github.com/jbalogh/check.git#egg=check
View
@@ -52,15 +52,13 @@
MEDIA_ROOT = path('media')
-FRAMEWORK_PATH = os.path.dirname(os.path.dirname(__file__)) + '/'
+FRAMEWORK_PATH = path()
SDK_SOURCE_DIR = path('lib') # TODO: remove this var
-MEDIA_PREFIX = os.path.join(FRAMEWORK_PATH, 'flightdeck/')
+APP_MEDIA_PREFIX = os.path.join(FRAMEWORK_PATH, 'apps')
VIRTUAL_ENV = os.environ.get('VIRTUAL_ENV')
# Media section
-MEDIA_ROOT = '' # this will get overwritten in settings_local.py
-MEDIA_PREFIX = '' # this will get overwritten in settings_local.py
-MEDIA_SUFFIX = 'media'
+APP_MEDIA_SUFFIX = 'media'
# URL that handles the media served from MEDIA_ROOT. Make sure to use a
# trailing slash if there is a path component (optional in other cases).
@@ -114,7 +112,7 @@
'person.context_processors.profile',
)
-ROOT_URLCONF = 'flightdeck.urls'
+ROOT_URLCONF = 'urls'
ADDONS_HELPER_URL = ('https://addons.mozilla.org/firefox/downloads/latest/'
'182410?src=external-builder')
View
@@ -28,15 +28,15 @@
# this should be used only in development server
url(r'^media/jetpack/(?P<path>.*)$', static.serve,
{'document_root': os.path.join(
- settings.MEDIA_PREFIX, 'jetpack', settings.MEDIA_SUFFIX)
+ settings.APP_MEDIA_PREFIX, 'jetpack', settings.APP_MEDIA_SUFFIX)
}, name='jetpack_media'),
url(r'^media/api/(?P<path>.*)$', static.serve,
{'document_root': os.path.join(
- settings.MEDIA_PREFIX, 'api', settings.MEDIA_SUFFIX)
+ settings.APP_MEDIA_PREFIX, 'api', settings.APP_MEDIA_SUFFIX)
}, name='api_media'),
url(r'^media/tutorial/(?P<path>.*)$', static.serve,
{'document_root': os.path.join(
- settings.MEDIA_PREFIX, 'tutorial', settings.MEDIA_SUFFIX)
+ settings.APP_MEDIA_PREFIX, 'tutorial', settings.APP_MEDIA_SUFFIX)
}, name='tutorial_media'),
url(r'^media/(?P<path>.*)$', static.serve,
{'document_root': settings.MEDIA_ROOT}, name='media'),

0 comments on commit b0fc3da

Please sign in to comment.