Merge pull request #235 from tetherless-world/master

Release 1.5.0

.circleci/config.yml

@@ -45,6 +45,13 @@ jobs:
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
               docker login -u $DOCKER_USER -p $DOCKER_PASS
               WHYIS_IMAGE_TAG=latest docker-compose -f docker/compose/monolithic/docker-compose.yml push whyis
+
+              tag=`git describe --exact-match` || echo "latest commit is not tagged"
+              if [ $tag ] ; then
+                docker tag tetherlessworld/whyis:latest "tetherlessworld/whyis:$tag"
+                docker tag tetherlessworld/whyis-deps:latest "tetherlessworld/whyis-deps:$tag"
+                WHYIS_IMAGE_TAG=$tag docker-compose -f docker/compose/monolithic/docker-compose.yml push
+              fi
             fi
   build_and_deploy_split_docker_image:
     working_directory: /apps/whyis

.dockerignore

@@ -1,6 +1,6 @@
 /.git/
 /.idea/
-node_modules/
+/static/node_modules/
 package-lock.json
 *.pyc
 __pycache__/

README.md

@@ -11,4 +11,5 @@ Every entity in the resource is visible through its own Uniform Resource Identif
 
 # Nano-scale?
 
+
 Nano-scale knowledge graphs are built of many *[nanopublications](http://nanopub.org)*, where each nanopublication is tracked individually, with the ability to provide provenance-based justifications and publication credit for each tiny bit of knowledge in the graph.

config-template/{{cookiecutter.location}}/config.py

@@ -31,7 +31,7 @@
     site_header_image = 'static/images/random_network.png',
 
     site_description = '',
-    
+
     root_path = '/apps/whyis',
 
     # use TESTING mode?
@@ -101,13 +101,18 @@
 
     admin_queryEndpoint = 'http://localhost:8080/blazegraph/namespace/admin/sparql',
     admin_updateEndpoint = 'http://localhost:8080/blazegraph/namespace/admin/sparql',
-    
+
     knowledge_queryEndpoint = 'http://localhost:8080/blazegraph/namespace/knowledge/sparql',
     knowledge_updateEndpoint = 'http://localhost:8080/blazegraph/namespace/knowledge/sparql',
 
     LOGIN_USER_TEMPLATE = "auth/login.html",
     CELERY_BROKER_URL = 'redis://localhost:6379/0',
     CELERY_RESULT_BACKEND = 'redis://localhost:6379/0',
+    CACHE_TYPE = "redis", # Flask-Caching related configs
+    CACHE_KEY_PREFIX = 'whyis_cache_',
+    CACHE_REDIS_URL = 'redis://localhost:6379/0',
+    CACHE_DEFAULT_TIMEOUT = 0,
+
     default_language = 'en',
     namespaces = [
         importer.LinkedData(
@@ -178,4 +183,3 @@
     TESTING = True,
     WTF_CSRF_ENABLED = False
 ))
-