Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ Broadly speaking the majority of the code is covered under the MIT license with

* Much of the CRAM code is under the Apache License, Version 2
* Core `tribble` code (underlying VCF reading/writing amongst other things) is under LGPL
* Code supporting the reading/writing of SRA format is uncopyrighted & public domain

### Java Minimum Version Support Policy

Expand Down
12 changes: 5 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ dependencies {
implementation "org.json:json:20231013"
implementation 'org.openjdk.nashorn:nashorn-core:15.4'

api "gov.nih.nlm.ncbi:ngs-java:2.9.0"
api "org.apache.commons:commons-jexl:2.1.1"

testImplementation 'org.testng:testng:7.8.0'
Expand Down Expand Up @@ -225,13 +224,13 @@ tasks.register('testWithOptimisticVCF4_4', Test) {
}

test {
description = "Runs the unit tests other than the SRA tests"
description = "Runs the unit tests other than external-API tests"

useTestNG {
if (OperatingSystem.current().isUnix()) {
excludeGroups "slow", "broken", "defaultReference", "optimistic_vcf_4_4", "ftp", "http", "sra", "ena", "htsget"
excludeGroups "slow", "broken", "defaultReference", "optimistic_vcf_4_4", "ftp", "http", "ena", "htsget"
} else {
excludeGroups "slow", "broken", "defaultReference", "optimistic_vcf_4_4", "ftp", "http", "sra", "ena", "htsget", "unix"
excludeGroups "slow", "broken", "defaultReference", "optimistic_vcf_4_4", "ftp", "http", "ena", "htsget", "unix"
}
parallel = "classes"
threadCount = Runtime.runtime.availableProcessors()
Expand All @@ -250,13 +249,12 @@ tasks.register('testFTP', Test) {
}

tasks.register('testExternalApis', Test) {
description = "Run the SRA, ENA, and HTTP tests (tests that interact with external APIs)"
description = "Run the ENA and HTTP tests (tests that interact with external APIs)"
testClassesDirs = sourceSets.test.output.classesDirs
classpath = sourceSets.test.runtimeClasspath
jvmArgs += '-Dsamjdk.sra_libraries_download=true'

useTestNG {
includeGroups "sra", "http", "ena"
includeGroups "http", "ena"
excludeGroups "slow", "broken"
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/htsjdk/beta/plugin/reads/ReadsBundle.java
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ private static <T extends IOPath> Optional<Tuple<String, String>> getInferredCon
} else if (ext.equals((FileExtensions.SAM))) {
return Optional.of(new Tuple<>(BundleResourceType.CT_ALIGNED_READS, BundleResourceType.FMT_READS_SAM));
}
// TODO: finish this, else SRA, htsget,...
// TODO: finish this, else htsget,...
}
return Optional.empty();
}
Expand Down
7 changes: 0 additions & 7 deletions src/main/java/htsjdk/samtools/Defaults.java
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,6 @@ public class Defaults {
*/
public static final String EBI_REFERENCE_SERVICE_URL_MASK;

/**
* Boolean describing whether downloading of SRA native libraries is allowed,
* in case such native libraries are not found locally. Default = false.
*/
public static final boolean SRA_LIBRARIES_DOWNLOAD;

/**
* Whether to attempt to use jlibdeflate (libdeflate via JNI) for DEFLATE compression and decompression.
* When true, the default deflater/inflater factories will try to load the native library and fall back
Expand Down Expand Up @@ -143,7 +137,6 @@ public class Defaults {
CUSTOM_READER_FACTORY = getStringProperty("custom_reader", "");
SAM_FLAG_FIELD_FORMAT =
SamFlagField.valueOf(getStringProperty("sam_flag_field_format", SamFlagField.DECIMAL.name()));
SRA_LIBRARIES_DOWNLOAD = getBooleanProperty("sra_libraries_download", false);
USE_LIBDEFLATE = getBooleanProperty("use_libdeflate", true);
DISABLE_SNAPPY_COMPRESSOR = getBooleanProperty(DISABLE_SNAPPY_PROPERTY_NAME, false);
OPTIMISTIC_VCF_4_4 = getBooleanProperty(OPTIMISTIC_VCF_4_4_PROPERTY, false);
Expand Down
301 changes: 0 additions & 301 deletions src/main/java/htsjdk/samtools/SRAFileReader.java

This file was deleted.

Loading
Loading