Merge branch 'release/1.0.1'

* release/1.0.1: fixes issue #56 start v1.1
saxix · Dec 15, 2015 · 1d3254b · 1d3254b
2 parents c7c2cbc + 44b2ac9
commit 1d3254b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,7 @@ cache:
 branches:
   only:
     - develop
+    - master
     - feature/travis
 
 services:

diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+Release 1.0.1
+-------------
+* fixes :issue:`56` (thanks oppianmatt).
+
 Release 1.0
 -----------
 * **BACKWARD INCOMPATIBLE**:: dropped support for Django prior 1.6

diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 from setuptools.command.test import test as TestCommand
 
 ROOT = os.path.realpath(os.path.join(os.path.dirname(__file__)))
-sys.path.append(os.path.join(ROOT, 'src'))
+sys.path.insert(0, os.path.join(ROOT, 'src'))
 
 app = __import__('concurrency')
 base_url = 'https://github.com/saxix/django-concurrency/'

diff --git a/src/concurrency/__init__.py b/src/concurrency/__init__.py
@@ -5,7 +5,7 @@
 __author__ = 'sax'
 default_app_config = 'concurrency.apps.ConcurrencyConfig'
 
-VERSION = __version__ = (1, 0, 0, 'final', 0)
+VERSION = __version__ = (1, 0, 1, 'final', 0)
 NAME = 'django-concurrency'