Release Sierra 3.4.10

hivdb · Jan 13, 2024 · 8dd3cb9 · 8dd3cb9
1 parent 997b131
commit 8dd3cb9
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/.latest-version b/.latest-version
@@ -1 +1 @@
-20231209185606
+20240113194711
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = 'edu.stanford.hivdb'
-version = '3.4.9'
+version = '3.4.10'
 
 sourceCompatibility = 15
 targetCompatibility = 15

diff --git a/hivfacts b/hivfacts
diff --git a/sierra-tests/build.gradle b/sierra-tests/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'edu.stanford.hivdb'
-version = '3.4.9'
+version = '3.4.10'
 
 description = """Sierra Unit Tests"""
 

diff --git a/sierra-tests/src/test/java/edu/stanford/hivdb/hivfacts/hiv2/HIV2Test.java b/sierra-tests/src/test/java/edu/stanford/hivdb/hivfacts/hiv2/HIV2Test.java
@@ -212,8 +212,8 @@ public void testGetDrugSynonymMapWithException() {
 	@Test
 	public void testGetDrugResistAlgorithms() {
 		assertNotNull(hiv2.getDrugResistAlgorithms());
-		// 20200214, 28 algorithms
-		assertEquals(hiv2.getDrugResistAlgorithms().size(), 1);
+		// 20240113, 2 algorithms
+		assertEquals(hiv2.getDrugResistAlgorithms().size(), 2);
 	}
 
 	@Test
@@ -225,16 +225,16 @@ public void testGetDrugResistAlgorithms2() {
 
 		assertEquals(hiv2.getDrugResistAlgorithms(algoNames).size(), 3);
 
-		// 20200214 no HIVDB_9.0
+		// 20240113 no HIVDB_10.0
 		List<String> algoNames2 = new ArrayList<>();
-		algoNames2.add("HIVDB_9.0");
+		algoNames2.add("HIVDB_10.0");
 		assertEquals(hiv2.getDrugResistAlgorithms(algoNames2).size(), 1);
 		assertNull(hiv2.getDrugResistAlgorithms(algoNames2).iterator().next());
 	}
 
 	@Test
 	public void testGetDrugResistAlgorithm() {
-		DrugResistanceAlgorithm<HIV2> algo = hiv2.getDrugResistAlgorithm("HIVDB_9.0a3");
+		DrugResistanceAlgorithm<HIV2> algo = hiv2.getDrugResistAlgorithm("HIVDB_9.0");
 		assertNotNull(algo);
 		assertEquals(algo.getFamily(), "HIVDB");
 	}
@@ -248,9 +248,9 @@ public void testGetDrugResistAlgorithmWithException() {
 
 	@Test
 	public void testGetDrugResistAlgorithm2() {
-		DrugResistanceAlgorithm<HIV2> algo = hiv2.getDrugResistAlgorithm("HIVDB", "9.0a3");
+		DrugResistanceAlgorithm<HIV2> algo = hiv2.getDrugResistAlgorithm("HIVDB", "9.0");
 		assertNotNull(algo);
-		assertEquals(algo.getVersion(), "9.0a3");
+		assertEquals(algo.getVersion(), "9.0");
 	}
 
 
@@ -382,8 +382,8 @@ public void testGetMutationType() {
 	@Test
 	public void testGetMutationTypePairs() {
 		assertNotNull(hiv2.getMutationTypePairs());
-		// 20200214, 260 mutation type pairs
-		assertEquals(hiv2.getMutationTypePairs().size(), 124);
+		// 20240113, 130 mutation type pairs
+		assertEquals(hiv2.getMutationTypePairs().size(), 130);
 	}
 
 	@Test

diff --git a/src/main/resources/version.properties b/src/main/resources/version.properties
@@ -1,2 +1,2 @@
-version = 3.4.9
-versionDate = 2023-12-09
+version = 3.4.10
+versionDate = 2024-01-13
+5 −2		Makefile
+929 −0		data/algorithms/HIVDB-HIV2_9.0.xml
+5 −0		data/algorithms/versions_hiv2.json
+1 −0		data/algorithms/versions_hiv2.yml
+66 −0		data/conditional-comments_hiv2.csv
+186 −225		data/conditional-comments_hiv2.json
+130 −124		data/mutation-type-pairs_hiv2.csv
+150 −96		data/mutation-type-pairs_hiv2.json
+9 −2		scripts/condcmts_csv2json.py