RELEASE 3.0.0

.dockerignore

@@ -1 +0,0 @@
-static

.gitignore

@@ -113,3 +113,5 @@ venv.bak/
 
 static/org.geppetto.frontend
 pygeppetto_server/
+tags
+pygeppetto-django

Makefile

@@ -0,0 +1,92 @@
+install: create-db install-frontend install-backend
+	@echo "==========================="
+	@echo "=        Finished         ="
+	@echo "==========================="
+
+install-frontend:
+	@echo "==========================="
+	@echo "=    Install frontend     ="
+	@echo "==========================="
+	@./service/scripts/install-frontend.sh
+
+install-backend:
+	@echo "==========================="
+	@echo "=    Install backend      ="
+	@echo "==========================="
+	@./service/scripts/install-backend.sh
+
+install-backend-with-env:
+	@echo "==========================="
+	@echo "=    Install backend      ="
+	@echo "==========================="
+	@./service/scripts/install-backend.sh -v
+
+create-db:
+	@echo "==========================="
+	@echo "=    Create database      ="
+	@echo "==========================="
+	@./service/scripts/db-create-psql.sh
+
+run-dev: migrate generate-tags
+	make run-django & \
+	make run-frontend
+
+django-migrate: make-migrations migrate
+
+make-migrations:
+	./manage.py makemigrations
+
+migrate:
+	./manage.py migrate
+
+run-django:
+	./manage.py runserver
+
+run-frontend:
+	cd static/org.geppetto.frontend/src/main/webapp/; npm run build-dev-noTest:watch;
+
+lint: flake8-lint isort-lint yapf-lint
+
+format: yapf-format isort-format
+
+flake8-lint:
+	flake8 .
+
+isort-lint:
+	isort --check-only --diff --recursive .
+
+isort-format:
+	isort --recursive .
+
+yapf-format:
+	yapf -i -r --style .style.yapf -p -e "*/migrations/*.py" -e "env" -e "*/settings.py" .
+
+yapf-lint:
+	yapf -d -r --style .style.yapf -e "*/migrations/*.py" -e "env" -e "*/settings.py" .
+
+generate-tags:
+	ctags -R --exclude=.git --exclude=node_modules --exclude=dist --exclude=env .
+
+build-scidash:
+	@echo "==========================="
+	@echo "=      Build scidash      ="
+	@echo "==========================="
+	@./service/scripts/build-image-scidash.sh
+
+build-scidash-db:
+	@echo "==========================="
+	@echo "=    Build scidash db     ="
+	@echo "==========================="
+	@./service/scripts/build-image-db.sh
+
+push-scidash:
+	@echo "==========================="
+	@echo "=   Push scidash image    ="
+	@echo "==========================="
+	@./service/scripts/push-image-scidash.sh
+
+push-scidash-db:
+	@echo "==========================="
+	@echo "=  Push scidash db image  ="
+	@echo "==========================="
+	@./service/scripts/push-image-scidash-db.sh

docker-compose.yml

@@ -8,7 +8,7 @@ services:
     ports:
         - 5432:5432
   scidash:
-    image: metacell/scidash:3.0.0
+    image: metacell/scidash:3.1.1
     ports:
         - 80:8000
     depends_on:

manage.py

@@ -3,7 +3,7 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "scidash.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "scidash.main.settings")
 
     from django.core.management import execute_from_command_line
 

general/admin.py → scidash/general/admin.py

@@ -1,7 +1,7 @@
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
 
-from general.models import ScidashUser
+from scidash.general.models import ScidashUser
 
 # Register your models here.
 

general/serializers.py → scidash/general/serializers.py

@@ -1,6 +1,6 @@
 from rest_framework import serializers
 
-from general.models import ScidashUser
+from scidash.general.models import ScidashUser
 
 
 class ScidashUserSerializer(serializers.ModelSerializer):

general/urls.py → scidash/general/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import url
-from general.views import FileUploadView
+from scidash.general.views import FileUploadView
 
 urlpatterns = [
         url(r'^upload/(?P<filename>[^/]+)$', FileUploadView.as_view())

general/views.py → scidash/general/views.py

@@ -5,7 +5,7 @@
 from rest_framework.parsers import MultiPartParser
 from rest_framework.response import Response
 
-from sciunittests.serializers import ScoreInstanceSerializer
+from scidash.sciunittests.serializers import ScoreInstanceSerializer
 
 
 class FileUploadView(APIView):

scidash/settings.py → scidash/main/settings.py

@@ -15,10 +15,15 @@
 import datetime
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+BASE_DIR = os.path.dirname(
+    os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+)
 
-dotenv.read_dotenv(os.path.join(os.path.dirname(os.path.dirname(__file__)),
-                                '.env'))
+dotenv.read_dotenv(
+    os.path.join(
+        os.path.dirname(os.path.dirname(os.path.dirname(__file__))), '.env'
+    )
+)
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.9/howto/deployment/checklist/
@@ -55,9 +60,9 @@
 ]
 
 SCIDASH_APPS = [
-    'sciunitmodels.apps.SciunitmodelsConfig',
-    'sciunittests.apps.SciunittestsConfig',
-    'general.apps.GeneralConfig',
+    'scidash.sciunitmodels',
+    'scidash.sciunittests',
+    'scidash.general',
 ]
 
 INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + SCIDASH_APPS
@@ -84,7 +89,7 @@
         ]
 }
 
-ROOT_URLCONF = 'scidash.urls'
+ROOT_URLCONF = 'scidash.main.urls'
 
 TEMPLATES = [
     {
@@ -102,7 +107,7 @@
     },
 ]
 
-ASGI_APPLICATION = 'scidash.routing.application'
+ASGI_APPLICATION = 'scidash.main.routing.application'
 
 # Database
 # https://docs.djangoproject.com/en/1.9/ref/settings/#databases
@@ -170,4 +175,4 @@
 GEPPETTO_SERVLET_URL = 'ws://localhost:8080/org.geppetto.frontend/GeppettoServlet'
 GEPPETTO_BASE_URL = 'http://localhost:8080/org.geppetto.frontend/geppetto'
 
-ACCEPTABLE_SCORE_INSTANCES_AMOUNT = 30
+ACCEPTABLE_SCORE_INSTANCES_AMOUNT = 50

scidash/urls.py → scidash/main/urls.py

@@ -16,9 +16,9 @@
 """
 from django.conf.urls import include, url
 from django.contrib import admin
-from sciunitmodels.api import views as models_views
-from sciunittests.api import views as tests_views
-from sciunittests.views import DateRangeView
+from scidash.sciunitmodels.api import views as models_views
+from scidash.sciunittests.api import views as tests_views
+from scidash.sciunittests.views import DateRangeView
 
 from rest_framework.routers import DefaultRouter
 from rest_framework_jwt.views import obtain_jwt_token
@@ -51,7 +51,7 @@
     url(r'^admin/', admin.site.urls),
     url(r'^api/login/', obtain_jwt_token),
     url(r'^', include('pygeppetto_server.urls')),
-    url(r'^data/', include('general.urls')),
+    url(r'^data/', include('scidash.general.urls')),
     url(r'^api/date-range', DateRangeView.as_view(), name='date-range-view'),
     url(r'^api/', include(router.urls))
 ]

sciunitmodels/admin.py → scidash/sciunitmodels/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from sciunitmodels.models import ModelClass, ModelInstance, Capability
+from scidash.sciunitmodels.models import ModelClass, ModelInstance, Capability
 
 # Register your models here.
 

sciunitmodels/api/views.py → scidash/sciunitmodels/api/views.py

@@ -1,10 +1,10 @@
 from rest_framework import viewsets, permissions
 
-from sciunitmodels.serializers import CapabilitySerializer, \
+from scidash.sciunitmodels.serializers import CapabilitySerializer, \
         ModelClassSerializer, \
         ModelInstanceSerializer
 
-from sciunitmodels.models import Capability, ModelClass, ModelInstance
+from scidash.sciunitmodels.models import Capability, ModelClass, ModelInstance
 
 
 class CapabilityViewSet(viewsets.ReadOnlyModelViewSet):

sciunitmodels/serializers.py → scidash/sciunitmodels/serializers.py

@@ -3,8 +3,8 @@
 from rest_framework_cache.serializers import CachedSerializerMixin
 from rest_framework_cache.registry import cache_registry
 
-from sciunitmodels.models import Capability, ModelClass, ModelInstance
-from general.mixins import GetByKeyOrCreateMixin
+from scidash.sciunitmodels.models import Capability, ModelClass, ModelInstance
+from scidash.general.mixins import GetByKeyOrCreateMixin
 
 
 class CapabilitySerializer(GetByKeyOrCreateMixin,
@@ -46,6 +46,6 @@ class Meta:
         model = ModelInstance
         fields = '__all__'
 
-# cache_registry.register(CapabilitySerializer)
-# cache_registry.register(ModelClassSerializer)
-# cache_registry.register(ModelInstanceSerializer)
+cache_registry.register(CapabilitySerializer)
+cache_registry.register(ModelClassSerializer)
+cache_registry.register(ModelInstanceSerializer)