diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fca9e5c..16870586 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,13 @@ - Improve handling of dynamically-specified URIs - Rewrite README.md, splitting out developer documentation to README_DEV.md +## [0.8.12] 2024-12-03 UNPUBLISHED + +- Extract flags and metadata from `nextflow.config` +- Remove unused methods and keys +- Remove support for propertyName +- Use IntelliJ to fix types and lint + ## [0.8.11] 2024-11-5 UNPUBLISHED - Catch *all* toJson errors diff --git a/plugins/nf-quilt/src/main/nextflow/quilt/jep/QuiltPackage.groovy b/plugins/nf-quilt/src/main/nextflow/quilt/jep/QuiltPackage.groovy index ac42fbe4..17894f50 100644 --- a/plugins/nf-quilt/src/main/nextflow/quilt/jep/QuiltPackage.groovy +++ b/plugins/nf-quilt/src/main/nextflow/quilt/jep/QuiltPackage.groovy @@ -335,7 +335,7 @@ class QuiltPackage { } String toCatalogURL(String catalog) { - return "https://${catalog}/b/${bucket}/packages/${packageName}" //.replace("%2f", "/") + return "https://${catalog}/b/${bucket}/packages/${packageName}" } String toKey() { diff --git a/plugins/nf-quilt/src/main/nextflow/quilt/jep/QuiltParser.groovy b/plugins/nf-quilt/src/main/nextflow/quilt/jep/QuiltParser.groovy index f67afc5d..b0ee2e81 100644 --- a/plugins/nf-quilt/src/main/nextflow/quilt/jep/QuiltParser.groovy +++ b/plugins/nf-quilt/src/main/nextflow/quilt/jep/QuiltParser.groovy @@ -31,22 +31,13 @@ class QuiltParser { static final String NULL_BUCKET = 'nf-quilt-dev-null' public static final String P_CAT = 'catalog' - // static final String P_DEST = 'dest' - // static final String P_DREG = 'dest-registry' - // static final String P_DIR = 'dir' public static final String P_FORCE = 'force' - // static final String P_HASH = 'top-hash' public static final String P_PATH = 'path' public static final String P_PKG = 'package' - // public static final String P_PROP = 'property' - // static final String P_REG = 'registry' public static final String P_WORK = 'workflow' - // static final String[] INSTALL_KEYS = [P_REG, P_DEST, P_DREG, P_HASH, P_PATH] - // static final String[] PUSH_KEYS = [P_REG, P_DIR, P_WORK, P_FORCE] private final String bucket private final String packageName - // private final String propertyName private final String workflowName private final String catalogName private String[] paths @@ -139,12 +130,11 @@ class QuiltParser { this.bucket = bucket this.paths = path ? path.split(SEP) : [] as String[] this.packageName = parsePkg(pkg) - // this.propertyName = options.get(P_PROP) this.workflowName = options.get(P_WORK) this.catalogName = options.get(P_CAT) this.options = options this.metadata = metadata - // log.debug("QuiltParser[${bucket}] for ${packageName} in ${path}") + // log.debug("QuiltParser[${bucket}] for ${packageName} in ${path}") } String parsePkg(String pkg) {