Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
pyjapc
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Cristian Baldi
pyjapc
Commits
df6f3457
Commit
df6f3457
authored
7 years ago
by
Tom Levens
Browse files
Options
Downloads
Patches
Plain Diff
Require cmmnbuild_dep_manager >= 2.0.0
parent
c6e78a99
No related branches found
Branches containing commit
Tags
v33r0
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
pyjapc/__init__.py
+1
-1
1 addition, 1 deletion
pyjapc/__init__.py
pyjapc/pyjapc.py
+1
-4
1 addition, 4 deletions
pyjapc/pyjapc.py
setup.py
+2
-2
2 additions, 2 deletions
setup.py
with
4 additions
and
7 deletions
pyjapc/__init__.py
+
1
−
1
View file @
df6f3457
...
...
@@ -3,7 +3,7 @@
from
.pyjapc
import
*
from
.rbac_dialog
import
*
__version__
=
"
1.2.
0
"
__version__
=
"
1.2.
1
"
cmmnbuild_deps
=
[
"
japc
"
,
...
...
This diff is collapsed.
Click to expand it.
pyjapc/pyjapc.py
+
1
−
4
View file @
df6f3457
...
...
@@ -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)
...
...
This diff is collapsed.
Click to expand it.
setup.py
+
2
−
2
View file @
df6f3457
...
...
@@ -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
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment