[med-svn] [Git][med-team/nextflow][upstream] New upstream version 21.04.1+dfsg
Steffen Möller (@moeller)
gitlab at salsa.debian.org
Wed Jun 2 17:17:54 BST 2021
Steffen Möller pushed to branch upstream at Debian Med / nextflow
Commits:
d43fd20f by Steffen Moeller at 2021-06-02T17:23:37+02:00
New upstream version 21.04.1+dfsg
- - - - -
12 changed files:
- VERSION
- changelog.txt
- docs/conf.py
- modules/nextflow/src/main/groovy/nextflow/Session.groovy
- modules/nextflow/src/main/groovy/nextflow/trace/TraceFileObserver.groovy
- modules/nextflow/src/test/groovy/nextflow/config/ConfigBuilderTest.groovy
- modules/nf-commons/src/main/nextflow/Const.groovy
- modules/nf-commons/src/main/nextflow/extension/Bolts.groovy
- nextflow
- nextflow.md5
- nextflow.sha1
- nextflow.sha256
Changes:
=====================================
VERSION
=====================================
@@ -1 +1 @@
-21.04.0
+21.04.1
=====================================
changelog.txt
=====================================
@@ -1,5 +1,10 @@
NEXTFLOW CHANGE-LOG
===================
+21.04.1 [stable] - 14 May 2021
+- Fix nested params file parse #2091
+- Fix Malformed config error reporting #2105
+- Fix Use default opts for trace file creation [09e6c6ac]
+
21.04.0 [stable] - 2 May 2021
- Fix NPE when AWS Batch job container is not returned [412b6fde]
- Fix execution hang when native task fail to submit #2060 [1253485d]
=====================================
docs/conf.py
=====================================
@@ -50,7 +50,7 @@ copyright = u'2020, Seqera Labs. 2013-2019, Centre for Genomic Regulation (CRG).
# The short X.Y version.
version = '21.04'
# The full version, including alpha/beta/rc tags.
-release = '21.04.0'
+release = '21.04.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
=====================================
modules/nextflow/src/main/groovy/nextflow/Session.groovy
=====================================
@@ -1121,10 +1121,13 @@ class Session implements ISession {
private void getContainerConfig0(String engine, List<Map> drivers) {
- def config = this.config?.get(engine) as Map
- if( config ) {
+ def config = this.config?.get(engine)
+ if( config instanceof Map ) {
config.engine = engine
- drivers << config
+ drivers.add((Map)config)
+ }
+ else if( config!=null ) {
+ log.warn "Malformed configuration for container engine '$engine' -- One or more attributes should be provided"
}
}
=====================================
modules/nextflow/src/main/groovy/nextflow/trace/TraceFileObserver.groovy
=====================================
@@ -16,10 +16,10 @@
*/
package nextflow.trace
+
import java.nio.charset.Charset
import java.nio.file.Files
import java.nio.file.Path
-import java.nio.file.StandardOpenOption
import java.util.concurrent.ConcurrentHashMap
import groovy.transform.CompileStatic
@@ -210,7 +210,7 @@ class TraceFileObserver implements TraceObserver {
tracePath.rollFile()
// create a new trace file
- traceFile = new PrintWriter(Files.newBufferedWriter(tracePath, Charset.defaultCharset(), StandardOpenOption.APPEND, StandardOpenOption.CREATE))
+ traceFile = new PrintWriter(Files.newBufferedWriter(tracePath, Charset.defaultCharset()))
// launch the agent
writer = new Agent<PrintWriter>(traceFile)
=====================================
modules/nextflow/src/test/groovy/nextflow/config/ConfigBuilderTest.groovy
=====================================
@@ -1905,6 +1905,70 @@ class ConfigBuilderTest extends Specification {
then:
cfg2.params.test.foo == "CLI_FOO"
cfg2.params.test.bar == "bar_def"
+
+ cleanup:
+ folder?.deleteDir()
+ }
+
+ def 'parse nested json' () {
+ given:
+ def folder = Files.createTempDirectory('test')
+ and:
+ def config = folder.resolve('nf.json')
+ config.text = '''\
+ {
+ "title": "something",
+ "nested": {
+ "name": "Mike",
+ "and": {
+ "more": "nesting",
+ "still": {
+ "another": "layer"
+ }
+ }
+ }
+ }
+ '''.stripIndent()
+
+ when:
+ def cfg1 = new ConfigBuilder().setCmdRun(new CmdRun(paramsFile: config.toString())).build()
+
+ then:
+ cfg1.params.title == "something"
+ cfg1.params.nested.name == 'Mike'
+ cfg1.params.nested.and.more == 'nesting'
+ cfg1.params.nested.and.still.another == 'layer'
+
+ cleanup:
+ folder?.deleteDir()
+ }
+
+ def 'parse nested yaml' () {
+ given:
+ def folder = Files.createTempDirectory('test')
+ and:
+ def config = folder.resolve('nf.yaml')
+ config.text = '''\
+ title: "something"
+ nested:
+ name: "Mike"
+ and:
+ more: nesting
+ still:
+ another: layer
+ '''.stripIndent()
+
+ when:
+ def cfg1 = new ConfigBuilder().setCmdRun(new CmdRun(paramsFile: config.toString())).build()
+
+ then:
+ cfg1.params.title == "something"
+ cfg1.params.nested.name == 'Mike'
+ cfg1.params.nested.and.more == 'nesting'
+ cfg1.params.nested.and.still.another == 'layer'
+
+ cleanup:
+ folder?.deleteDir()
}
}
=====================================
modules/nf-commons/src/main/nextflow/Const.groovy
=====================================
@@ -53,17 +53,17 @@ class Const {
/**
* The application version
*/
- static public final String APP_VER = "21.04.0"
+ static public final String APP_VER = "21.04.1"
/**
* The app build time as linux/unix timestamp
*/
- static public final long APP_TIMESTAMP = 1619972527591
+ static public final long APP_TIMESTAMP = 1621005654076
/**
* The app build number
*/
- static public final int APP_BUILDNUM = 5552
+ static public final int APP_BUILDNUM = 5556
/**
=====================================
modules/nf-commons/src/main/nextflow/extension/Bolts.groovy
=====================================
@@ -40,7 +40,6 @@ import nextflow.util.RateUnit
import org.apache.commons.lang.StringUtils
import org.codehaus.groovy.runtime.DefaultGroovyMethods
import org.codehaus.groovy.runtime.GStringImpl
-import org.codehaus.groovy.runtime.InvokerHelper
import org.codehaus.groovy.runtime.ResourceGroovyMethods
import org.codehaus.groovy.runtime.StringGroovyMethods
import org.slf4j.Logger
@@ -924,11 +923,13 @@ class Bolts {
}
static <T extends Map> T deepClone(T map) {
- final result = InvokerHelper.invokeMethod(map, 'clone', null)
+ if( map == null)
+ return null
+ final result = map instanceof LinkedHashMap ? new LinkedHashMap<>(map) : new HashMap<>(map)
for( def key : map.keySet() ) {
def value = map.get(key)
if( value instanceof Map ) {
- map.put(key, deepClone(value))
+ result.put(key, deepClone(value))
}
}
return (T)result
=====================================
nextflow
=====================================
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Copyright 2020, Seqera Labs
+# Copyright 2020-2021, Seqera Labs
# Copyright 2013-2019, Centre for Genomic Regulation (CRG)
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
# limitations under the License.
[[ "$NXF_DEBUG" == 'x' ]] && set -x
-NXF_VER=${NXF_VER:-'21.04.0'}
+NXF_VER=${NXF_VER:-'21.04.1'}
NXF_ORG=${NXF_ORG:-'nextflow-io'}
NXF_HOME=${NXF_HOME:-$HOME/.nextflow}
NXF_PROT=${NXF_PROT:-'https'}
=====================================
nextflow.md5
=====================================
@@ -1 +1 @@
-ee93085ad75d912a8a2faaf6ef9e0074
+9a93980292546fea270692a8ad4356aa
=====================================
nextflow.sha1
=====================================
@@ -1 +1 @@
-5b38c1b90c92de074bb81c83baedc1179fd8af9d
+9d530c612699209fb6766a1319cfe4a89268616b
=====================================
nextflow.sha256
=====================================
@@ -1 +1 @@
-9b7d117a108a5340ac4f2571c83382b18ced9d2789a8216825c9ad20b60ca02b
+840ca394237e0f4d9f34642ff77c0ac92361319bcc9d9441f3d99f7b6d48ae7d
View it on GitLab: https://salsa.debian.org/med-team/nextflow/-/commit/d43fd20faf8a25258043f72a8415cc3663a660fe
--
View it on GitLab: https://salsa.debian.org/med-team/nextflow/-/commit/d43fd20faf8a25258043f72a8415cc3663a660fe
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20210602/1d144dbb/attachment-0001.htm>
More information about the debian-med-commit
mailing list