Release 1.6.1

lirmm · Mar 19, 2018 · 0c7d218 · 0c7d218
1 parent 6655260
commit 0c7d218
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -69,7 +69,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = waves.__version__
+version = waves.__version___
 # The full version, including alpha/beta/rc tags.
 release = waves.__version_detail__
 

diff --git a/docs/installation.rst b/docs/installation.rst
@@ -26,7 +26,7 @@ You can install WAVES-core either as a stand alone application, or inside any ex
 
     1.1. Clone repository:
 
-    Current version is |version|
+    Current version is |version| (|release|)
 
     .. code-block:: bash
 

diff --git a/requirements.txt b/requirements.txt
@@ -14,5 +14,4 @@ python-magic==0.4.13
 saga-python==0.47
 setproctitle==1.1.10
 six==1.11.0
-swapper==1.1.0
-
+swapper==1.1.0
diff --git a/waves/wcore/__init__.py b/waves/wcore/__init__.py
@@ -1,8 +1,8 @@
 """
 WAVES django components library
 """
-__version_detail__ = '0.9.3'
-__version__ = '0.9'
+__version_detail__ = '1.6.1'
+__version__ = '1.6'
 __author__ = 'Marc Chakiachvili, MAB Team'
 __licence__ = 'GPLv3'
 __copyright__ = "Copyright(C) 2015-2018, LIRMM - UM - CNRS"

diff --git a/waves_core/settings.py b/waves_core/settings.py
@@ -15,8 +15,10 @@
 import environ
 from django.contrib import messages
 
+
 env = environ.Env()
-environ.Env.read_env(os.path.join(os.path.dirname(__file__), 'local.env'))
+if os.path.isfile(os.path.join(os.path.dirname(__file__), 'local.env')):
+    environ.Env.read_env(os.path.join(os.path.dirname(__file__), 'local.env'))
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))