Skip to content

Commit

Permalink
Merge branch 'master' of github.com:nextflow-io/nextflow
Browse files Browse the repository at this point in the history
  • Loading branch information
pditommaso committed Oct 3, 2014
2 parents 2867d05 + c1121ee commit c6762cc
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ Currently the following clusters are supported:
+ Oracle Grid Engine (SGE)
+ Platform LSF
+ SLURM (beta)
+ PBS/Torque (beta)


By default processes are parallelized by spanning multiple threads in the machine where the pipeline is launched.
Expand Down Expand Up @@ -214,6 +215,11 @@ Community
You can post questions, or report problems by using the Nextflow Google group available
at this link https://groups.google.com/forum/#!forum/nextflow

Build servers
--------------

* [Travis-CI](https://travis-ci.org/nextflow-io/nextflow)
* [Groovy Joint build](http://ci.groovy-lang.org/project.html?projectId=JointBuilds_Nextflow&guest=1)

License
-------
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ apply plugin: 'idea'

if (System.getenv('CI_GROOVY_VERSION')) {
// Add ability to test with upcoming versions of Groovy
groovyVer = System.getenv('CI_GROOVY_VERSION')
def groovyVer = System.getenv('CI_GROOVY_VERSION')
if (groovyVer.endsWith('-SNAPSHOT')) {
allprojects {
repositories {
Expand Down
6 changes: 3 additions & 3 deletions docs/script.rst
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ for the given file and allows you to read the content in single characters, line

myReader = myFile.newReader()
String line
while( ( line = myReader.readLine() ) {
while( line = myReader.readLine() ) {
println line
}
myReader.close()
Expand All @@ -536,7 +536,7 @@ processing the file since it is managed automatically by the method itself. The

myFile.withReader {
String line
while( ( line = myReader.readLine() ) {
while( line = myReader.readLine() ) {
println line
}
}
Expand Down Expand Up @@ -579,7 +579,7 @@ file content from the first file into the second one replacing all the ``U`` cha
sourceFile.withReader { source ->
targetFile.withWriter { target ->
String line
while( (line=source.readLine()) {
while( line=source.readLine() ) {
target << line.replaceAll('U','X')
}
}
Expand Down

0 comments on commit c6762cc

Please sign in to comment.