Skip to content

Commit b2fa0f8

Browse files
committed
minor edits
Signed-off-by: Ben Sherman <bentshermann@gmail.com>
1 parent 583285c commit b2fa0f8

7 files changed

Lines changed: 14 additions & 18 deletions

File tree

docs/module.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -362,8 +362,8 @@ $ nextflow module remove nf-core/fastqc
362362

363363
By default, both the module files and the `.module-info` file are removed. Use the flags below to control this behaviour:
364364

365-
- `-keep-files` Remove the `.module-info` file created at install but keep the rest of files
366-
- `-force` Force removal even if the module has no `.module-info` file (i.e. not installed from a registry) or has local modifications
365+
- `-keep-files`: Remove the `.module-info` file created at install but keep the rest of files
366+
- `-force`: Force removal even if the module has no `.module-info` file (i.e. not installed from a registry) or has local modifications
367367

368368
### Viewing module information
369369

@@ -430,7 +430,7 @@ Registry modules follow a standard directory structure:
430430
modules/
431431
└── scope/
432432
└── module-name/
433-
├── .checksum # Integrity checksum (generated automatically)
433+
├── .module-info # Integrity checksum (generated automatically)
434434
├── README.md # Documentation (required for publishing)
435435
├── main.nf # Module entry point (required)
436436
├── meta.yaml # Module metadata (required for publishing)

modules/nextflow/src/main/groovy/nextflow/module/DefaultRemoteModuleResolver.groovy

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,7 @@ class DefaultRemoteModuleResolver implements RemoteModuleResolver {
6565
log.debug "Module ${reference} resolved to ${mainFile}"
6666
return mainFile
6767
} catch (Exception e) {
68-
throw new IllegalModulePath(
69-
"Failed to resolve remote module ${moduleName}: ${e.message}",
70-
e
71-
)
68+
throw new IllegalModulePath("Failed to resolve remote module ${moduleName}: ${e.message}", e)
7269
}
7370
}
7471

modules/nextflow/src/main/groovy/nextflow/module/ModuleReference.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import java.util.regex.Pattern
3131
@EqualsAndHashCode
3232
class ModuleReference {
3333

34-
// Pattern allows: optional @, scope with letters/digits/hyphens/dots/underscores, name segments separated by slashes (no trailing slash)
34+
// Pattern allows: scope with letters/digits/hyphens/dots/underscores, name segments separated by slashes (no trailing slash)
3535
// Scope: starts with letter/digit, followed by letters/digits/dots/underscores/hyphens
3636
// Name: one or more segments (each starting with letter, followed by letters/digits/underscores/hyphens), separated by slashes
3737
private static final Pattern MODULE_NAME_PATTERN = ~/^([a-z0-9][a-z0-9._\-]*)\/([a-z][a-z0-9._\-]*(?:\/[a-z][a-z0-9._\-]*)*)$/
@@ -47,7 +47,7 @@ class ModuleReference {
4747
}
4848

4949
/**
50-
* Parse a module reference from a string in "@scope/name" or "scope/name" format
50+
* Parse a module reference from a string as "scope/name"
5151
*
5252
* @param source The module reference string
5353
* @return A ModuleReference object

modules/nextflow/src/main/resources/META-INF/extensions.idx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ nextflow.cache.DefaultCacheFactory
1818
nextflow.conda.CondaConfig
1919
nextflow.config.ConfigMap
2020
nextflow.config.Manifest
21-
nextflow.config.WorkflowConfig
2221
nextflow.config.RegistryConfig
22+
nextflow.config.WorkflowConfig
2323
nextflow.container.ApptainerConfig
2424
nextflow.container.CharliecloudConfig
2525
nextflow.container.DockerConfig

modules/nextflow/src/testFixtures/groovy/test/TestHelper.groovy

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,16 @@
1616

1717
package test
1818

19-
import com.google.common.jimfs.JimfsPath
20-
import nextflow.util.KryoHelper
21-
import nextflow.util.PathSerializer
22-
2319
import java.nio.file.Files
2420
import java.nio.file.Path
2521
import java.util.zip.GZIPInputStream
2622

2723
import com.google.common.jimfs.Configuration
2824
import com.google.common.jimfs.Jimfs
25+
import com.google.common.jimfs.JimfsPath
2926
import groovy.transform.Memoized
27+
import nextflow.util.KryoHelper
28+
import nextflow.util.PathSerializer
3029
/**
3130
*
3231
* @author Paolo Di Tommaso <paolo.ditommaso@gmail.com>

modules/nf-commons/src/main/nextflow/config/RegistryConfig.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ import nextflow.script.dsl.Description
3636
@CompileStatic
3737
class RegistryConfig implements ConfigScope {
3838

39-
final static public String DEFAULT_REGISTRY_URL = 'https://registry.nextflow.io/api'
39+
public static final String DEFAULT_REGISTRY_URL = 'https://registry.nextflow.io/api'
4040

4141
@ConfigOption
4242
@Description("Registry URL or list of registry URLs in priority order (primary URL first)")
43-
final private Collection<String> url
43+
private final Collection<String> url
4444

4545
@ConfigOption
4646
@Description("API key for authenticating with the primary registry")
47-
final private String apiKey
47+
private final String apiKey
4848

4949
/* required by extension point -- do not remove */
5050
RegistryConfig() {

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,5 @@ include 'plugins:nf-cloudcache'
4949
include 'plugins:nf-k8s'
5050
include 'plugins:nf-seqera'
5151

52-
//includeBuild '../sched'
5352
//includeBuild('../plugin-registry')
53+
//includeBuild '../sched'

0 commit comments

Comments
 (0)