From ce11d2400615e91cc4315654dd979fd021500bda Mon Sep 17 00:00:00 2001 From: Anca Lita <27920906+ancalita@users.noreply.github.com> Date: Thu, 5 Oct 2023 09:10:07 +0100 Subject: [PATCH 1/2] prepared release of version 3.6.11 --- CHANGELOG.mdx | 13 +++++++++++++ changelog/12722.bugfix.md | 4 ---- changelog/12886.bugfix.md | 3 --- pyproject.toml | 2 +- rasa/version.py | 2 +- 5 files changed, 15 insertions(+), 9 deletions(-) delete mode 100644 changelog/12722.bugfix.md delete mode 100644 changelog/12886.bugfix.md diff --git a/CHANGELOG.mdx b/CHANGELOG.mdx index 751bf9c3e5c9..51f895d6504e 100644 --- a/CHANGELOG.mdx +++ b/CHANGELOG.mdx @@ -16,6 +16,19 @@ https://github.com/RasaHQ/rasa/tree/main/changelog/ . --> +## [3.6.11] - 2023-10-05 + +Rasa 3.6.11 (2023-10-05) +### Bugfixes +- [#12722](https://github.com/rasahq/rasa/issues/12722): Intent names will not be falsely abbreviated in interactive training (fixes OSS-413). + + This will also fix a bug where forced user utterances (using the regex matcher) will + be reverted even though they are present in the domain. +- [#12886](https://github.com/rasahq/rasa/issues/12886): Cache `EndpointConfig` session object using `cached_property` decorator instead of recreating this object on every request. + Initialize these connection pools for action server and model server endpoints as part of the Sanic `after_server_start` listener. + Also close connection pools during Sanic `after_server_stop` listener. + + ## [3.6.10] - 2023-09-26 Rasa 3.6.10 (2023-09-26) diff --git a/changelog/12722.bugfix.md b/changelog/12722.bugfix.md deleted file mode 100644 index a2d8a3c4a106..000000000000 --- a/changelog/12722.bugfix.md +++ /dev/null @@ -1,4 +0,0 @@ -Intent names will not be falsely abbreviated in interactive training (fixes OSS-413). - -This will also fix a bug where forced user utterances (using the regex matcher) will -be reverted even though they are present in the domain. diff --git a/changelog/12886.bugfix.md b/changelog/12886.bugfix.md deleted file mode 100644 index e327578350d7..000000000000 --- a/changelog/12886.bugfix.md +++ /dev/null @@ -1,3 +0,0 @@ -Cache `EndpointConfig` session object using `cached_property` decorator instead of recreating this object on every request. -Initialize these connection pools for action server and model server endpoints as part of the Sanic `after_server_start` listener. -Also close connection pools during Sanic `after_server_stop` listener. diff --git a/pyproject.toml b/pyproject.toml index a838b79d4b37..1670c346888c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ exclude = "((.eggs | .git | .pytest_cache | build | dist))" [tool.poetry] name = "rasa" -version = "3.6.10" +version = "3.6.11" 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 ",] diff --git a/rasa/version.py b/rasa/version.py index 4090c75a2fdf..d4c4e19def6f 100644 --- a/rasa/version.py +++ b/rasa/version.py @@ -1,3 +1,3 @@ # this file will automatically be changed, # do not add anything but the version number here! -__version__ = "3.6.10" +__version__ = "3.6.11" From 70c4709f3eca487dc50daaa05b00adb78e274893 Mon Sep 17 00:00:00 2001 From: Anca Lita <27920906+ancalita@users.noreply.github.com> Date: Thu, 5 Oct 2023 10:35:29 +0100 Subject: [PATCH 2/2] fix install ddtrace step on windows --- .github/workflows/continous-integration.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continous-integration.yml b/.github/workflows/continous-integration.yml index 453107c6d335..9e892fe588a8 100644 --- a/.github/workflows/continous-integration.yml +++ b/.github/workflows/continous-integration.yml @@ -358,7 +358,9 @@ jobs: - name: Install ddtrace on Windows if: needs.changes.outputs.backend == 'true' && matrix.os == 'windows-2019' - run: py -m pip install -U 'ddtrace<2.0.0' + run: | + .\.venv\Scripts\activate + py -m pip install -U 'ddtrace<2.0.0' - name: Test Code 🔍 (multi-process) if: needs.changes.outputs.backend == 'true' @@ -502,7 +504,9 @@ jobs: - name: Install ddtrace on Windows if: needs.changes.outputs.backend == 'true' && matrix.os == 'windows-2019' - run: py -m pip install -U 'ddtrace<2.0.0' + run: | + .\.venv\Scripts\activate + py -m pip install -U 'ddtrace<2.0.0' - name: Test Code 🔍 (multi-process) if: needs.changes.outputs.backend == 'true'