Update deps. Net7 (#94)

* Update deps. Net7 * Use net7 in CI * Build for both net6 and net7
fable-compiler · Oct 13, 2023 · 6b731c8 · 6b731c8
1 parent 627a1fe
commit 6b731c8
Show file tree

Hide file tree

Showing 11 changed files with 1,879 additions and 1,595 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -9,13 +9,13 @@
       ]
     },
     "fable": {
-      "version": "4.1.3",
+      "version": "4.2.1",
       "commands": [
         "fable"
       ]
     },
     "fantomas": {
-      "version": "6.0.1",
+      "version": "6.2.1",
       "commands": [
         "fantomas"
       ]

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -19,7 +19,9 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 6.0.403
+          dotnet-version: |
+            6.x
+            7.x
 
       - name: Setup dotnet tools
         run: dotnet tool restore

diff --git a/Build.fs b/Build.fs
@@ -19,7 +19,7 @@ Target.create "Clean" (fun _ ->
 
 Target.create "Build" (fun _ ->
     Shell.mkdir buildPath
-    run dotnet $"fable --exclude Fable.Core --lang Python --outDir {buildPath}" srcPath
+    run dotnet $"fable --lang Python --outDir {buildPath}" srcPath
 )
 
 Target.create "Docs" (fun _ ->

diff --git a/Build.fsproj b/Build.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Helpers.fs" />

diff --git a/README.md b/README.md
@@ -75,6 +75,7 @@ It contains example code for using Fable Python with:
 - [Fable.Logging](https://github.com/dbrattli/Fable.logging), logging for Fable.Python
 - [Fable.Requests](https://github.com/Zaid-Ajaj/Fable.Requests)
 - [Fable.Jupyter](https://github.com/fable-compiler/Fable.Jupyter), Jupyter Notebook using Fable.Python
+- [Fable.Pyexpecto](https://github.com/Freymaurer/Fable.Pyxpecto), Fable-python equivalent for Fable.Mocha
 - [Fable.SimpleJson.Python](https://github.com/Zaid-Ajaj/Fable.SimpleJson.Python)
 - [Fable.Sedlex](https://github.com/thautwarm/Fable.Sedlex)
 - [Feliz.ViewEngine](https://github.com/dbrattli/Feliz.ViewEngine)

diff --git a/examples/timeflies/TimeFlies.fsproj b/examples/timeflies/TimeFlies.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <WarnOn>3390;$(WarnOn)</WarnOn>
   </PropertyGroup>
   <ItemGroup>

diff --git a/examples/timeflies/pyproject.toml b/examples/timeflies/pyproject.toml
@@ -9,12 +9,15 @@ license = "MIT"
 [tool.poetry.dependencies]
 python = "^3.9"
 fable-library = ">=0.8.0"
-fable-python = ""
-fsharp-control-async-rx = ""
+#fable-python = "*"
+#fsharp-control-async-rx = "*"
 
 [tool.poetry.dev-dependencies]
-fable-python = {path = "./fable_modules/fable-python", develop = true}
-fsharp-control-async-rx = {path = "./fable_modules/fsharp-control-async-rx", develop = true}
+#fable-python = {path = "./fable_modules/fable-python", develop = true}
+#fsharp-control-async-rx = {path = "./fable_modules/fsharp-control-async-rx", develop = true}
+
+[tool.poetry.group.dev.dependencies]
+black = "^22.10.0"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

diff --git a/paket.dependencies b/paket.dependencies
@@ -2,7 +2,7 @@
 
 source https://api.nuget.org/v3/index.json
 storage: none
-framework: net6.0, netstandard2.0, netstandard2.1
+framework: netstandard2.0, netstandard2.1, net6.0, net7.0
 
 nuget FSharp.Core >= 4.7.2 lowest_matching: true
 nuget Fable.Core ~> 4.1
@@ -22,7 +22,7 @@ group Test
 group Build
     source https://api.nuget.org/v3/index.json
     storage: none
-    framework: net6.0
+    framework: net7.0
 
     nuget System.Collections.Immutable
     nuget Fake.Core.Target

diff --git a/paket.lock b/paket.lock
@@ -1,105 +1,104 @@
 STORAGE: NONE
-RESTRICTION: || (== net6.0) (== netstandard2.0) (== netstandard2.1)
+RESTRICTION: || (== net6.0) (== net7.0) (== netstandard2.0) (== netstandard2.1)
 NUGET
   remote: https://api.nuget.org/v3/index.json
-    Fable.Core (4.0.0-theta-007)
+    Fable.Core (4.1)
     FSharp.Core (4.7.2)
 
 GROUP Build
 STORAGE: NONE
-RESTRICTION: == net6.0
+RESTRICTION: == net7.0
 NUGET
   remote: https://api.nuget.org/v3/index.json
-    Fake.Core.CommandLineParsing (5.23.1)
+    Fake.Core.CommandLineParsing (6.0)
       FParsec (>= 1.1.1)
-      FSharp.Core (>= 6.0)
-    Fake.Core.Context (5.23.1)
-      FSharp.Core (>= 6.0)
-    Fake.Core.Environment (5.23.1)
-      FSharp.Core (>= 6.0)
-    Fake.Core.FakeVar (5.23.1)
-      Fake.Core.Context (>= 5.23.1)
-      FSharp.Core (>= 6.0)
-    Fake.Core.Process (5.23.1)
-      Fake.Core.Environment (>= 5.23.1)
-      Fake.Core.FakeVar (>= 5.23.1)
-      Fake.Core.String (>= 5.23.1)
-      Fake.Core.Trace (>= 5.23.1)
-      Fake.IO.FileSystem (>= 5.23.1)
-      FSharp.Core (>= 6.0)
-      System.Collections.Immutable (>= 5.0)
-    Fake.Core.String (5.23.1)
-      FSharp.Core (>= 6.0)
-    Fake.Core.Target (5.23.1)
-      Fake.Core.CommandLineParsing (>= 5.23.1)
-      Fake.Core.Context (>= 5.23.1)
-      Fake.Core.Environment (>= 5.23.1)
-      Fake.Core.FakeVar (>= 5.23.1)
-      Fake.Core.Process (>= 5.23.1)
-      Fake.Core.String (>= 5.23.1)
-      Fake.Core.Trace (>= 5.23.1)
+      FSharp.Core (>= 6.0.3)
+    Fake.Core.Context (6.0)
+      FSharp.Core (>= 6.0.3)
+    Fake.Core.Environment (6.0)
+      FSharp.Core (>= 6.0.3)
+    Fake.Core.FakeVar (6.0)
+      Fake.Core.Context (>= 6.0)
+      FSharp.Core (>= 6.0.3)
+    Fake.Core.Process (6.0)
+      Fake.Core.Environment (>= 6.0)
+      Fake.Core.FakeVar (>= 6.0)
+      Fake.Core.String (>= 6.0)
+      Fake.Core.Trace (>= 6.0)
+      Fake.IO.FileSystem (>= 6.0)
+      FSharp.Core (>= 6.0.3)
+      System.Collections.Immutable (>= 6.0)
+    Fake.Core.String (6.0)
+      FSharp.Core (>= 6.0.3)
+    Fake.Core.Target (6.0)
+      Fake.Core.CommandLineParsing (>= 6.0)
+      Fake.Core.Context (>= 6.0)
+      Fake.Core.Environment (>= 6.0)
+      Fake.Core.FakeVar (>= 6.0)
+      Fake.Core.Process (>= 6.0)
+      Fake.Core.String (>= 6.0)
+      Fake.Core.Trace (>= 6.0)
       FSharp.Control.Reactive (>= 5.0.2)
-      FSharp.Core (>= 6.0)
-    Fake.Core.Trace (5.23.1)
-      Fake.Core.Environment (>= 5.23.1)
-      Fake.Core.FakeVar (>= 5.23.1)
-      FSharp.Core (>= 6.0)
-    Fake.IO.FileSystem (5.23.1)
-      Fake.Core.String (>= 5.23.1)
-      FSharp.Core (>= 6.0)
+      FSharp.Core (>= 6.0.3)
+    Fake.Core.Trace (6.0)
+      Fake.Core.Environment (>= 6.0)
+      Fake.Core.FakeVar (>= 6.0)
+      FSharp.Core (>= 6.0.3)
+    Fake.IO.FileSystem (6.0)
+      Fake.Core.String (>= 6.0)
+      Fake.Core.Trace (>= 6.0)
+      FSharp.Core (>= 6.0.3)
     FParsec (1.1.1)
       FSharp.Core (>= 4.3.4)
     FSharp.Control.Reactive (5.0.5)
       FSharp.Core (>= 4.7.2)
       System.Reactive (>= 5.0 < 6.0)
-    FSharp.Core (7.0)
+    FSharp.Core (7.0.400)
     System.Collections.Immutable (7.0)
-      System.Runtime.CompilerServices.Unsafe (>= 6.0)
     System.Reactive (5.0)
-    System.Runtime.CompilerServices.Unsafe (6.0)
 
 GROUP Test
 STORAGE: NONE
 RESTRICTION: == net6.0
 NUGET
   remote: https://api.nuget.org/v3/index.json
-    Fable.Core (4.0.0-theta-007)
-    FSharp.Core (7.0)
-    Microsoft.CodeCoverage (17.4.1)
+    Fable.Core (4.1)
+    FSharp.Core (7.0.400)
+    Microsoft.CodeCoverage (17.7.2)
     Microsoft.NET.Test.Sdk (16.11)
       Microsoft.CodeCoverage (>= 16.11)
       Microsoft.TestPlatform.TestHost (>= 16.11)
-    Microsoft.NETCore.Platforms (7.0)
-    Microsoft.TestPlatform.ObjectModel (17.4.1)
-      NuGet.Frameworks (>= 5.11)
+    Microsoft.NETCore.Platforms (7.0.4)
+    Microsoft.TestPlatform.ObjectModel (17.7.2)
+      NuGet.Frameworks (>= 6.5)
       System.Reflection.Metadata (>= 1.6)
-    Microsoft.TestPlatform.TestHost (17.4.1)
-      Microsoft.TestPlatform.ObjectModel (>= 17.4.1)
+    Microsoft.TestPlatform.TestHost (17.7.2)
+      Microsoft.TestPlatform.ObjectModel (>= 17.7.2)
       Newtonsoft.Json (>= 13.0.1)
     NETStandard.Library (2.0.3)
       Microsoft.NETCore.Platforms (>= 1.1)
-    Newtonsoft.Json (13.0.2)
-    NuGet.Frameworks (6.4)
+    Newtonsoft.Json (13.0.3)
+    NuGet.Frameworks (6.7)
     System.Collections.Immutable (7.0)
       System.Runtime.CompilerServices.Unsafe (>= 6.0)
-    System.Reflection.Metadata (7.0)
+    System.Reflection.Metadata (7.0.2)
       System.Collections.Immutable (>= 7.0)
     System.Runtime.CompilerServices.Unsafe (6.0)
-    xunit (2.4.2)
-      xunit.analyzers (>= 1.0)
-      xunit.assert (>= 2.4.2)
-      xunit.core (2.4.2)
+    XUnit (2.5.2)
+      xunit.analyzers (>= 1.4)
+      xunit.assert (>= 2.5.2)
+      xunit.core (2.5.2)
     xunit.abstractions (2.0.3)
-    xunit.analyzers (1.1)
-    xunit.assert (2.4.2)
+    xunit.analyzers (1.4)
+    xunit.assert (2.5.2)
       NETStandard.Library (>= 1.6.1)
-    xunit.core (2.4.2)
-      xunit.extensibility.core (2.4.2)
-      xunit.extensibility.execution (2.4.2)
-    xunit.extensibility.core (2.4.2)
+    xunit.core (2.5.2)
+      xunit.extensibility.core (2.5.2)
+      xunit.extensibility.execution (2.5.2)
+    xunit.extensibility.core (2.5.2)
       NETStandard.Library (>= 1.6.1)
       xunit.abstractions (>= 2.0.3)
-    xunit.extensibility.execution (2.4.2)
+    xunit.extensibility.execution (2.5.2)
       NETStandard.Library (>= 1.6.1)
-      xunit.extensibility.core (2.4.2)
-    xunit.runner.visualstudio (2.4.5)
+      xunit.extensibility.core (2.5.2)
+    xunit.runner.visualstudio (2.5.3)