4.0.0-snake-island-alpha-014 (#60)

dbrattli · web-flow · commit f67416c92f61 · 2022-07-25T21:33:34.000+02:00
* 4.0.0-snake-island-alpha-014

* fix: use poetry

* fix: setup Python
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "fable": {
-      "version": "4.0.0-snake-island-alpha-006",
+      "version": "4.0.0-snake-island-alpha-014",
       "commands": [
         "fable"
       ]
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -12,23 +12,40 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
+
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: 6.0.100
+
       - name: Setup dotnet tools
         run: dotnet tool restore
+
       - name: Install src dependencies
         run: dotnet restore src
+
       - name: Install test dependencies
         run: dotnet restore test
+
       - name: Install pytest runner
         run: pip install pytest
+
       - name: Install build dependencies
         run: dotnet restore Build.fsproj
+
       #- name: Check formatting
       #  run: dotnet fantomas . -r --check
+
       - name: Build
         run: dotnet run Build --configuration Release --no-restore
+
+      - name: Install dependencies
+        run: |
+          pip install poetry
+          poetry install
+
       - name: Test
         run: dotnet run Test
diff --git a/Build.fs b/Build.fs
@@ -34,7 +34,7 @@ Target.create "Test" (fun _ ->
       "python", dotnet $"fable --lang Python --outDir {buildPath}/tests" testsPath
       ]
     |> runParallel
-    run pytest $"{buildPath}/tests" ""
+    run poetry $"run pytest {buildPath}/tests" ""
 )
 
 Target.create "Pack" (fun _ ->
diff --git a/Helpers.fs b/Helpers.fs
@@ -75,6 +75,7 @@ let dotnet = createProcess "dotnet"
 
 
 let pytest = createProcess "pytest"
+let poetry = createProcess "poetry"
 
 let npm =
     let npmPath =
diff --git a/README.md b/README.md
@@ -30,8 +30,8 @@ how to deal with Python version handling.
 Prerequisite for compiling F# to Python using Fable:
 
 ```sh
-> dotnet tool install --global fable --version 4.0.0-snake-island-alpha-006
-> dotnet add package Fable.Core --version 4.0.0-snake-island-alpha-006
+> dotnet tool install --global fable --version 4.0.0-snake-island-alpha-014
+> dotnet add package Fable.Core --version 4.0.0-snake-island-alpha-007
 ```
 
 To use the `Fable.Python` library in your Fable project:
diff --git a/examples/README.md b/examples/README.md
@@ -13,4 +13,4 @@ instead.
 - Timeflies, use Fable Python with Tkinter and AsyncRx
 
 NOTE: If you make demos or examples with Fable Python then please
-consider providing a PR so we can add it here.
+consider providing a PR so we can add it here.
diff --git a/examples/timeflies/TimeFlies.fsproj b/examples/timeflies/TimeFlies.fsproj
@@ -10,7 +10,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Fable.Python" Version="0.17.0" />
-    <PackageReference Include="Fable.Core" Version="4.0.0-snake-island-alpha-006" />
+    <PackageReference Include="Fable.Core" Version="4.0.0-snake-island-alpha-007" />
     <PackageReference Include="FSharp.Control.AsyncRx" Version="1.6.1" />
   </ItemGroup>
 </Project>
diff --git a/paket.dependencies b/paket.dependencies
@@ -5,15 +5,15 @@ storage: none
 framework: net6.0, netstandard2.0, netstandard2.1
 
 nuget FSharp.Core ~> 4.7
-nuget Fable.Core >= 4.0.0-snake-island-alpha-006
+nuget Fable.Core >= 4.0.0-snake-island-alpha-007
 
 group Test
     source https://api.nuget.org/v3/index.json
     storage: none
     framework: net6.0
 
     nuget FSharp.Core
-    nuget Fable.Core >= 4.0.0-snake-island-alpha-006
+    nuget Fable.Core >= 4.0.0-snake-island-alpha-007
     nuget Microsoft.NET.Test.Sdk ~> 16
     nuget XUnit ~> 2
     nuget xunit.runner.visualstudio ~>  2
diff --git a/paket.lock b/paket.lock
@@ -2,7 +2,7 @@ STORAGE: NONE
 RESTRICTION: || (== net6.0) (== netstandard2.0) (== netstandard2.1)
 NUGET
   remote: https://api.nuget.org/v3/index.json
-    Fable.Core (4.0.0-snake-island-alpha-006)
+    Fable.Core (4.0.0-snake-island-alpha-007)
     FSharp.Core (4.7.2)
 
 GROUP Build
@@ -63,7 +63,7 @@ STORAGE: NONE
 RESTRICTION: == net6.0
 NUGET
   remote: https://api.nuget.org/v3/index.json
-    Fable.Core (4.0.0-snake-island-alpha-006)
+    Fable.Core (4.0.0-snake-island-alpha-007)
     FSharp.Core (6.0.5)
     Microsoft.CodeCoverage (17.2)
     Microsoft.NET.Test.Sdk (16.11)
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,39 @@
+[tool.poetry]
+name = "Fable Python"
+version = "4.0.0"
+description = "Fable"
+authors = ["Dag Brattli <dag@brattli.net>"]
+license = "MIT License"
+readme = "README.md"
+homepage = "https://fable.io"
+
+[tool.poetry.dependencies]
+python = ">= 3.9, < 4.0"
+fable-library = ""
+
+[tool.poetry.dev-dependencies]
+fable-library = {path = "./build/fable_modules/fable-library", develop = true}
+pytest = "^6.2.4"
+
+[tool.pyright]
+reportMissingTypeStubs = false
+reportMissingImports = false
+reportUnnecessaryTypeIgnoreComment = true
+reportUnusedImport = true
+reportUnusedVariable = true
+reportUnnecessaryIsInstance = true
+reportUnnecessaryComparison = true
+reportUnnecessaryCast = true
+reportPrivateUsage = true
+reportImportCycles = true
+reportDuplicateImport = true
+reportConstantRedefinition = true
+reportOverlappingOverload = true
+reportInconsistentConstructor = true
+reportImplicitStringConcatenation = true
+pythonVersion = "3.10"
+typeCheckingMode = "basic"
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`]`
`16`	`16`	`},`
`17`	`17`	`"fable": {`
`18`		`- "version": "4.0.0-snake-island-alpha-006",`
	`18`	`+ "version": "4.0.0-snake-island-alpha-014",`
`19`	`19`	`"commands": [`
`20`	`20`	`"fable"`
`21`	`21`	`]`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ Target.create "Test" (fun _ ->`
`34`	`34`	`"python", dotnet $"fable --lang Python --outDir {buildPath}/tests" testsPath`
`35`	`35`	`]`
`36`	`36`	`\|> runParallel`
`37`		`- run pytest $"{buildPath}/tests" ""`
	`37`	`+ run poetry $"run pytest {buildPath}/tests" ""`
`38`	`38`	`)`
`39`	`39`
`40`	`40`	`Target.create "Pack" (fun _ ->`