Merge branch 'bugfix/jpype-breaking-changes' into 'master'

Staying with JPype 0.6.* for the time being

See merge request !11

pyjapc/__init__.py

@@ -3,7 +3,7 @@
 from .pyjapc import PyJapc
 from .rbac_dialog import PasswordEntryDialogue, getPw
 
-__version__ = "2.0.4"
+__version__ = "2.0.5"
 
 __cmmnbuild_deps__ = [
     "japc",

setup.py

@@ -114,7 +114,7 @@ setuptools.setup(
         'pyjapc': 'pyjapc/*.pyi',
     },
     install_requires=[
-        'JPype1>=0.6.1',
+        'JPype1>=0.6.1,<0.7.0',
         'cmmnbuild-dep-manager>=2.1.0',
         'numpy',
         'six',

test_pyjapc.py

@@ -10,7 +10,7 @@ Created on Wed May 20 08:59:32 2015
 import jpype as jp
 import time
 import pytest
-import unittest
+from unittest import mock as unittest_mock
 from numpy import *
 from pyjapc import *
 
@@ -138,7 +138,7 @@ def test_get_value():
 
 def test_async_get():
     param = 'TEST/TestProperty'
-    callback = unittest.mock.Mock()
+    callback = unittest_mock.Mock()
     mock = mockParameter(param)
     whenGetValueThen(mock, sel('LHC.USER.TEST'), acqVal(param, 42, 0))
     japc.setSelector('LHC.USER.TEST')