Skip to content
Snippets Groups Projects
Commit df6f3457 authored by Tom Levens's avatar Tom Levens
Browse files

Require cmmnbuild_dep_manager >= 2.0.0

parent c6e78a99
No related branches found
Tags v33r0
No related merge requests found
......@@ -3,7 +3,7 @@
from .pyjapc import *
from .rbac_dialog import *
__version__ = "1.2.0"
__version__ = "1.2.1"
cmmnbuild_deps = [
"japc",
......
......@@ -106,10 +106,7 @@ class PyJapc:
# --------------------------------------------------------------------
# Startup the JVM and the connection to Python (JPype)
# --------------------------------------------------------------------
mgr = cmmnbuild_dep_manager.Manager()
mgr.set_logging_level(logging.WARNING)
if not mgr.is_registered('pyjapc'):
mgr.install('pyjapc')
mgr = cmmnbuild_dep_manager.Manager('pyjapc', logging.WARNING)
mgr.start_jpype_jvm()
# Enable `*` Wildcard selectors (see https://wikis.cern.ch/display/JAPC/Wildcard+Selectors)
......
......@@ -138,11 +138,11 @@ setuptools.setup(
packages=['pyjapc'],
package_dir={'pyjapc': 'pyjapc'},
setup_requires=[
'cmmnbuild_dep_manager>=1.3.2'
'cmmnbuild_dep_manager>=2.0.0'
],
install_requires=[
'JPype1>=0.6.1',
'cmmnbuild_dep_manager>=1.3.2'
'cmmnbuild_dep_manager>=2.0.0'
],
dependency_links=[
cmmnbuild_url + 'repository/archive.zip?ref=master#egg=cmmnbuild_dep_manager-' + cmmnbuild_version()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment