Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update ARCtrl dependency to 2 #39

Merged
merged 1 commit into from
Sep 6, 2024
Merged

Update ARCtrl dependency to 2 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/OBO.NET/OBO.NET.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
6 changes: 3 additions & 3 deletions src/OBO.NET/OboOntology.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ open DBXref

open FSharpAux
open FSharpAux.Regex
open ARCtrl.ISA
open ARCtrl

open System
open System.IO
Expand Down Expand Up @@ -311,7 +311,7 @@ type OboOntology =
| Some oa ->
oa
| None ->
OntologyAnnotation.fromString(tan = xref.Name)
OntologyAnnotation(tan = xref.Name)
)
| None ->
[]
Expand Down Expand Up @@ -361,7 +361,7 @@ type OboOntology =
| Some oa ->
oa
| None ->
OntologyAnnotation.fromString(tan = isA)
OntologyAnnotation(tan = isA)
)
| None ->
[]
Expand Down
5 changes: 2 additions & 3 deletions src/OBO.NET/OboTerm.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

open System

open ARCtrl.ISA
open ARCtrl
open ControlledVocabulary
open FSharpAux

Expand Down Expand Up @@ -337,7 +337,7 @@
propertyValues builtIn createdBy creationDate

| "xref" | "xref_analog" | "xref_unk" ->
let v = (split.[1..] |> String.concat ": ") |> parseDBXref

Check warning on line 340 in src/OBO.NET/OboTerm.fs

View workflow job for this annotation

GitHub Actions / build-and-test-linux 

This construct is deprecated. Use `DBXref.ofString` instead

Check warning on line 340 in src/OBO.NET/OboTerm.fs

View workflow job for this annotation

GitHub Actions / build-and-test-windows 

This construct is deprecated. Use `DBXref.ofString` instead
OboTerm.fromLines verbose en (lineNumber + 1)
id name isAnonymous altIds definition comment subsets synonyms (v::xrefs) isA
intersectionOf unionOf disjointFrom relationships isObsolete replacedby consider
Expand Down Expand Up @@ -517,8 +517,7 @@

/// 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) =
Expand Down
Loading