Release 1.2.0 #66

bioDS · Sep 19, 2024 · b50de88 · b50de88
1 parent 2ec13e2
commit b50de88
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 12 deletions.
diff --git a/phylonco-beast/pom.xml b/phylonco-beast/pom.xml
@@ -9,7 +9,7 @@
 
     <artifactId>phylonco-beast</artifactId>
     <!-- must be consisting with version.xml   -->
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0</version>
 
     <properties>
         <beastVersion>2.7.6</beastVersion>

diff --git a/phylonco-beast/src/assembly/phylonco-beast-assembly.xml b/phylonco-beast/src/assembly/phylonco-beast-assembly.xml
@@ -31,6 +31,15 @@
             </sources>
         </moduleSet>
     </moduleSets>
+    <fileSets>
+        <fileSet>
+            <directory>../examples</directory>
+            <outputDirectory>examples</outputDirectory>
+            <excludes>
+                <exclude>test_read_count_model.xml</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
     <files>
         <file>
             <source>version.xml</source>

diff --git a/phylonco-beast/version.xml b/phylonco-beast/version.xml
@@ -35,8 +35,8 @@
         <provider classname="phylonco.beast.evolution.populationmodel.GompertzGrowth_t50"/>
         <provider classname="phylonco.beast.evolution.populationmodel.ConstantGrowth"/>
         <provider classname="phylonco.beast.evolution.populationmodel.StochasticVariableSelection"/>
-        <provider classname="phylonco.beast.evolution.readcountmodel.LikelihoodReadCountModel"/>
-        <provider classname="phylonco.beast.evolution.datatype.ReadCount"/>
+<!--        <provider classname="phylonco.beast.evolution.readcountmodel.LikelihoodReadCountModel"/>-->
+<!--        <provider classname="phylonco.beast.evolution.datatype.ReadCount"/>-->
     </service>
 
 </package>
diff --git a/phylonco-lphy-studio/pom.xml b/phylonco-lphy-studio/pom.xml
@@ -7,7 +7,7 @@
     </parent>
 
     <artifactId>phylonco-lphy-studio</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0</version>
 
     <dependencies>
         <dependency>

diff --git a/phylonco-lphy-studio/src/assembly/phylonco-lphy-studio-assembly.xml b/phylonco-lphy-studio/src/assembly/phylonco-lphy-studio-assembly.xml
@@ -48,6 +48,7 @@
                 <include>**/data/**</include>
             </includes>
             <excludes>
+                <exclude>**/gt16ReadCountModel.lphy</exclude>
                 <exclude>**/todo/**</exclude>
                 <exclude>**/*.log</exclude>
                 <exclude>**/*.trees</exclude>

diff --git a/phylonco-lphy/pom.xml b/phylonco-lphy/pom.xml
@@ -8,7 +8,7 @@
     </parent>
 
     <artifactId>phylonco-lphy</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0</version>
 
     <dependencies>
         <dependency>

diff --git a/phylonco-lphy/src/main/java/phylonco/lphy/spi/PhyloncoImpl.java b/phylonco-lphy/src/main/java/phylonco/lphy/spi/PhyloncoImpl.java
@@ -35,10 +35,10 @@ public PhyloncoImpl() {
     public List<Class<? extends GenerativeDistribution>> declareDistributions() {
         return Arrays.asList(
                 GT16ErrorModel.class,
-                HomozygousAlignmentDistribution.class,
-                ReadCountModel.class,
-                PloidyModel.class,
-                CoverageModel.class);
+                HomozygousAlignmentDistribution.class);
+//                ReadCountModel.class,
+//                PloidyModel.class,
+//                CoverageModel.class);
     }
 
     @Override

diff --git a/phylonco-lphybeast/pom.xml b/phylonco-lphybeast/pom.xml
@@ -8,7 +8,7 @@
 
     <artifactId>phylonco-lphybeast</artifactId>
     <!-- must be consisting with version.xml   -->
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0</version>
 
     <dependencies>
 <!--        <dependency>-->

diff --git a/phylonco-lphybeast/version.xml b/phylonco-lphybeast/version.xml
@@ -1,9 +1,9 @@
 <package name='phylonco.lphybeast' version='1.2.0'>
     <!-- phylonco beast -->
     <depends on='phylonco' atleast='1.2.0'/>
-<!--    <depends on='lphybeast' atleast='1.2.0'/>-->
+    <depends on='lphybeast' atleast='1.2.0'/>
 <!--  include lphybeast  -->
-    <depends on='lphybeast-flc' atleast='0.0.1'/>
+<!--    <depends on='lphybeast-flc' atleast='0.0.1'/>-->
 
     <!-- add BEAST2 service below  -->
     <service type="beast.base.evolution.datatype.DataType">