Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
emzed-ext-mzmine2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
sispub
emzed
emzed-ext-mzmine2
Commits
bd47fd99
Commit
bd47fd99
authored
5 years ago
by
schmittu
Browse files
Options
Downloads
Patches
Plain Diff
fix finding java executable on windows
parent
c9afa82a
No related branches found
No related tags found
No related merge requests found
Pipeline
#875
failed
5 years ago
Stage: test_code
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
emzed/ext/mzmine2/installers.py
+3
-2
3 additions, 2 deletions
emzed/ext/mzmine2/installers.py
emzed/ext/mzmine2/remove_shoulder_peaks.py
+1
-3
1 addition, 3 deletions
emzed/ext/mzmine2/remove_shoulder_peaks.py
with
4 additions
and
5 deletions
emzed/ext/mzmine2/installers.py
+
3
−
2
View file @
bd47fd99
...
...
@@ -76,9 +76,10 @@ def get_jre_home(folder=_default_jre_folder()):
@functools.lru_cache
()
def
find_java_bin
(
folder
=
_default_jre_folder
()):
home
=
get_jre_home
(
folder
)
java_executable
=
"
java.exe
"
if
sys
.
platform
==
"
win32
"
else
"
java
"
for
folder
,
__
,
files
in
os
.
walk
(
home
):
if
"
java
"
in
files
:
return
os
.
path
.
join
(
folder
,
"
java
"
)
if
java
_executable
in
files
:
return
os
.
path
.
join
(
folder
,
java
_executable
)
raise
RuntimeError
(
f
"
can not find java within
{
home
}
"
)
...
...
This diff is collapsed.
Click to expand it.
emzed/ext/mzmine2/remove_shoulder_peaks.py
+
1
−
3
View file @
bd47fd99
...
...
@@ -3,13 +3,11 @@
import
tempfile
import
subprocess
import
emzed.lib
from
.exceptions
import
MzMine2Exception
from
.parameters
import
ParameterBase
from
.java_utils
import
construct_java_call_cli_args
,
run_java
from
.java_utils
import
run_java
class
RemoveShoulderPeaksParameters
(
ParameterBase
):
...
...
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