rename json IO implementations folder to reduce ambiguity in py and j…

…avascript packages
nfdi4plants · Oct 2, 2024 · 99b2659 · 99b2659
1 parent 8552f9e
commit 99b2659
Show file tree

Hide file tree

Showing 41 changed files with 26 additions and 18 deletions.
diff --git a/build/PackageTasks.fs b/build/PackageTasks.fs
@@ -22,22 +22,30 @@ module BundleDotNet =
         System.IO.Directory.CreateDirectory(ProjectInfo.netPkgDir) |> ignore
         !! "src/**/*.*proj"
         -- "src/bin/*"
-        |> Seq.iter (Fake.DotNet.DotNet.pack (fun p ->
-            let msBuildParams =
-                {p.MSBuildParams with 
-                    Properties = ([
-                        "Version",versionTag
-                        "PackageReleaseNotes",  (ProjectInfo.release.Notes |> List.map replaceCommitLink |> String.toLines )
-                    ] @ p.MSBuildParams.Properties)
-                    DisableInternalBinLog = true
-                }
-            {
-                p with 
-                    VersionSuffix = versionSuffix
-                    MSBuildParams = msBuildParams
-                    OutputPath = Some ProjectInfo.netPkgDir
-            }
-        ))
+        |> Seq.iter (fun g ->
+            try
+                g
+                |> Fake.DotNet.DotNet.pack (fun p ->
+
+                    let msBuildParams =
+                        {p.MSBuildParams with 
+                            Properties = ([
+                                "Version",versionTag
+                                "PackageReleaseNotes",  (ProjectInfo.release.Notes |> List.map replaceCommitLink |> String.toLines )
+                            ] @ p.MSBuildParams.Properties)
+                            DisableInternalBinLog = true
+                        }
+                    {
+                        p with 
+                            VersionSuffix = versionSuffix
+                            MSBuildParams = msBuildParams
+                            OutputPath = Some ProjectInfo.netPkgDir
+                    }
+
+                ) 
+            with
+            | err -> ()
+        )
 
 let packDotNet = BuildTask.create "PackDotNet" [clean; build; runTests] {
     BundleDotNet.bundle ProjectInfo.stableVersionTag None
@@ -86,7 +94,7 @@ let packJSPrerelease = BuildTask.create "PackJSPrerelease" [setPrereleaseTag; cl
 module BundlePy =
     let bundle (versionTag: string) =
 
-        run dotnet $"fable src/ARCtrl -o {ProjectInfo.pyPkgDir}/arctrl --lang python" ""
+        run dotnet $"fable src/ARCtrl/ARCtrl.Python.fsproj -o {ProjectInfo.pyPkgDir}/arctrl --lang python" ""
         run python "-m poetry install --no-root" ProjectInfo.pyPkgDir
         GenerateIndexPy.ARCtrl_generate (ProjectInfo.pyPkgDir + "/arctrl")
 
@@ -104,7 +112,7 @@ module BundlePy =
         run python "-m poetry build" ProjectInfo.pyPkgDir //Remove "-o ." because not compatible with publish 
 
 
-let packPy = BuildTask.create "PackPy" [clean; build; runTests] {
+let packPy = BuildTask.create "PackPy" [clean; build; (*runTests*)] {
     BundlePy.bundle ProjectInfo.stableVersionTag
 
 }

diff --git a/src/ARCtrl/Json/ARC.fs → src/ARCtrl/JsonIO/ARC.fs b/src/ARCtrl/Json/ARC.fs → src/ARCtrl/JsonIO/ARC.fs
diff --git a/src/ARCtrl/Json/Assay.fs → src/ARCtrl/JsonIO/Assay.fs b/src/ARCtrl/Json/Assay.fs → src/ARCtrl/JsonIO/Assay.fs
diff --git a/src/ARCtrl/Json/Comment.fs → src/ARCtrl/JsonIO/Comment.fs b/src/ARCtrl/Json/Comment.fs → src/ARCtrl/JsonIO/Comment.fs
diff --git a/src/ARCtrl/Json/Data.fs → src/ARCtrl/JsonIO/Data.fs b/src/ARCtrl/Json/Data.fs → src/ARCtrl/JsonIO/Data.fs
diff --git a/src/ARCtrl/Json/DataFile.fs → src/ARCtrl/JsonIO/DataFile.fs b/src/ARCtrl/Json/DataFile.fs → src/ARCtrl/JsonIO/DataFile.fs
diff --git a/src/ARCtrl/Json/DataMap/DataMap.fs → src/ARCtrl/JsonIO/DataMap/DataMap.fs b/src/ARCtrl/Json/DataMap/DataMap.fs → src/ARCtrl/JsonIO/DataMap/DataMap.fs
diff --git a/src/ARCtrl/Json/Decode.fs → src/ARCtrl/JsonIO/Decode.fs b/src/ARCtrl/Json/Decode.fs → src/ARCtrl/JsonIO/Decode.fs
diff --git a/src/ARCtrl/Json/Encode.fs → src/ARCtrl/JsonIO/Encode.fs b/src/ARCtrl/Json/Encode.fs → src/ARCtrl/JsonIO/Encode.fs
diff --git a/src/ARCtrl/Json/Investigation.fs → src/ARCtrl/JsonIO/Investigation.fs b/src/ARCtrl/Json/Investigation.fs → src/ARCtrl/JsonIO/Investigation.fs
diff --git a/src/ARCtrl/Json/OntologyAnnotation.fs → src/ARCtrl/JsonIO/OntologyAnnotation.fs b/src/ARCtrl/Json/OntologyAnnotation.fs → src/ARCtrl/JsonIO/OntologyAnnotation.fs
diff --git a/src/ARCtrl/Json/OntologySourceReference.fs → src/ARCtrl/JsonIO/OntologySourceReference.fs b/src/ARCtrl/Json/OntologySourceReference.fs → src/ARCtrl/JsonIO/OntologySourceReference.fs
diff --git a/src/ARCtrl/Json/Person.fs → src/ARCtrl/JsonIO/Person.fs b/src/ARCtrl/Json/Person.fs → src/ARCtrl/JsonIO/Person.fs
diff --git a/src/ARCtrl/Json/Process/Component.fs → src/ARCtrl/JsonIO/Process/Component.fs b/src/ARCtrl/Json/Process/Component.fs → src/ARCtrl/JsonIO/Process/Component.fs
diff --git a/src/ARCtrl/Json/Process/Factor.fs → src/ARCtrl/JsonIO/Process/Factor.fs b/src/ARCtrl/Json/Process/Factor.fs → src/ARCtrl/JsonIO/Process/Factor.fs
diff --git a/src/ARCtrl/Json/Process/FactorValue.fs → src/ARCtrl/JsonIO/Process/FactorValue.fs b/src/ARCtrl/Json/Process/FactorValue.fs → src/ARCtrl/JsonIO/Process/FactorValue.fs
diff --git a/src/ARCtrl/Json/Process/Material.fs → src/ARCtrl/JsonIO/Process/Material.fs b/src/ARCtrl/Json/Process/Material.fs → src/ARCtrl/JsonIO/Process/Material.fs
diff --git a/src/ARCtrl/Json/Process/MaterialAttribute.fs → ...RCtrl/JsonIO/Process/MaterialAttribute.fs b/src/ARCtrl/Json/Process/MaterialAttribute.fs → ...RCtrl/JsonIO/Process/MaterialAttribute.fs
diff --git a/...rl/Json/Process/MaterialAttributeValue.fs → .../JsonIO/Process/MaterialAttributeValue.fs b/...rl/Json/Process/MaterialAttributeValue.fs → .../JsonIO/Process/MaterialAttributeValue.fs
diff --git a/src/ARCtrl/Json/Process/MaterialType.fs → src/ARCtrl/JsonIO/Process/MaterialType.fs b/src/ARCtrl/Json/Process/MaterialType.fs → src/ARCtrl/JsonIO/Process/MaterialType.fs
diff --git a/src/ARCtrl/Json/Process/Process.fs → src/ARCtrl/JsonIO/Process/Process.fs b/src/ARCtrl/Json/Process/Process.fs → src/ARCtrl/JsonIO/Process/Process.fs
diff --git a/src/ARCtrl/Json/Process/ProcessInput.fs → src/ARCtrl/JsonIO/Process/ProcessInput.fs b/src/ARCtrl/Json/Process/ProcessInput.fs → src/ARCtrl/JsonIO/Process/ProcessInput.fs
diff --git a/src/ARCtrl/Json/Process/ProcessOutput.fs → src/ARCtrl/JsonIO/Process/ProcessOutput.fs b/src/ARCtrl/Json/Process/ProcessOutput.fs → src/ARCtrl/JsonIO/Process/ProcessOutput.fs
diff --git a/...trl/Json/Process/ProcessParameterValue.fs → ...l/JsonIO/Process/ProcessParameterValue.fs b/...trl/Json/Process/ProcessParameterValue.fs → ...l/JsonIO/Process/ProcessParameterValue.fs
diff --git a/src/ARCtrl/Json/Process/ProcessSequence.fs → src/ARCtrl/JsonIO/Process/ProcessSequence.fs b/src/ARCtrl/Json/Process/ProcessSequence.fs → src/ARCtrl/JsonIO/Process/ProcessSequence.fs
diff --git a/src/ARCtrl/Json/Process/Protocol.fs → src/ARCtrl/JsonIO/Process/Protocol.fs b/src/ARCtrl/Json/Process/Protocol.fs → src/ARCtrl/JsonIO/Process/Protocol.fs
diff --git a/src/ARCtrl/Json/Process/ProtocolParameter.fs → ...RCtrl/JsonIO/Process/ProtocolParameter.fs b/src/ARCtrl/Json/Process/ProtocolParameter.fs → ...RCtrl/JsonIO/Process/ProtocolParameter.fs
diff --git a/src/ARCtrl/Json/Process/Sample.fs → src/ARCtrl/JsonIO/Process/Sample.fs b/src/ARCtrl/Json/Process/Sample.fs → src/ARCtrl/JsonIO/Process/Sample.fs
diff --git a/src/ARCtrl/Json/Process/Source.fs → src/ARCtrl/JsonIO/Process/Source.fs b/src/ARCtrl/Json/Process/Source.fs → src/ARCtrl/JsonIO/Process/Source.fs
diff --git a/src/ARCtrl/Json/Process/StudyMaterials.fs → src/ARCtrl/JsonIO/Process/StudyMaterials.fs b/src/ARCtrl/Json/Process/StudyMaterials.fs → src/ARCtrl/JsonIO/Process/StudyMaterials.fs
diff --git a/src/ARCtrl/Json/Process/Value.fs → src/ARCtrl/JsonIO/Process/Value.fs b/src/ARCtrl/Json/Process/Value.fs → src/ARCtrl/JsonIO/Process/Value.fs
diff --git a/src/ARCtrl/Json/Publication.fs → src/ARCtrl/JsonIO/Publication.fs b/src/ARCtrl/Json/Publication.fs → src/ARCtrl/JsonIO/Publication.fs
diff --git a/src/ARCtrl/Json/ROCrateHelper.fs → src/ARCtrl/JsonIO/ROCrateHelper.fs b/src/ARCtrl/Json/ROCrateHelper.fs → src/ARCtrl/JsonIO/ROCrateHelper.fs
diff --git a/src/ARCtrl/Json/ROCrateObject.fs → src/ARCtrl/JsonIO/ROCrateObject.fs b/src/ARCtrl/Json/ROCrateObject.fs → src/ARCtrl/JsonIO/ROCrateObject.fs
diff --git a/src/ARCtrl/Json/Study.fs → src/ARCtrl/JsonIO/Study.fs b/src/ARCtrl/Json/Study.fs → src/ARCtrl/JsonIO/Study.fs
diff --git a/src/ARCtrl/Json/Table/ArcTable.fs → src/ARCtrl/JsonIO/Table/ArcTable.fs b/src/ARCtrl/Json/Table/ArcTable.fs → src/ARCtrl/JsonIO/Table/ArcTable.fs
diff --git a/src/ARCtrl/Json/Table/CompositeCell.fs → src/ARCtrl/JsonIO/Table/CompositeCell.fs b/src/ARCtrl/Json/Table/CompositeCell.fs → src/ARCtrl/JsonIO/Table/CompositeCell.fs
diff --git a/src/ARCtrl/Json/Table/CompositeHeader.fs → src/ARCtrl/JsonIO/Table/CompositeHeader.fs b/src/ARCtrl/Json/Table/CompositeHeader.fs → src/ARCtrl/JsonIO/Table/CompositeHeader.fs
diff --git a/src/ARCtrl/Json/Table/Compression.fs → src/ARCtrl/JsonIO/Table/Compression.fs b/src/ARCtrl/Json/Table/Compression.fs → src/ARCtrl/JsonIO/Table/Compression.fs
diff --git a/src/ARCtrl/Json/Table/IOType.fs → src/ARCtrl/JsonIO/Table/IOType.fs b/src/ARCtrl/Json/Table/IOType.fs → src/ARCtrl/JsonIO/Table/IOType.fs
diff --git a/src/ARCtrl/Json/Table/Templates.fs → src/ARCtrl/JsonIO/Table/Templates.fs b/src/ARCtrl/Json/Table/Templates.fs → src/ARCtrl/JsonIO/Table/Templates.fs