Skip to content

Commit

Permalink
Merge 8ba9a92 into 9f17a0f
Browse files Browse the repository at this point in the history
  • Loading branch information
heuermh committed May 20, 2019
2 parents 9f17a0f + 8ba9a92 commit 124c553
Show file tree
Hide file tree
Showing 4 changed files with 178 additions and 165 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ object FlagStat extends BDGCommandCompanion {

class FlagStatArgs extends Args4jBase {
@Argument(required = true, metaVar = "INPUT", usage = "The ADAM data to return stats for", index = 0)
val inputPath: String = null
var inputPath: String = null
@Args4jOption(required = false, name = "-o", usage = "Optionally write the stats to this file.")
val outputPath: String = null
var outputPath: String = null
@Args4jOption(required = false, name = "-stringency", usage = "Set the parsing stringency: SILENT, LENIENT, STRICT.")
val stringency: String = "SILENT"
var stringency: String = "SILENT"
}

class FlagStat(protected val args: FlagStatArgs) extends BDGSparkCommand[FlagStatArgs] {
Expand Down
5 changes: 4 additions & 1 deletion adam-python/bdgenomics/adam/test/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,10 @@ def checkFiles(self, file1, file2):
def setUp(self):
self._old_sys_path = list(sys.path)
class_name = self.__class__.__name__
self.ss = SparkSession.builder.master('local[4]').appName(class_name).getOrCreate()
self.ss = SparkSession.builder \
.master('local[4]') \
.appName(class_name) \
.getOrCreate()
self.sc = self.ss.sparkContext


Expand Down
5 changes: 5 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,11 @@
<artifactId>adam-codegen-spark2_${scala.version.prefix}</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.paranamer</groupId>
<artifactId>paranamer</artifactId>
<version>2.8</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
Loading

0 comments on commit 124c553

Please sign in to comment.