Merge pull request #22 from lsst-ts/release/0.2.0

Release/0.2.0

.dockerignore

@@ -0,0 +1 @@
+**/__pycache__

.flake8

@@ -1,2 +1,3 @@
 [flake8]
 max-line-length = 120
+ignore = D100

.gitignore

@@ -1,10 +1,11 @@
 virtualenv
 venv
 */venv
-*.pyc
-__pycache__
+**/*.pyc
 *.cache
 assets
 webpack-stats.*
 .vscode
 *.sqlite3
+**/__pycache__
+**/.DS_Store

Dockerfile

@@ -23,5 +23,10 @@ RUN python manage.py collectstatic --noinput
 VOLUME /usr/src/love/static
 EXPOSE 8000
 
+# Set env variables for runtime (to be replaced in docker-cpomse files)
+ENV ADMIN_USER_PASS=test
+ENV USER_USER_PASS=test
+ENV CMD_USER_PASS=test
+
 # Run daphne server in runtime
-ENTRYPOINT ["./runserver.sh"]
+CMD ["./runserver.sh"]

Dockerfile-dev

@@ -17,5 +17,10 @@ RUN pip install -r requirements.txt
 # Expose static files and port
 EXPOSE 8000
 
+# Set env variables for runtime (to be replaced in docker-cpomse files)
+ENV ADMIN_USER_PASS=test
+ENV USER_USER_PASS=test
+ENV CMD_USER_PASS=test
+
 # Run development server in runtime
-ENTRYPOINT ["./runserver-dev.sh"]
+CMD ["./runserver-dev.sh"]

Jenkinsfile

@@ -2,7 +2,7 @@ pipeline {
   agent any
   environment {
     registryCredential = "dockerhub-inriachile"
-    dockerImageName = "inriachile/love-manager:${GIT_BRANCH}"
+    dockerImageName = "inriachile/love-manager:"
     dockerImage = ""
   }
 
@@ -12,19 +12,49 @@ pipeline {
         anyOf {
           branch "master"
           branch "develop"
+          branch "release/*"
         }
       }
       steps {
         script {
+          def git_branch = "${GIT_BRANCH}"
+          def image_tag = git_branch
+          def slashPosition = git_branch.indexOf('/')
+
+          if (slashPosition > 0) {
+            git_tag = git_branch.substring(slashPosition + 1, git_branch.length())
+            git_branch = git_branch.substring(0, slashPosition)
+            if (git_branch == "release") {
+              image_tag = git_tag
+            }
+          }
+
+          dockerImageName = dockerImageName + image_tag
+          echo "dockerImageName: ${dockerImageName}"
           dockerImage = docker.build dockerImageName
         }
       }
     }
+    stage("Test Docker Image") {
+      when {
+        anyOf {
+          branch "master"
+          branch "develop"
+          branch "release/*"
+        }
+      }
+      steps {
+        script {
+          sh "docker run ${dockerImageName} pytest"
+        }
+      }
+    }
     stage("Push Docker image") {
       when {
         anyOf {
           branch "master"
           branch "develop"
+          branch "release/*"
         }
       }
       steps {
@@ -41,15 +71,15 @@ pipeline {
         branch "develop"
       }
       steps {
-        build '../LOVE-integration-tools/develop'
+        build(job: '../LOVE-integration-tools/develop', wait: false)
       }
     }
     stage("Trigger master deployment") {
       when {
         branch "master"
       }
       steps {
-        build '../LOVE-integration-tools/master'
+        build(job: '../LOVE-integration-tools/master', wait: false)
       }
     }
   }

docs/html/.buildinfo

@@ -0,0 +1,4 @@
+# Sphinx build info version 1
+# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
+config: 953d8bcde9ceff8398c74730e916263b
+tags: 645f666f9bcd5a90fca523b33c5a78b7

docs/html/_sources/apidoc/api.rst.txt

@@ -0,0 +1,85 @@
+api package
+===========
+
+Subpackages
+-----------
+
+.. toctree::
+
+   api.tests
+
+Submodules
+----------
+
+api.admin module
+----------------
+
+.. automodule:: api.admin
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+api.apps module
+---------------
+
+.. automodule:: api.apps
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+api.authentication module
+-------------------------
+
+.. automodule:: api.authentication
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+api.middleware module
+---------------------
+
+.. automodule:: api.middleware
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+api.models module
+-----------------
+
+.. automodule:: api.models
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+api.serializers module
+----------------------
+
+.. automodule:: api.serializers
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+api.urls module
+---------------
+
+.. automodule:: api.urls
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+api.views module
+----------------
+
+.. automodule:: api.views
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: api
+   :members:
+   :undoc-members:
+   :show-inheritance:

docs/html/_sources/apidoc/api.tests.rst.txt

@@ -0,0 +1,22 @@
+api.tests package
+=================
+
+Submodules
+----------
+
+api.tests.tests\_auth\_api module
+---------------------------------
+
+.. automodule:: api.tests.tests_auth_api
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: api.tests
+   :members:
+   :undoc-members:
+   :show-inheritance:

docs/html/_sources/apidoc/manage.rst.txt

@@ -0,0 +1,7 @@
+manage module
+=============
+
+.. automodule:: manage
+   :members:
+   :undoc-members:
+   :show-inheritance:

docs/html/_sources/apidoc/manager.rst.txt

@@ -0,0 +1,54 @@
+manager package
+===============
+
+Submodules
+----------
+
+manager.asgi module
+-------------------
+
+.. automodule:: manager.asgi
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+manager.routing module
+----------------------
+
+.. automodule:: manager.routing
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+manager.settings module
+-----------------------
+
+.. automodule:: manager.settings
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+manager.urls module
+-------------------
+
+.. automodule:: manager.urls
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+manager.wsgi module
+-------------------
+
+.. automodule:: manager.wsgi
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: manager
+   :members:
+   :undoc-members:
+   :show-inheritance:

docs/html/_sources/apidoc/modules.rst.txt

@@ -0,0 +1,11 @@
+ApiDoc
+======
+These are the ApiDocs of the project.
+
+.. toctree::
+   :maxdepth: 4
+
+   api
+   manage
+   manager
+   subscription

docs/html/_sources/apidoc/subscription.rst.txt

@@ -0,0 +1,38 @@
+subscription package
+====================
+
+Submodules
+----------
+
+subscription.auth module
+------------------------
+
+.. automodule:: subscription.auth
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+subscription.consumers module
+-----------------------------
+
+.. automodule:: subscription.consumers
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+subscription.routing module
+---------------------------
+
+.. automodule:: subscription.routing
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: subscription
+   :members:
+   :undoc-members:
+   :show-inheritance:

docs/html/_sources/index.rst.txt

@@ -0,0 +1,26 @@
+.. LOVE-manager documentation master file, created by
+   sphinx-quickstart on Mon Jul 29 16:50:25 2019.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Welcome to LOVE-manager's documentation!
+========================================
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Contents:
+
+   modules/introduction.rst
+   modules/authentication.rst
+   modules/connection.rst
+   modules/subscriptions.rst
+   apidoc/modules.rst
+
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`