Moving non-app directories in misc/ (except from script directory)

haribo
1 parent a4f64a3f
Showing 110 changed files with 22 additions and 25 deletions Show diff stats
install/install_requirements.sh
install/install_requirements_windows.bat
pyrosrun.sh
simulators/CameraNIR.py
simulators/CameraVIS.py
src/analyzer/tasks.py
src/golden_commands_and_notes
src/fixtures/initial_fixture.json -> src/misc/fixtures/initial_fixture.json
src/fixtures/tests/alert_mgr_test.json -> src/misc/fixtures/tests/alert_mgr_test.json
src/fixtures/tests/common_test.json -> src/misc/fixtures/tests/common_test.json
src/fixtures/tests/routine_mgr_test.json -> src/misc/fixtures/tests/routine_mgr_test.json
src/images/.gitkeep -> src/misc/images/.gitkeep
src/saved_requests/empty -> src/misc/saved_requests/empty
src/saved_requests/request50.xml -> src/misc/saved_requests/request50.xml
src/saved_requests/request63.xml -> src/misc/saved_requests/request63.xml
src/saved_requests/request_unittest.xml -> src/misc/saved_requests/request_unittest.xml
src/static/bootstrap/blank-page.html -> src/misc/static/bootstrap/blank-page.html
src/static/bootstrap/bootstrap-elements.html -> src/misc/static/bootstrap/bootstrap-elements.html
src/static/bootstrap/bootstrap-grid.html -> src/misc/static/bootstrap/bootstrap-grid.html
src/static/bootstrap/charts.html -> src/misc/static/bootstrap/charts.html
@@ -152,7 +152,7 @@ fi
 # echo $CREATE_SUPERUSER_SCRIPT | python ../src/manage.py shell
  
 echo $LOAD_FIXTURES
-python manage.py loaddata fixtures/initial_fixture.json 
+python manage.py loaddata misc/fixtures/initial_fixture.json 
  
 echo $TELL_SUPERUSER_CREATION
  
@@ -151,7 +151,7 @@ IF %ERRORLEVEL% NEQ 0 (
 )
  
 echo %LOAD_FIXTURES%
-python manage.py loaddata fixtures/initial_fixture.json
+python manage.py loaddata misc/fixtures/initial_fixture.json
  
 echo %CREATE_SUPERUSER%
 echo %CREATE_SUPERUSER_SCRIPT% | python ../src/manage.py shell
 #!/bin/bash
  
-NEEDED_ARGUMENT="One argument is needed. Possible arguments : [runserver|test]"
-INVALID_ARGUMENT="Invalid argument. Possible arguments : [runserver|test]"
+NEEDED_ARGUMENT="One argument is needed. Possible arguments : [server|test|dbupdate]"
+INVALID_ARGUMENT="Invalid argument. Possible arguments : [server|testdbupdate]"
  
 source private/venv_py3_pyros/bin/activate
  
@@ -19,6 +19,10 @@ case &quot;$1&quot; in
      "test")
 	python manage.py test
 	;;
+     "dbupdate")
+	python manage.py makemigrations
+	python manage.py migrate
+	;;
      *)
 	echo $INVALID_ARGUMENT
 	;;
@@ -5,7 +5,7 @@ import os
 from random import randint
 from Device import Device
  
-IMAGES_FOLDER = '../src/images'
+IMAGES_FOLDER = '../src/misc/images'
  
 EXPOSURE_TIME = 5
 SHUTTER_TIME = 3
@@ -5,7 +5,7 @@ import os
 from random import randint
 from Device import Device
  
-IMAGES_FOLDER = '../src/images'
+IMAGES_FOLDER = '../src/misc/images'
  
 EXPOSURE_TIME = 5
 SHUTTER_TIME = 3
@@ -6,7 +6,7 @@ from common.models import *
 import time
 import os
  
-IMAGES_FOLDER = "images"
+IMAGES_FOLDER = "misc/images"
  
 class analysis(Task):
     '''
@@ -1,11 +0,0 @@
->>> from celery.task.control import revoke
->>> revoke('435bd2c9-cb71-41a5-af8f-60b99e7ef8ad')
-
-Je devrais peut-être créer des groupes ou chords ou chain pour les execute_plan dans execute_sequence pour éviter le get()
-
-from majordome.tasks import execute_sequence as es
-
-res = es.apply_async((4,), countdown=30)
-res.id, res.state, res.ready(), ...
-
-pm dumpdata --indent=4 common auth.User > fixtures/initial_fixture.json
@@ -94,7 +94,7 @@ ROOT_URLCONF = &#39;pyros.urls&#39;
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': ['templates'],
+        'DIRS': ['misc/templates'],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -110,7 +110,7 @@ TEMPLATES = [
 WSGI_APPLICATION = 'pyros.wsgi.application'
  
 FIXTURE_DIRS = (
-    'fixtures/',
+    'misc/fixtures/',
 )
  
 LOGIN_URL = "/"
@@ -202,7 +202,7 @@ STATIC_URL = &#39;/static/&#39;
  
 # To find the static files in src/static/. Any local directory can be added to this list.
 STATICFILES_DIRS = (
-                    os.path.join(BASE_DIR, "static"),
+                    os.path.join(BASE_DIR, "misc", "static"),
                     )
  
 # Used for deployment (DEBUG = False). Need to run "python manage.py collectstatic" to fill it.
@@ -2,6 +2,8 @@ from django.test import TestCase
 from common.models import *
 import os
  
+SAVED_REQUESTS_FOLDER = "misc/saved_requests/"
+
 class TestRoutineManager(TestCase):
  
     fixtures = ["tests/routine_mgr_test.json"]
@@ -27,7 +29,7 @@ class TestRoutineManager(TestCase):
     def test_import(self):
         self.client.login(username="test@test.test", password="test")
         path = "/routine_manager/import_request"
-        with open("saved_requests/request_unittest.xml") as file:
+        with open(SAVED_REQUESTS_FOLDER + "request_unittest.xml") as file:
             response = self.client.post(path, {"request_file": file}, follow=True)
         self.assertTrue("success" in response.context.keys(), "There should be a success message")
         self.assertEqual(Request.objects.count(), 2, "There should still be two request")
@@ -47,6 +49,6 @@ class TestRoutineManager(TestCase):
         self.client.login(username="test@test.test", password="test")
         path = "/routine_manager/export_request/" + str(req.id)
         response = self.client.get(path, follow=True)
-        file_path = "saved_requests/request" + str(req.id) + ".xml"
+        file_path = SAVED_REQUESTS_FOLDER + "request" + str(req.id) + ".xml"
         self.assertTrue(os.path.isfile(file_path), "There should be a new file %s" % (file_path,))
         os.remove(file_path)
@@ -13,9 +13,11 @@ from django.utils.encoding import smart_str
 from django.http import HttpResponse
 import mimetypes
 import os
-
 from pprint import pprint
  
+SAVED_REQUESTS_FOLDER = "misc/saved_requests/"
+
+
 @login_required
 def requests_list(request, status=0, message=""):
     """
@@ -440,7 +442,7 @@ def export_request(request, req_id):
         message = "Request must be completely valid to be serialized"
         return redirect(action_request, req_id=req_id, action="view", status=-1, message=message)
  
-    file_name = "saved_requests/request" + str(req.id) + ".xml"
+    file_name = SAVED_REQUESTS_FOLDER + "request" + str(req.id) + ".xml"
     rs = RequestSerializer()
     rs.serialize(req, file_name)