Commit 39cb599a by Gregory Martin

refactor app name

parent f7cb3e44
...@@ -8,7 +8,7 @@ install: pip install pep8 ...@@ -8,7 +8,7 @@ install: pip install pep8
# build tests # build tests
script: script:
- python common/tests/test_build.py - python video_common/tests/test_build.py
- pep8 - pep8
- cd control/tests nosetests - cd control/tests nosetests
...@@ -16,7 +16,7 @@ project_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) ...@@ -16,7 +16,7 @@ project_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
if project_path not in sys.path: if project_path not in sys.path:
sys.path.append(project_path) sys.path.append(project_path)
os.environ['DJANGO_SETTINGS_MODULE'] = 'common.settings' os.environ['DJANGO_SETTINGS_MODULE'] = 'video_common.settings'
django.setup() django.setup()
......
...@@ -14,7 +14,7 @@ project_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) ...@@ -14,7 +14,7 @@ project_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
if project_path not in sys.path: if project_path not in sys.path:
sys.path.append(project_path) sys.path.append(project_path)
os.environ['DJANGO_SETTINGS_MODULE'] = 'common.settings' os.environ['DJANGO_SETTINGS_MODULE'] = 'video_common.settings'
django.setup() django.setup()
......
...@@ -3,7 +3,7 @@ import os ...@@ -3,7 +3,7 @@ import os
import sys import sys
if __name__ == "__main__": if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "common.settings") os.environ.setdefault("DJANGO_SETTINGS_MODULE", "video_common.settings")
from django.core.management import execute_from_command_line from django.core.management import execute_from_command_line
......
""" """
VEDA's Django Secrets Shim Video Pipeline Django Secrets Shim
This acts as a django-secret shimmer until we can finish pushing all changes to terraform/prod This acts as a django-secret shimmer until we can finish pushing all changes to terraform/prod
......
...@@ -102,10 +102,10 @@ X_FRAME_OPTIONS = 'DENY' ...@@ -102,10 +102,10 @@ X_FRAME_OPTIONS = 'DENY'
SECURE_SSL_REDIRECT = False SECURE_SSL_REDIRECT = False
SECURE_CONTENT_TYPE_NOSNIFF = True SECURE_CONTENT_TYPE_NOSNIFF = True
SECURE_BROWSER_XSS_FILTER = True SECURE_BROWSER_XSS_FILTER = True
ROOT_URLCONF = 'common.urls' ROOT_URLCONF = 'video_common.urls'
# Python dotted path to the WSGI application used by Django's runserver. # Python dotted path to the WSGI application used by Django's runserver.
WSGI_APPLICATION = 'common.wsgi.application' WSGI_APPLICATION = 'video_common.wsgi.application'
REST_FRAMEWORK = { REST_FRAMEWORK = {
......
...@@ -5,13 +5,14 @@ sys.path.append(os.path.abspath(__file__)) ...@@ -5,13 +5,14 @@ sys.path.append(os.path.abspath(__file__))
os.environ['DJANGO_SETTINGS_MODULE'] = 'settings' os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
from django.conf import settings from django.conf import settings
from rest_framework.routers import DefaultRouter from rest_framework import routers
# from rest_framework.routers import DefaultRouter
from django.conf.urls import patterns, include, url from django.conf.urls import patterns, include, url
from django.contrib import admin from django.contrib import admin
from VEDA_OS01 import views from VEDA_OS01 import views
router = DefaultRouter() router = routers.DefaultRouter()
admin.autodiscover() admin.autodiscover()
router.register(r'courses', views.CourseViewSet) router.register(r'courses', views.CourseViewSet)
......
...@@ -5,5 +5,5 @@ from django.core.wsgi import get_wsgi_application ...@@ -5,5 +5,5 @@ from django.core.wsgi import get_wsgi_application
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
os.environ.setdefault("PYTHON_EGG_CACHE", BASE_DIR + "/egg_cache") os.environ.setdefault("PYTHON_EGG_CACHE", BASE_DIR + "/egg_cache")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "common.settings") os.environ.setdefault("DJANGO_SETTINGS_MODULE", "video_common.settings")
application = get_wsgi_application() application = get_wsgi_application()
...@@ -20,7 +20,7 @@ project_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) ...@@ -20,7 +20,7 @@ project_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
if project_path not in sys.path: if project_path not in sys.path:
sys.path.append(project_path) sys.path.append(project_path)
os.environ['DJANGO_SETTINGS_MODULE'] = 'common.settings' os.environ['DJANGO_SETTINGS_MODULE'] = 'video_common.settings'
django.setup() django.setup()
......
...@@ -21,7 +21,7 @@ from django.utils.timezone import utc ...@@ -21,7 +21,7 @@ from django.utils.timezone import utc
project_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) project_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
if project_path not in sys.path: if project_path not in sys.path:
sys.path.append(project_path) sys.path.append(project_path)
os.environ['DJANGO_SETTINGS_MODULE'] = 'common.settings' os.environ['DJANGO_SETTINGS_MODULE'] = 'video_common.settings'
django.setup() django.setup()
from VEDA_OS01.models import Video, Encode, URL from VEDA_OS01.models import Video, Encode, URL
......
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