diff --git a/FSharp.Data.NBFormat.sln b/FSharp.Data.NBFormat.sln deleted file mode 100644 index 37c8f6d..0000000 --- a/FSharp.Data.NBFormat.sln +++ /dev/null @@ -1,75 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{802031E4-754A-46C9-AE31-DCB1D08EB9A4}" -EndProject -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.NBFormat", "src\FSharp.Data.NBFormat\FSharp.Data.NBFormat.fsproj", "{234DEE51-4F42-4524-8FA0-AB6B0788CA33}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{44768815-2E7C-4C24-9743-0559F3C0F13B}" -EndProject -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.NBFormat.Tests", "tests\FSharp.Data.NBFormat.Tests\FSharp.Data.NBFormat.Tests.fsproj", "{6FA3E97A-517C-44DD-BD58-5D6CF6649884}" -EndProject -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "build", "build\build.fsproj", "{E910F030-7CF8-41E1-BA4B-E6DD043FEDE9}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{73C12042-7974-4CED-9443-1852238D4AE5}" - ProjectSection(SolutionItems) = preProject - .gitignore = .gitignore - build.cmd = build.cmd - build.sh = build.sh - global.json = global.json - LICENSE = LICENSE - README.md = README.md - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ci", "ci", "{6A918720-2F9B-4449-9D4A-B8620E49A4E2}" - ProjectSection(SolutionItems) = preProject - .github\workflows\build-and-test.yml = .github\workflows\build-and-test.yml - EndProjectSection -EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Data.NBConvert", "src\FSharp.Data.NBConvert\FSharp.Data.NBConvert.fsproj", "{72CCF95E-1B24-4775-8D42-147B36186896}" -EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Data.NBConvert.Tool", "src\FSharp.Data.NBConvert.Tool\FSharp.Data.NBConvert.Tool.fsproj", "{FF6F7517-C211-4E5D-A53B-984990EC84BF}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {234DEE51-4F42-4524-8FA0-AB6B0788CA33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {234DEE51-4F42-4524-8FA0-AB6B0788CA33}.Debug|Any CPU.Build.0 = Debug|Any CPU - {234DEE51-4F42-4524-8FA0-AB6B0788CA33}.Release|Any CPU.ActiveCfg = Release|Any CPU - {234DEE51-4F42-4524-8FA0-AB6B0788CA33}.Release|Any CPU.Build.0 = Release|Any CPU - {6FA3E97A-517C-44DD-BD58-5D6CF6649884}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FA3E97A-517C-44DD-BD58-5D6CF6649884}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FA3E97A-517C-44DD-BD58-5D6CF6649884}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FA3E97A-517C-44DD-BD58-5D6CF6649884}.Release|Any CPU.Build.0 = Release|Any CPU - {E910F030-7CF8-41E1-BA4B-E6DD043FEDE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E910F030-7CF8-41E1-BA4B-E6DD043FEDE9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E910F030-7CF8-41E1-BA4B-E6DD043FEDE9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E910F030-7CF8-41E1-BA4B-E6DD043FEDE9}.Release|Any CPU.Build.0 = Release|Any CPU - {72CCF95E-1B24-4775-8D42-147B36186896}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72CCF95E-1B24-4775-8D42-147B36186896}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72CCF95E-1B24-4775-8D42-147B36186896}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72CCF95E-1B24-4775-8D42-147B36186896}.Release|Any CPU.Build.0 = Release|Any CPU - {FF6F7517-C211-4E5D-A53B-984990EC84BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF6F7517-C211-4E5D-A53B-984990EC84BF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF6F7517-C211-4E5D-A53B-984990EC84BF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF6F7517-C211-4E5D-A53B-984990EC84BF}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {234DEE51-4F42-4524-8FA0-AB6B0788CA33} = {802031E4-754A-46C9-AE31-DCB1D08EB9A4} - {6FA3E97A-517C-44DD-BD58-5D6CF6649884} = {44768815-2E7C-4C24-9743-0559F3C0F13B} - {E910F030-7CF8-41E1-BA4B-E6DD043FEDE9} = {73C12042-7974-4CED-9443-1852238D4AE5} - {72CCF95E-1B24-4775-8D42-147B36186896} = {802031E4-754A-46C9-AE31-DCB1D08EB9A4} - {FF6F7517-C211-4E5D-A53B-984990EC84BF} = {802031E4-754A-46C9-AE31-DCB1D08EB9A4} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {24E53BF2-6F6D-4AF2-B939-CB92C0ACB9D1} - EndGlobalSection -EndGlobal diff --git a/NBFormat.NET.sln b/NBFormat.NET.sln new file mode 100644 index 0000000..07ee7f5 --- /dev/null +++ b/NBFormat.NET.sln @@ -0,0 +1,79 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31903.59 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{802031E4-754A-46C9-AE31-DCB1D08EB9A4}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{44768815-2E7C-4C24-9743-0559F3C0F13B}" +EndProject +Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "build", "build\build.fsproj", "{E910F030-7CF8-41E1-BA4B-E6DD043FEDE9}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{73C12042-7974-4CED-9443-1852238D4AE5}" + ProjectSection(SolutionItems) = preProject + .gitignore = .gitignore + LICENSE = LICENSE + README.md = README.md + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".ci", ".ci", "{6A918720-2F9B-4449-9D4A-B8620E49A4E2}" + ProjectSection(SolutionItems) = preProject + .github\workflows\build-and-test.yml = .github\workflows\build-and-test.yml + EndProjectSection +EndProject +Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "NBFormat.NET", "src\NBFormat.NET\NBFormat.NET.fsproj", "{7C5A9AE8-302D-44AC-90E1-4F28F3396E2F}" +EndProject +Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "NBConvert.NET", "src\NBConvert.NET\NBConvert.NET.fsproj", "{E25DCC4B-C798-42EC-B4E3-3CD646DE8BAA}" +EndProject +Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "NBConvert.NET.Tool", "src\NBConvert.NET.Tool\NBConvert.NET.Tool.fsproj", "{AED1C704-1C13-49F1-A2E9-AA3A2695456A}" +EndProject +Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "NBFormat.NET.Tests", "tests\NBFormat.NET.Tests\NBFormat.NET.Tests.fsproj", "{9EB78D66-E4CF-4E22-88E6-B71D2C79F197}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{4EA12D61-5D78-474A-A7E9-58B24870B8E1}" + ProjectSection(SolutionItems) = preProject + build.cmd = build.cmd + build.sh = build.sh + global.json = global.json + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E910F030-7CF8-41E1-BA4B-E6DD043FEDE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E910F030-7CF8-41E1-BA4B-E6DD043FEDE9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E910F030-7CF8-41E1-BA4B-E6DD043FEDE9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E910F030-7CF8-41E1-BA4B-E6DD043FEDE9}.Release|Any CPU.Build.0 = Release|Any CPU + {7C5A9AE8-302D-44AC-90E1-4F28F3396E2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7C5A9AE8-302D-44AC-90E1-4F28F3396E2F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7C5A9AE8-302D-44AC-90E1-4F28F3396E2F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7C5A9AE8-302D-44AC-90E1-4F28F3396E2F}.Release|Any CPU.Build.0 = Release|Any CPU + {E25DCC4B-C798-42EC-B4E3-3CD646DE8BAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E25DCC4B-C798-42EC-B4E3-3CD646DE8BAA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E25DCC4B-C798-42EC-B4E3-3CD646DE8BAA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E25DCC4B-C798-42EC-B4E3-3CD646DE8BAA}.Release|Any CPU.Build.0 = Release|Any CPU + {AED1C704-1C13-49F1-A2E9-AA3A2695456A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AED1C704-1C13-49F1-A2E9-AA3A2695456A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AED1C704-1C13-49F1-A2E9-AA3A2695456A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AED1C704-1C13-49F1-A2E9-AA3A2695456A}.Release|Any CPU.Build.0 = Release|Any CPU + {9EB78D66-E4CF-4E22-88E6-B71D2C79F197}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9EB78D66-E4CF-4E22-88E6-B71D2C79F197}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9EB78D66-E4CF-4E22-88E6-B71D2C79F197}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9EB78D66-E4CF-4E22-88E6-B71D2C79F197}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {E910F030-7CF8-41E1-BA4B-E6DD043FEDE9} = {4EA12D61-5D78-474A-A7E9-58B24870B8E1} + {7C5A9AE8-302D-44AC-90E1-4F28F3396E2F} = {802031E4-754A-46C9-AE31-DCB1D08EB9A4} + {E25DCC4B-C798-42EC-B4E3-3CD646DE8BAA} = {802031E4-754A-46C9-AE31-DCB1D08EB9A4} + {AED1C704-1C13-49F1-A2E9-AA3A2695456A} = {802031E4-754A-46C9-AE31-DCB1D08EB9A4} + {9EB78D66-E4CF-4E22-88E6-B71D2C79F197} = {44768815-2E7C-4C24-9743-0559F3C0F13B} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {24E53BF2-6F6D-4AF2-B939-CB92C0ACB9D1} + EndGlobalSection +EndGlobal diff --git a/README.md b/README.md index fe46147..7cf774e 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ This library aims to close that gap by ### build -Check the [build project](https://github.com/kMutagene/FSharp.Data.NBFormat/blob/main/build) to take a look at the build targets. Here are some examples: +Check the [build project](https://github.com/kMutagene/NBFormat.NET/blob/main/build) to take a look at the build targets. Here are some examples: ```shell # Windows @@ -42,7 +42,7 @@ The library is not on nuget currently, so you currently have to clone the repo a Then you can use it to deserialize a notebook file like this: ```fsharp -open FSharp.Data.NBFormat +open NBFormat.NET open System.IO "your/path/to/a/notebook.ipynb" diff --git a/build/ProjectInfo.fs b/build/ProjectInfo.fs index 5a44c66..408c195 100644 --- a/build/ProjectInfo.fs +++ b/build/ProjectInfo.fs @@ -2,11 +2,11 @@ open Fake.Core -let project = "FSharp.Data.NBFormat" +let project = "NBFormat.NET" let testProjects = [ - "tests/FSharp.Data.NBFormat.Tests/FSharp.Data.NBFormat.Tests.fsproj" + "tests/NBFormat.NET.Tests/NBFormat.NET.Tests.fsproj" ] let solutionFile = $"{project}.sln" diff --git a/src/FSharp.Data.NBConvert/NotebookConverter.fs b/src/FSharp.Data.NBConvert/NotebookConverter.fs deleted file mode 100644 index 90d576b..0000000 --- a/src/FSharp.Data.NBConvert/NotebookConverter.fs +++ /dev/null @@ -1,7 +0,0 @@ -namespace FSharp.Data.NBConvert - -open FSharp.Data.NBFormat -open FSharp.Data.NBFormat.Domain - -type NotebookConverter = - | HTMLConverter of HTMLConverterTemplate \ No newline at end of file diff --git a/src/FSharp.Data.NBConvert.Tool/CLIArgs.fs b/src/NBConvert.NET.Tool/CLIArgs.fs similarity index 100% rename from src/FSharp.Data.NBConvert.Tool/CLIArgs.fs rename to src/NBConvert.NET.Tool/CLIArgs.fs diff --git a/src/FSharp.Data.NBConvert.Tool/FSharp.Data.NBConvert.Tool.fsproj b/src/NBConvert.NET.Tool/NBConvert.NET.Tool.fsproj similarity index 88% rename from src/FSharp.Data.NBConvert.Tool/FSharp.Data.NBConvert.Tool.fsproj rename to src/NBConvert.NET.Tool/NBConvert.NET.Tool.fsproj index e9859ca..3fed93b 100644 --- a/src/FSharp.Data.NBConvert.Tool/FSharp.Data.NBConvert.Tool.fsproj +++ b/src/NBConvert.NET.Tool/NBConvert.NET.Tool.fsproj @@ -12,8 +12,8 @@ - - + + diff --git a/src/FSharp.Data.NBConvert.Tool/Program.fs b/src/NBConvert.NET.Tool/Program.fs similarity index 81% rename from src/FSharp.Data.NBConvert.Tool/Program.fs rename to src/NBConvert.NET.Tool/Program.fs index cb29014..8afe655 100644 --- a/src/FSharp.Data.NBConvert.Tool/Program.fs +++ b/src/NBConvert.NET.Tool/Program.fs @@ -2,9 +2,9 @@ open System open System.IO open FSharp.Data -open FSharp.Data.NBConvert -open FSharp.Data.NBFormat -open FSharp.Data.NBFormat.Domain +open NBConvert.NET +open NBFormat.NET +open NBFormat.NET.Domain [] let main args = @@ -31,7 +31,7 @@ let main args = match toFormat with | OutputFormat.HTML -> let outputPath = Path.Combine(outputDir, Path.GetFileNameWithoutExtension(notebookPath) + ".html") - let convertedNotebook = NBConvert.API.convert(parsedNotebook, (HTMLConverter HTMLConverterTemplates.Default)) + let convertedNotebook = NBConvert.NET.API.convert(parsedNotebook, (HTMLConverter HTMLConverterTemplates.Default)) File.WriteAllText(outputPath, convertedNotebook) | _ -> failwith "Invalid output format" 0 \ No newline at end of file diff --git a/src/FSharp.Data.NBConvert/API.fs b/src/NBConvert.NET/API.fs similarity index 71% rename from src/FSharp.Data.NBConvert/API.fs rename to src/NBConvert.NET/API.fs index 8d6079c..6e761cf 100644 --- a/src/FSharp.Data.NBConvert/API.fs +++ b/src/NBConvert.NET/API.fs @@ -1,8 +1,8 @@ -namespace FSharp.Data.NBConvert +namespace NBConvert.NET -open FSharp.Data.NBFormat -open FSharp.Data.NBFormat.Domain -open FSharp.Data.NBConvert +open NBFormat.NET +open NBFormat.NET.Domain +open NBConvert.NET open Giraffe.ViewEngine diff --git a/src/FSharp.Data.NBConvert/ConverterTemplates/HTMLConverterTemplates.fs b/src/NBConvert.NET/ConverterTemplates/HTMLConverterTemplates.fs similarity index 96% rename from src/FSharp.Data.NBConvert/ConverterTemplates/HTMLConverterTemplates.fs rename to src/NBConvert.NET/ConverterTemplates/HTMLConverterTemplates.fs index 0153e9f..6ec2063 100644 --- a/src/FSharp.Data.NBConvert/ConverterTemplates/HTMLConverterTemplates.fs +++ b/src/NBConvert.NET/ConverterTemplates/HTMLConverterTemplates.fs @@ -1,8 +1,8 @@ -namespace FSharp.Data.NBConvert +namespace NBConvert.NET open Giraffe.ViewEngine -open FSharp.Data.NBFormat -open FSharp.Data.NBFormat.Domain +open NBFormat.NET +open NBFormat.NET.Domain open System.Text open System.Text.Json open System.Text.RegularExpressions diff --git a/src/FSharp.Data.NBConvert/FSharp.Data.NBConvert.fsproj b/src/NBConvert.NET/NBConvert.NET.fsproj similarity index 93% rename from src/FSharp.Data.NBConvert/FSharp.Data.NBConvert.fsproj rename to src/NBConvert.NET/NBConvert.NET.fsproj index 72dca2c..646bce3 100644 --- a/src/FSharp.Data.NBConvert/FSharp.Data.NBConvert.fsproj +++ b/src/NBConvert.NET/NBConvert.NET.fsproj @@ -13,7 +13,7 @@ - + diff --git a/src/NBConvert.NET/NotebookConverter.fs b/src/NBConvert.NET/NotebookConverter.fs new file mode 100644 index 0000000..fd8a206 --- /dev/null +++ b/src/NBConvert.NET/NotebookConverter.fs @@ -0,0 +1,7 @@ +namespace NBConvert.NET + +open NBFormat.NET +open NBFormat.NET.Domain + +type NotebookConverter = + | HTMLConverter of HTMLConverterTemplate \ No newline at end of file diff --git a/src/FSharp.Data.NBFormat/Domain.fs b/src/NBFormat.NET/Domain.fs similarity index 99% rename from src/FSharp.Data.NBFormat/Domain.fs rename to src/NBFormat.NET/Domain.fs index 159070c..83e5156 100644 --- a/src/FSharp.Data.NBFormat/Domain.fs +++ b/src/NBFormat.NET/Domain.fs @@ -1,4 +1,4 @@ -namespace FSharp.Data.NBFormat +namespace NBFormat.NET open System.Text.Json open System.Text.Json.Serialization diff --git a/src/FSharp.Data.NBFormat/FSharp.Data.NBFormat.fsproj b/src/NBFormat.NET/NBFormat.NET.fsproj similarity index 100% rename from src/FSharp.Data.NBFormat/FSharp.Data.NBFormat.fsproj rename to src/NBFormat.NET/NBFormat.NET.fsproj diff --git a/src/FSharp.Data.NBFormat/Serialization.fs b/src/NBFormat.NET/Serialization.fs similarity index 96% rename from src/FSharp.Data.NBFormat/Serialization.fs rename to src/NBFormat.NET/Serialization.fs index 02be353..7872376 100644 --- a/src/FSharp.Data.NBFormat/Serialization.fs +++ b/src/NBFormat.NET/Serialization.fs @@ -1,4 +1,4 @@ -namespace FSharp.Data.NBFormat +namespace NBFormat.NET module Serialization = open Domain diff --git a/src/FSharp.Data.NBFormat/nbformat.v4.5.schema.json b/src/NBFormat.NET/nbformat.v4.5.schema.json similarity index 100% rename from src/FSharp.Data.NBFormat/nbformat.v4.5.schema.json rename to src/NBFormat.NET/nbformat.v4.5.schema.json diff --git a/src/FSharp.Data.NBFormat/playground.fsx b/src/NBFormat.NET/playground.fsx similarity index 57% rename from src/FSharp.Data.NBFormat/playground.fsx rename to src/NBFormat.NET/playground.fsx index e258258..6ad1c0c 100644 --- a/src/FSharp.Data.NBFormat/playground.fsx +++ b/src/NBFormat.NET/playground.fsx @@ -5,9 +5,9 @@ #load "Serialization.fs" open System.IO -open FSharp.Data.NBFormat +open NBFormat.NET -File.ReadAllText @"C:\Users\schne\Source\repos\kMutagene\FSharp.Data.NBFormat\tests\FSharp.Data.NBFormat.Tests\data\polyglot_notebook_plotly_fsharp.ipynb" +File.ReadAllText @"C:\Users\schne\Source\repos\kMutagene\NBFormat.NET\tests\NBFormat.NET.Tests\data\polyglot_notebook_plotly_fsharp.ipynb" |> Serialiation.deserializeNotebook |> Serialiation.serializeNotebook |> Serialiation.deserializeNotebook diff --git a/tests/FSharp.Data.NBFormat.Tests/FSharp.Data.NBFormat.Tests.fsproj b/tests/NBFormat.NET.Tests/NBFormat.NET.Tests.fsproj similarity index 93% rename from tests/FSharp.Data.NBFormat.Tests/FSharp.Data.NBFormat.Tests.fsproj rename to tests/NBFormat.NET.Tests/NBFormat.NET.Tests.fsproj index 9f499bd..b93ea2c 100644 --- a/tests/FSharp.Data.NBFormat.Tests/FSharp.Data.NBFormat.Tests.fsproj +++ b/tests/NBFormat.NET.Tests/NBFormat.NET.Tests.fsproj @@ -30,7 +30,7 @@ - + diff --git a/tests/FSharp.Data.NBFormat.Tests/Program.fs b/tests/NBFormat.NET.Tests/Program.fs similarity index 100% rename from tests/FSharp.Data.NBFormat.Tests/Program.fs rename to tests/NBFormat.NET.Tests/Program.fs diff --git a/tests/FSharp.Data.NBFormat.Tests/SimpleNotebookTests.fs b/tests/NBFormat.NET.Tests/SimpleNotebookTests.fs similarity index 99% rename from tests/FSharp.Data.NBFormat.Tests/SimpleNotebookTests.fs rename to tests/NBFormat.NET.Tests/SimpleNotebookTests.fs index afc0674..6067107 100644 --- a/tests/FSharp.Data.NBFormat.Tests/SimpleNotebookTests.fs +++ b/tests/NBFormat.NET.Tests/SimpleNotebookTests.fs @@ -1,8 +1,8 @@ -namespace FSharp.Data.NBFormat.Tests.notebooks +namespace NBFormat.NET.Tests.notebooks open TestUtils open System.Text.Json -open FSharp.Data.NBFormat +open NBFormat.NET open Xunit module FSharpNotebook = diff --git a/tests/FSharp.Data.NBFormat.Tests/TestUtils.fs b/tests/NBFormat.NET.Tests/TestUtils.fs similarity index 94% rename from tests/FSharp.Data.NBFormat.Tests/TestUtils.fs rename to tests/NBFormat.NET.Tests/TestUtils.fs index 065fd2c..a055222 100644 --- a/tests/FSharp.Data.NBFormat.Tests/TestUtils.fs +++ b/tests/NBFormat.NET.Tests/TestUtils.fs @@ -1,7 +1,7 @@ module TestUtils -open FSharp.Data.NBFormat -open FSharp.Data.NBFormat.Domain +open NBFormat.NET +open NBFormat.NET.Domain open Xunit open System.Text.Json @@ -11,7 +11,7 @@ open System.IO let assembly = Assembly.GetExecutingAssembly() let getEmbeddedResource file = - use str = assembly.GetManifestResourceStream($"FSharp.Data.NBFormat.Tests.{file}") + use str = assembly.GetManifestResourceStream($"NBFormat.NET.Tests.{file}") use r = new StreamReader(str) r.ReadToEnd() diff --git a/tests/FSharp.Data.NBFormat.Tests/data/simple/polyglot_notebook_simple.ipynb b/tests/NBFormat.NET.Tests/data/simple/polyglot_notebook_simple.ipynb similarity index 100% rename from tests/FSharp.Data.NBFormat.Tests/data/simple/polyglot_notebook_simple.ipynb rename to tests/NBFormat.NET.Tests/data/simple/polyglot_notebook_simple.ipynb diff --git a/tests/FSharp.Data.NBFormat.Tests/data/simple/polyglot_notebook_simple_csharp.ipynb b/tests/NBFormat.NET.Tests/data/simple/polyglot_notebook_simple_csharp.ipynb similarity index 100% rename from tests/FSharp.Data.NBFormat.Tests/data/simple/polyglot_notebook_simple_csharp.ipynb rename to tests/NBFormat.NET.Tests/data/simple/polyglot_notebook_simple_csharp.ipynb diff --git a/tests/FSharp.Data.NBFormat.Tests/data/simple/polyglot_notebook_simple_fsharp.ipynb b/tests/NBFormat.NET.Tests/data/simple/polyglot_notebook_simple_fsharp.ipynb similarity index 100% rename from tests/FSharp.Data.NBFormat.Tests/data/simple/polyglot_notebook_simple_fsharp.ipynb rename to tests/NBFormat.NET.Tests/data/simple/polyglot_notebook_simple_fsharp.ipynb