diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index ed069c9..0e01bac 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "fable": { - "version": "4.0.0-snake-island-alpha-014", + "version": "4.0.0-snake-island-alpha-019", "commands": [ "fable" ] diff --git a/README.md b/README.md index 011c8b8..914ba2e 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ 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-014 +> dotnet tool install --global fable --version 4.0.0-snake-island-alpha-019 > dotnet add package Fable.Core --version 4.0.0-snake-island-alpha-007 ``` diff --git a/examples/timeflies/poetry.lock b/examples/timeflies/poetry.lock index 14419cb..c963fc0 100644 --- a/examples/timeflies/poetry.lock +++ b/examples/timeflies/poetry.lock @@ -4,12 +4,7 @@ version = "0.8.0" description = "Fable library for Python" category = "main" optional = false -python-versions = "^3.8" -develop = true - -[package.source] -type = "directory" -url = "fable_modules/fable-library" +python-versions = ">=3.9,<4.0" [[package]] name = "fable-python" @@ -17,11 +12,11 @@ version = "0.1.0" description = "Python bindings for Fable" category = "main" optional = false -python-versions = "^3.9" +python-versions = "^3.8" develop = true [package.dependencies] -fable-library = "" +fable-library = "^0.8.0" [package.source] type = "directory" @@ -29,7 +24,7 @@ url = "fable_modules/fable-python" [[package]] name = "fsharp-control-async-rx" -version = "1.6.1" +version = "1.6.2" description = "Async Observables for F# and Fable" category = "main" optional = false @@ -37,7 +32,7 @@ python-versions = ">=3.9,<4" develop = true [package.dependencies] -fable-library = ">=0.7.0" +fable-library = "^0.8.0" [package.source] type = "directory" @@ -46,9 +41,12 @@ url = "fable_modules/fsharp-control-async-rx" [metadata] lock-version = "1.1" python-versions = "^3.9" -content-hash = "9ad00f12227f18e36ca297125065785ba9fa41f301eba68b117a0a965b8034a8" +content-hash = "db0f580c2ccd5fc8cd4bb94bd108b4420d5d3bb0cf34f568fa3e6d5c740cc14e" [metadata.files] -fable-library = [] +fable-library = [ + {file = "fable-library-0.8.0.tar.gz", hash = "sha256:ce47fc9438da626836a14127bd8ced1359b017cf34f550289f3201b19fb478e3"}, + {file = "fable_library-0.8.0-py3-none-any.whl", hash = "sha256:16bd71b33064fe1c34d604f0a0180b5f61d530f0fd6c52f6f2ef3b30b6078f2e"}, +] fable-python = [] fsharp-control-async-rx = [] diff --git a/examples/timeflies/pyproject.toml b/examples/timeflies/pyproject.toml index 1efa6e0..5d69936 100644 --- a/examples/timeflies/pyproject.toml +++ b/examples/timeflies/pyproject.toml @@ -8,12 +8,11 @@ license = "MIT" [tool.poetry.dependencies] python = "^3.9" -fable-library = "" +fable-library = ">=0.8.0" fable-python = "" fsharp-control-async-rx = "" [tool.poetry.dev-dependencies] -fable-library = {path = "./fable_modules/fable-library", develop = true} fable-python = {path = "./fable_modules/fable-python", develop = true} fsharp-control-async-rx = {path = "./fable_modules/fsharp-control-async-rx", develop = true} diff --git a/poetry.lock b/poetry.lock index e4c7ad2..de7cbc2 100644 --- a/poetry.lock +++ b/poetry.lock @@ -8,17 +8,17 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "attrs" -version = "21.4.0" +version = "22.1.0" description = "Classes Without Boilerplate" category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=3.5" [package.extras] -dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"] +dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"] docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"] -tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "cloudpickle"] -tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "cloudpickle"] +tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", "cloudpickle"] +tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "cloudpickle"] [[package]] name = "colorama" @@ -28,19 +28,6 @@ category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" -[[package]] -name = "fable-library" -version = "0.8.0" -description = "Fable library for Python" -category = "main" -optional = false -python-versions = ">= 3.9, < 4.0" -develop = true - -[package.source] -type = "directory" -url = "build/fable_modules/fable-library" - [[package]] name = "iniconfig" version = "1.1.1" @@ -123,19 +110,18 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" [metadata] lock-version = "1.1" python-versions = ">= 3.9, < 4.0" -content-hash = "62fed915dffc4a50bd630ea2c9e7378ce18497742eeecbaa8fb81a198ee8b665" +content-hash = "abd68141e3acd087250e3abe39e63564bd0a86278af048729e90ccbbda39a869" [metadata.files] atomicwrites = [] attrs = [ - {file = "attrs-21.4.0-py2.py3-none-any.whl", hash = "sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4"}, - {file = "attrs-21.4.0.tar.gz", hash = "sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd"}, + {file = "attrs-22.1.0-py2.py3-none-any.whl", hash = "sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c"}, + {file = "attrs-22.1.0.tar.gz", hash = "sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6"}, ] colorama = [ {file = "colorama-0.4.5-py2.py3-none-any.whl", hash = "sha256:854bf444933e37f5824ae7bfc1e98d5bce2ebe4160d46b5edf346a89358e99da"}, {file = "colorama-0.4.5.tar.gz", hash = "sha256:e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4"}, ] -fable-library = [] iniconfig = [ {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"}, {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"}, @@ -156,7 +142,10 @@ pyparsing = [ {file = "pyparsing-3.0.9-py3-none-any.whl", hash = "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc"}, {file = "pyparsing-3.0.9.tar.gz", hash = "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb"}, ] -pytest = [] +pytest = [ + {file = "pytest-6.2.5-py3-none-any.whl", hash = "sha256:7310f8d27bc79ced999e760ca304d69f6ba6c6649c0b60fb0e04a4a77cacc134"}, + {file = "pytest-6.2.5.tar.gz", hash = "sha256:131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89"}, +] toml = [ {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"}, {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"}, diff --git a/pyproject.toml b/pyproject.toml index 266c11b..c5e186b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,10 +9,8 @@ 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] diff --git a/src/pyproject.toml b/src/pyproject.toml index 623d3dc..fa2ae82 100644 --- a/src/pyproject.toml +++ b/src/pyproject.toml @@ -8,7 +8,7 @@ license = "MIT" [tool.poetry.dependencies] python = ">= 3.9, < 4.0" -fable-library = "^0.8.0" +fable-library = ">=0.8.0" [tool.poetry.dev-dependencies] diff --git a/test/TestBuiltins.fs b/test/TestBuiltins.fs index d06dfbd..6d6206c 100644 --- a/test/TestBuiltins.fs +++ b/test/TestBuiltins.fs @@ -13,4 +13,4 @@ let ``test __name__ works`` () = __name__ |> equal "test_builtins" [] let ``test write works`` () = let result = builtins.``open``("test.txt", OpenTextMode.Write) - result.write "ABC" |> equal 3 \ No newline at end of file + result.write "ABC" |> equal 3