Merge pull request #39 from CSBiology/arctrl

Update ARCtrl dependency to 2
CSBiology · Sep 6, 2024 · 9406117 · 9406117
2 parents 20acdce + 6911e72
commit 9406117
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/src/OBO.NET/OBO.NET.fsproj b/src/OBO.NET/OBO.NET.fsproj
@@ -37,14 +37,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ARCtrl.ISA" Version="1.0.0-beta.7" />
+    <PackageReference Include="ARCtrl.Core" Version="2.0.1" />
     <PackageReference Include="ControlledVocabulary" Version="1.0.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="[1.1.1]" PrivateAssets="All" />
     <PackageReference Include="FSharpAux" Version="[2.0.0]" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="7.0.401" />
+    <PackageReference Update="FSharp.Core" Version="8.0.301" />
   </ItemGroup>
 
 </Project>
diff --git a/src/OBO.NET/OboOntology.fs b/src/OBO.NET/OboOntology.fs
@@ -6,7 +6,7 @@ open DBXref
 
 open FSharpAux
 open FSharpAux.Regex
-open ARCtrl.ISA
+open ARCtrl
 
 open System
 open System.IO
@@ -311,7 +311,7 @@ type OboOntology =
                                     | Some oa ->
                                         oa
                                     | None -> 
-                                        OntologyAnnotation.fromString(tan = xref.Name)
+                                        OntologyAnnotation(tan = xref.Name)
                                 )
                             | None ->
                                 []
@@ -361,7 +361,7 @@ type OboOntology =
                                 | Some oa ->
                                     oa
                                 | None -> 
-                                    OntologyAnnotation.fromString(tan = isA)
+                                    OntologyAnnotation(tan = isA)
                             )
                         | None ->
                             []

diff --git a/src/OBO.NET/OboTerm.fs b/src/OBO.NET/OboTerm.fs
@@ -5,7 +5,7 @@ open TermSynonym
 
 open System
 
-open ARCtrl.ISA
+open ARCtrl
 open ControlledVocabulary
 open FSharpAux
 
@@ -517,8 +517,7 @@ type OboTerm =
 
     /// Translates an OBO `term` into an ISADotNet `OntologyAnnotation`.
     static member toOntologyAnnotation (term : OboTerm) =
-        OntologyAnnotation.fromString(term.Name,tan = term.Id)
-        |> fun o -> {o with TermSourceREF = o.TANInfo |> Option.map (fun t -> t.IDSpace)}
+        OntologyAnnotation(term.Name,tan = term.Id)
 
     /// Translates an ISADotNet `OntologyAnnotation` into an OBO `term`.
     static member ofOntologyAnnotation (term : OntologyAnnotation) =