Apps & Requirements Folders Restructured & travis file updated.

ncs-jss · Jan 20, 2017 · 46e05d7 · 46e05d7
1 parent da4cfd5
commit 46e05d7
Show file tree

Hide file tree

Showing 86 changed files with 8 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -76,6 +76,7 @@ HTTP_200/static/ckeditor
 HTTP_200/static/rest_framework
 HTTP_200/static/debug_toolbar
 HTTP_200/static/admin
+HTTP_200/config_keys.py
 
 connect_uwsgi.ini
 
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ python:
 # command to install dependencies
 install:
 - pip install --upgrade pip
-- pip install -r requirements.txt
+- pip install -r requirements/dev.txt
 - pip install coveralls
 
 # script: coverage

diff --git a/HTTP_200/settings.py b/HTTP_200/settings.py
@@ -119,8 +119,8 @@
         'NAME': config_keys.DATABASE_NAME,
         'USER': config_keys.MYSQL_USERNAME,
         'PASSWORD': config_keys.MYSQL_PASSWORD,
-        'HOST': 'localhost',   # Or an IP Address that your DB is hosted on
-        'PORT': '3306',
+        'HOST': config_keys.HOST,   # Or an IP Address that your DB is hosted on
+        'PORT': config_keys.PORT,
     }
 }
 

diff --git a/feeds/__init__.py → apps/feeds/__init__.py b/feeds/__init__.py → apps/feeds/__init__.py
diff --git a/feeds/admin.py → apps/feeds/admin.py b/feeds/admin.py → apps/feeds/admin.py
diff --git a/feeds/filters.py → apps/feeds/filters.py b/feeds/filters.py → apps/feeds/filters.py
diff --git a/feeds/forms.py → apps/feeds/forms.py b/feeds/forms.py → apps/feeds/forms.py
diff --git a/feeds/migrations/0001_initial.py → apps/feeds/migrations/0001_initial.py b/feeds/migrations/0001_initial.py → apps/feeds/migrations/0001_initial.py
diff --git a/feeds/migrations/0002_auto_20150621_0935.py → ...eds/migrations/0002_auto_20150621_0935.py b/feeds/migrations/0002_auto_20150621_0935.py → ...eds/migrations/0002_auto_20150621_0935.py
diff --git a/...igrations/0003_faculty_alternate_email.py → ...igrations/0003_faculty_alternate_email.py b/...igrations/0003_faculty_alternate_email.py → ...igrations/0003_faculty_alternate_email.py
diff --git a/feeds/migrations/0004_auto_20150621_0949.py → ...eds/migrations/0004_auto_20150621_0949.py b/feeds/migrations/0004_auto_20150621_0949.py → ...eds/migrations/0004_auto_20150621_0949.py
diff --git a/feeds/migrations/0005_auto_20150621_1012.py → ...eds/migrations/0005_auto_20150621_1012.py b/feeds/migrations/0005_auto_20150621_1012.py → ...eds/migrations/0005_auto_20150621_1012.py
diff --git a/feeds/migrations/0006_auto_20150621_1013.py → ...eds/migrations/0006_auto_20150621_1013.py b/feeds/migrations/0006_auto_20150621_1013.py → ...eds/migrations/0006_auto_20150621_1013.py
diff --git a/feeds/migrations/0007_auto_20150621_1036.py → ...eds/migrations/0007_auto_20150621_1036.py b/feeds/migrations/0007_auto_20150621_1036.py → ...eds/migrations/0007_auto_20150621_1036.py
diff --git a/feeds/migrations/0008_auto_20150621_1108.py → ...eds/migrations/0008_auto_20150621_1108.py b/feeds/migrations/0008_auto_20150621_1108.py → ...eds/migrations/0008_auto_20150621_1108.py
diff --git a/feeds/migrations/0009_auto_20150621_1118.py → ...eds/migrations/0009_auto_20150621_1118.py b/feeds/migrations/0009_auto_20150621_1118.py → ...eds/migrations/0009_auto_20150621_1118.py
diff --git a/feeds/migrations/0010_student_email_id.py → ...feeds/migrations/0010_student_email_id.py b/feeds/migrations/0010_student_email_id.py → ...feeds/migrations/0010_student_email_id.py
diff --git a/feeds/migrations/0011_faculty_email_id.py → ...feeds/migrations/0011_faculty_email_id.py b/feeds/migrations/0011_faculty_email_id.py → ...feeds/migrations/0011_faculty_email_id.py
diff --git a/feeds/migrations/0012_auto_20150630_0828.py → ...eds/migrations/0012_auto_20150630_0828.py b/feeds/migrations/0012_auto_20150630_0828.py → ...eds/migrations/0012_auto_20150630_0828.py
diff --git a/feeds/migrations/0013_auto_20150630_0840.py → ...eds/migrations/0013_auto_20150630_0840.py b/feeds/migrations/0013_auto_20150630_0840.py → ...eds/migrations/0013_auto_20150630_0840.py
diff --git a/feeds/migrations/0014_auto_20150630_0845.py → ...eds/migrations/0014_auto_20150630_0845.py b/feeds/migrations/0014_auto_20150630_0845.py → ...eds/migrations/0014_auto_20150630_0845.py
diff --git a/feeds/migrations/0015_auto_20150718_0618.py → ...eds/migrations/0015_auto_20150718_0618.py b/feeds/migrations/0015_auto_20150718_0618.py → ...eds/migrations/0015_auto_20150718_0618.py
diff --git a/feeds/migrations/0016_auto_20151030_1159.py → ...eds/migrations/0016_auto_20151030_1159.py b/feeds/migrations/0016_auto_20151030_1159.py → ...eds/migrations/0016_auto_20151030_1159.py
diff --git a/feeds/migrations/__init__.py → apps/feeds/migrations/__init__.py b/feeds/migrations/__init__.py → apps/feeds/migrations/__init__.py
diff --git a/feeds/models.py → apps/feeds/models.py b/feeds/models.py → apps/feeds/models.py
diff --git a/feeds/permissions.py → apps/feeds/permissions.py b/feeds/permissions.py → apps/feeds/permissions.py
diff --git a/feeds/search_indexes.py → apps/feeds/search_indexes.py b/feeds/search_indexes.py → apps/feeds/search_indexes.py
diff --git a/feeds/serializers.py → apps/feeds/serializers.py b/feeds/serializers.py → apps/feeds/serializers.py
diff --git a/feeds/tests.py → apps/feeds/tests.py b/feeds/tests.py → apps/feeds/tests.py
diff --git a/feeds/urls.py → apps/feeds/urls.py b/feeds/urls.py → apps/feeds/urls.py
diff --git a/feeds/views.py → apps/feeds/views.py b/feeds/views.py → apps/feeds/views.py
diff --git a/notices/__init__.py → apps/notices/__init__.py b/notices/__init__.py → apps/notices/__init__.py
diff --git a/notices/admin.py → apps/notices/admin.py b/notices/admin.py → apps/notices/admin.py
diff --git a/notices/api/__init__.py → apps/notices/api/__init__.py b/notices/api/__init__.py → apps/notices/api/__init__.py
diff --git a/notices/api/apps.py → apps/notices/api/apps.py b/notices/api/apps.py → apps/notices/api/apps.py
diff --git a/notices/api/pagination.py → apps/notices/api/pagination.py b/notices/api/pagination.py → apps/notices/api/pagination.py
diff --git a/notices/api/permissions.py → apps/notices/api/permissions.py b/notices/api/permissions.py → apps/notices/api/permissions.py
diff --git a/notices/api/serializers.py → apps/notices/api/serializers.py b/notices/api/serializers.py → apps/notices/api/serializers.py
diff --git a/notices/api/urls.py → apps/notices/api/urls.py b/notices/api/urls.py → apps/notices/api/urls.py
diff --git a/notices/api/views.py → apps/notices/api/views.py b/notices/api/views.py → apps/notices/api/views.py
diff --git a/notices/decorators.py → apps/notices/decorators.py b/notices/decorators.py → apps/notices/decorators.py
diff --git a/notices/forms.py → apps/notices/forms.py b/notices/forms.py → apps/notices/forms.py
diff --git a/notices/migrations/0001_initial.py → apps/notices/migrations/0001_initial.py b/notices/migrations/0001_initial.py → apps/notices/migrations/0001_initial.py
diff --git a/notices/migrations/__init__.py → apps/notices/migrations/__init__.py b/notices/migrations/__init__.py → apps/notices/migrations/__init__.py
diff --git a/notices/models.py → apps/notices/models.py b/notices/models.py → apps/notices/models.py
diff --git a/notices/permissions.py → apps/notices/permissions.py b/notices/permissions.py → apps/notices/permissions.py
diff --git a/notices/tests.py → apps/notices/tests.py b/notices/tests.py → apps/notices/tests.py
diff --git a/notices/urls.py → apps/notices/urls.py b/notices/urls.py → apps/notices/urls.py
diff --git a/notices/views.py → apps/notices/views.py b/notices/views.py → apps/notices/views.py
diff --git a/private_notices/__init__.py → apps/private_notices/__init__.py b/private_notices/__init__.py → apps/private_notices/__init__.py
diff --git a/private_notices/admin.py → apps/private_notices/admin.py b/private_notices/admin.py → apps/private_notices/admin.py
diff --git a/private_notices/forms.py → apps/private_notices/forms.py b/private_notices/forms.py → apps/private_notices/forms.py
diff --git a/private_notices/migrations/0001_initial.py → ...rivate_notices/migrations/0001_initial.py b/private_notices/migrations/0001_initial.py → ...rivate_notices/migrations/0001_initial.py
diff --git a/private_notices/migrations/__init__.py → apps/private_notices/migrations/__init__.py b/private_notices/migrations/__init__.py → apps/private_notices/migrations/__init__.py
diff --git a/private_notices/models.py → apps/private_notices/models.py b/private_notices/models.py → apps/private_notices/models.py
diff --git a/private_notices/serializers.py → apps/private_notices/serializers.py b/private_notices/serializers.py → apps/private_notices/serializers.py
diff --git a/private_notices/tests.py → apps/private_notices/tests.py b/private_notices/tests.py → apps/private_notices/tests.py
diff --git a/private_notices/urls.py → apps/private_notices/urls.py b/private_notices/urls.py → apps/private_notices/urls.py
diff --git a/private_notices/views.py → apps/private_notices/views.py b/private_notices/views.py → apps/private_notices/views.py
diff --git a/profiles/__init__.py → apps/profiles/__init__.py b/profiles/__init__.py → apps/profiles/__init__.py
diff --git a/profiles/admin.py → apps/profiles/admin.py b/profiles/admin.py → apps/profiles/admin.py
diff --git a/profiles/api/__init__.py → apps/profiles/api/__init__.py b/profiles/api/__init__.py → apps/profiles/api/__init__.py
diff --git a/profiles/api/serializers.py → apps/profiles/api/serializers.py b/profiles/api/serializers.py → apps/profiles/api/serializers.py
diff --git a/profiles/api/urls.py → apps/profiles/api/urls.py b/profiles/api/urls.py → apps/profiles/api/urls.py
diff --git a/profiles/api/views.py → apps/profiles/api/views.py b/profiles/api/views.py → apps/profiles/api/views.py
diff --git a/profiles/forms.py → apps/profiles/forms.py b/profiles/forms.py → apps/profiles/forms.py
diff --git a/profiles/management/__init__.py → apps/profiles/management/__init__.py b/profiles/management/__init__.py → apps/profiles/management/__init__.py
diff --git a/profiles/management/commands/__init__.py → .../profiles/management/commands/__init__.py b/profiles/management/commands/__init__.py → .../profiles/management/commands/__init__.py
diff --git a/profiles/management/commands/createdata.py → ...rofiles/management/commands/createdata.py b/profiles/management/commands/createdata.py → ...rofiles/management/commands/createdata.py
diff --git a/profiles/migrations/0001_initial.py → apps/profiles/migrations/0001_initial.py b/profiles/migrations/0001_initial.py → apps/profiles/migrations/0001_initial.py
diff --git a/profiles/migrations/__init__.py → apps/profiles/migrations/__init__.py b/profiles/migrations/__init__.py → apps/profiles/migrations/__init__.py
diff --git a/profiles/models.py → apps/profiles/models.py b/profiles/models.py → apps/profiles/models.py
diff --git a/profiles/permissions.py → apps/profiles/permissions.py b/profiles/permissions.py → apps/profiles/permissions.py
diff --git a/profiles/test.html → apps/profiles/test.html b/profiles/test.html → apps/profiles/test.html
diff --git a/profiles/tests.py → apps/profiles/tests.py b/profiles/tests.py → apps/profiles/tests.py
diff --git a/profiles/urls.py → apps/profiles/urls.py b/profiles/urls.py → apps/profiles/urls.py
diff --git a/profiles/views.py → apps/profiles/views.py b/profiles/views.py → apps/profiles/views.py
diff --git a/wifi/__init__.py → apps/wifi/__init__.py b/wifi/__init__.py → apps/wifi/__init__.py
diff --git a/wifi/admin.py → apps/wifi/admin.py b/wifi/admin.py → apps/wifi/admin.py
diff --git a/wifi/forms.py → apps/wifi/forms.py b/wifi/forms.py → apps/wifi/forms.py
diff --git a/wifi/models.py → apps/wifi/models.py b/wifi/models.py → apps/wifi/models.py
diff --git a/wifi/tests.py → apps/wifi/tests.py b/wifi/tests.py → apps/wifi/tests.py
diff --git a/wifi/urls.py → apps/wifi/urls.py b/wifi/urls.py → apps/wifi/urls.py
diff --git a/wifi/views.py → apps/wifi/views.py b/wifi/views.py → apps/wifi/views.py
diff --git a/requirements.txt → requirements/common.txt b/requirements.txt → requirements/common.txt
@@ -18,3 +18,4 @@ pytest-django==2.9.1
 django-import-export==0.4.2
 flake8
 XlsxWriter==0.9.3
+`
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -0,0 +1,3 @@
+-r common.txt
+
+drfdocs==0.0.11