Skip to content
Snippets Groups Projects
Commit 894e72d2 authored by Ivan Sinkarenko's avatar Ivan Sinkarenko :snake:
Browse files

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

Staying with JPype 0.6.* for the time being

See merge request !11
parents 96fa1992 f3699468
No related branches found
No related tags found
1 merge request!11Staying with JPype 0.6.* for the time being
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
from .pyjapc import PyJapc from .pyjapc import PyJapc
from .rbac_dialog import PasswordEntryDialogue, getPw from .rbac_dialog import PasswordEntryDialogue, getPw
__version__ = "2.0.4" __version__ = "2.0.5"
__cmmnbuild_deps__ = [ __cmmnbuild_deps__ = [
"japc", "japc",
......
...@@ -114,7 +114,7 @@ setuptools.setup( ...@@ -114,7 +114,7 @@ setuptools.setup(
'pyjapc': 'pyjapc/*.pyi', 'pyjapc': 'pyjapc/*.pyi',
}, },
install_requires=[ install_requires=[
'JPype1>=0.6.1', 'JPype1>=0.6.1,<0.7.0',
'cmmnbuild-dep-manager>=2.1.0', 'cmmnbuild-dep-manager>=2.1.0',
'numpy', 'numpy',
'six', 'six',
......
...@@ -10,7 +10,7 @@ Created on Wed May 20 08:59:32 2015 ...@@ -10,7 +10,7 @@ Created on Wed May 20 08:59:32 2015
import jpype as jp import jpype as jp
import time import time
import pytest import pytest
import unittest from unittest import mock as unittest_mock
from numpy import * from numpy import *
from pyjapc import * from pyjapc import *
...@@ -138,7 +138,7 @@ def test_get_value(): ...@@ -138,7 +138,7 @@ def test_get_value():
def test_async_get(): def test_async_get():
param = 'TEST/TestProperty' param = 'TEST/TestProperty'
callback = unittest.mock.Mock() callback = unittest_mock.Mock()
mock = mockParameter(param) mock = mockParameter(param)
whenGetValueThen(mock, sel('LHC.USER.TEST'), acqVal(param, 42, 0)) whenGetValueThen(mock, sel('LHC.USER.TEST'), acqVal(param, 42, 0))
japc.setSelector('LHC.USER.TEST') japc.setSelector('LHC.USER.TEST')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment