Merge branch 'main' into develop

p2m2 · May 3, 2022 · 43aeeeb · 43aeeeb
2 parents fc306fa + ff1ab87
commit 43aeeeb
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 3 deletions.
diff --git a/build.sbt b/build.sbt
@@ -15,7 +15,6 @@ scmInfo := Some(
 )
 
 versionScheme := Some("early-semver")
-
 val static_version      = "0.1.8"
 val version_build = scala.util.Properties.envOrElse("PROG_VERSION", static_version )
 

diff --git a/galaxy/gcms2isocor/P2M2Tools-assembly-0.1.7.jar b/galaxy/gcms2isocor/P2M2Tools-assembly-0.1.7.jar
diff --git a/src/test/scala/fr/inrae/metabolomics/p2m2/command/MassLynx2IsocorCommandTest.scala b/src/test/scala/fr/inrae/metabolomics/p2m2/command/MassLynx2IsocorCommandTest.scala
@@ -84,7 +84,6 @@ object MassLynx2IsocorCommandTest extends TestSuite {
         case Failure(f) => f.printStackTrace();assert(false)
       }
     }
-
     test("MassLynx2IsocorCommand - with args metabolites.dat (formula)") {
       val toParse =
         """Compound 1:  His, M+7

diff --git a/src/test/scala/fr/inrae/metabolomics/p2m2/converter/MassLynxOutput2IsocorInputTest.scala b/src/test/scala/fr/inrae/metabolomics/p2m2/converter/MassLynxOutput2IsocorInputTest.scala
@@ -157,7 +157,6 @@ object  MassLynxOutput2IsocorInputTest extends TestSuite {
         header=OutputMassLynx.Header(),
         results=MassLynxParser.parseResults(toParse.split("\n").toList)
       )
-
       assert( MassLynxOutput2IsocorInput(derivatives=Map("TATA" -> "TOTO"),formula=Map(),resolution=1000).transform(entry) == List())
     }