From 13f8fb976673aa1ae143bf0564c9bc575f0acc58 Mon Sep 17 00:00:00 2001 From: Tobias Wochinger Date: Thu, 11 Feb 2021 14:39:28 +0100 Subject: [PATCH 1/4] don't pin for Windows as uvloop isn't available on non windows systems --- changelog/1234.bugfix.md | 2 ++ poetry.lock | 8 +++++++- pyproject.toml | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 changelog/1234.bugfix.md diff --git a/changelog/1234.bugfix.md b/changelog/1234.bugfix.md new file mode 100644 index 000000000..0b840dea7 --- /dev/null +++ b/changelog/1234.bugfix.md @@ -0,0 +1,2 @@ +Only pin the `uvloop` dependency for non-Windows systems as `uvloop` is not available +for Windows. diff --git a/poetry.lock b/poetry.lock index 97e7dfee0..f496d4c34 100644 --- a/poetry.lock +++ b/poetry.lock @@ -663,6 +663,11 @@ optional = false python-versions = "*" version = "1.4.0" +[package.dependencies] +[package.dependencies.idna] +optional = true +version = "*" + [package.extras] idna2008 = ["idna"] @@ -805,6 +810,7 @@ socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7,<2.0)"] [[package]] category = "main" description = "Fast implementation of asyncio event loop on top of libuv" +marker = "sys_platform != \"win32\" and implementation_name == \"cpython\" or sys_platform != \"win32\"" name = "uvloop" optional = false python-versions = "*" @@ -856,7 +862,7 @@ docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "jaraco.test (>=3.2.0)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] [metadata] -content-hash = "be8ed1cec049833bce3d32f57a9562394520b698f42e680051b64749560a74df" +content-hash = "699dd2bc4d231d105ea10a71f3a57c5c2d63cd601dab7f710610f938cc863771" python-versions = ">=3.6,<3.9" [metadata.files] diff --git a/pyproject.toml b/pyproject.toml index 2098fc01d..3a512328c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -66,8 +66,8 @@ showcontent = false python = ">=3.6,<3.9" coloredlogs = ">=10,<15" sanic = ">=19.12.2,<21.0.0" -# uvloop >= 0.15.0 is not compatible with Python 3.6 -uvloop = "<0.15.0" +# uvloop >= 0.15.0 is not compatible with Python 3.6 and not available on Windows +uvloop = { version = "<0.15.0", markers = "sys_platform != 'win32'" } sanic-cors = "^0.10.0" requests = "^2.23" From 154a907a8c92bd161a05e8b8e62ad0f4c9f998ac Mon Sep 17 00:00:00 2001 From: Tobias Wochinger Date: Thu, 11 Feb 2021 14:42:36 +0100 Subject: [PATCH 2/4] prepared release of version 2.3.1 --- CHANGELOG.mdx | 8 ++++++++ changelog/1234.bugfix.md | 2 -- pyproject.toml | 8 +++++--- rasa_sdk/version.py | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) delete mode 100644 changelog/1234.bugfix.md diff --git a/CHANGELOG.mdx b/CHANGELOG.mdx index 003172302..8ce836e88 100644 --- a/CHANGELOG.mdx +++ b/CHANGELOG.mdx @@ -17,6 +17,14 @@ https://github.com/RasaHQ/rasa/tree/main/changelog/ . --> +## [2.3.1] - 2021-02-11 + + +### Bugfixes +- [#1234](https://github.com/rasahq/rasa/issues/1234): Only pin the `uvloop` dependency for non-Windows systems as `uvloop` is not available + for Windows. + + ## [2.3.0] - 2021-02-11 diff --git a/changelog/1234.bugfix.md b/changelog/1234.bugfix.md deleted file mode 100644 index 0b840dea7..000000000 --- a/changelog/1234.bugfix.md +++ /dev/null @@ -1,2 +0,0 @@ -Only pin the `uvloop` dependency for non-Windows systems as `uvloop` is not available -for Windows. diff --git a/pyproject.toml b/pyproject.toml index 3a512328c..257d31215 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ exclude = "((.eggs | .git | .mypy_cache | .pytest_cache | build | dist))" [tool.poetry] name = "rasa-sdk" -version = "2.3.0" +version = "2.3.1" description = "Open source machine learning framework to automate text- and voice-based conversations: NLU, dialogue management, connect to Slack, Facebook, and more - Create chatbots and voice assistants" authors = [ "Rasa Technologies GmbH ",] maintainers = [ "Tom Bocklisch ",] @@ -66,8 +66,6 @@ showcontent = false python = ">=3.6,<3.9" coloredlogs = ">=10,<15" sanic = ">=19.12.2,<21.0.0" -# uvloop >= 0.15.0 is not compatible with Python 3.6 and not available on Windows -uvloop = { version = "<0.15.0", markers = "sys_platform != 'win32'" } sanic-cors = "^0.10.0" requests = "^2.23" @@ -86,3 +84,7 @@ pep440-version-utils = "^0.3.0" semantic_version = "^2.8.5" typing-extensions = "^3.7.4" mypy = "^0.782" + +[tool.poetry.dependencies.uvloop] +version = "<0.15.0" +markers = "sys_platform != 'win32'" diff --git a/rasa_sdk/version.py b/rasa_sdk/version.py index 914837e8a..ecdb736f0 100644 --- a/rasa_sdk/version.py +++ b/rasa_sdk/version.py @@ -1,3 +1,3 @@ # this file will automatically be changed, # do not add anything but the version number here! -__version__ = "2.3.0" +__version__ = "2.3.1" From 2ecc9d6e0fa9791185da97f8521a79c8cfef6b11 Mon Sep 17 00:00:00 2001 From: Tobias Wochinger Date: Thu, 11 Feb 2021 14:43:34 +0100 Subject: [PATCH 3/4] fix changelog --- CHANGELOG.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.mdx b/CHANGELOG.mdx index 8ce836e88..99dd26023 100644 --- a/CHANGELOG.mdx +++ b/CHANGELOG.mdx @@ -21,7 +21,7 @@ https://github.com/RasaHQ/rasa/tree/main/changelog/ . --> ### Bugfixes -- [#1234](https://github.com/rasahq/rasa/issues/1234): Only pin the `uvloop` dependency for non-Windows systems as `uvloop` is not available +- [#404](https://github.com/rasahq/rasa/issues/1234): Only pin the `uvloop` dependency for non-Windows systems as `uvloop` is not available for Windows. From a1f815c0661875dad642fa7d38b6f43aaea30ea4 Mon Sep 17 00:00:00 2001 From: Tobias Wochinger Date: Thu, 11 Feb 2021 14:44:46 +0100 Subject: [PATCH 4/4] re-add comment --- poetry.lock | 2 +- pyproject.toml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/poetry.lock b/poetry.lock index f496d4c34..4a66f411d 100644 --- a/poetry.lock +++ b/poetry.lock @@ -862,7 +862,7 @@ docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "jaraco.test (>=3.2.0)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] [metadata] -content-hash = "699dd2bc4d231d105ea10a71f3a57c5c2d63cd601dab7f710610f938cc863771" +content-hash = "8d6abadf78b0602616ed0572d947e540b2357fc1741fc4a98e5b81a310d7503c" python-versions = ">=3.6,<3.9" [metadata.files] diff --git a/pyproject.toml b/pyproject.toml index 257d31215..4efc30bb9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -85,6 +85,7 @@ semantic_version = "^2.8.5" typing-extensions = "^3.7.4" mypy = "^0.782" +# uvloop >= 0.15.0 is not compatible with Python 3.6 and not available on Windows [tool.poetry.dependencies.uvloop] version = "<0.15.0" markers = "sys_platform != 'win32'"