Merge branch 'main' into prepare-release-2.5.0

Dazu-io · Apr 12, 2021 · b2c0c27 · b2c0c27
2 parents 3277346 + e25e645
commit b2c0c27
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/CHANGELOG.mdx b/CHANGELOG.mdx
@@ -19,6 +19,17 @@ https://github.com/RasaHQ/rasa/tree/main/changelog/ . -->
 ## [2.5.0] - 2021-04-12
 
 
+### Improved Documentation
+- [#8080](https://github.com/rasahq/rasa/issues/8080): Update links to Sanic docs in the documentation.
+- [#8109](https://github.com/rasahq/rasa/issues/8109): Update Rasa Playground to correctly use `tracking_id` when calling API methods.
+
+### Miscellaneous internal changes
+- [#8016](https://github.com/rasahq/rasa/issues/8016)
+
+
+## [2.5.0] - 2021-04-12
+
+
 ### Deprecations and Removals
 - [#8141](https://github.com/rasahq/rasa/issues/8141): The following import abbreviations were removed:
   * `rasa.core.train`: Please use `rasa.core.train.train` instead.
@@ -117,6 +128,7 @@ https://github.com/RasaHQ/rasa/tree/main/changelog/ . -->
 - [#8337](https://github.com/rasahq/rasa/issues/8337): Fix bug with NoReturn throwing an exception in Python 3.7.0 when running `rasa train`
 - [#8382](https://github.com/rasahq/rasa/issues/8382): Throw `RasaException` instead of `ValueError` in situations when environment variables 
   specified in YAML cannot be expanded.
+- [#8343](https://github.com/rasahq/rasa/issues/8343): Updated python-engineio version for compatibility with python-socketio
 
 ### Miscellaneous internal changes
 - [#6511](https://github.com/rasahq/rasa/issues/6511), [#7640](https://github.com/rasahq/rasa/issues/7640), [#7827](https://github.com/rasahq/rasa/issues/7827), [#8056](https://github.com/rasahq/rasa/issues/8056), [#8117](https://github.com/rasahq/rasa/issues/8117), [#8141](https://github.com/rasahq/rasa/issues/8141), [#8240](https://github.com/rasahq/rasa/issues/8240)

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -102,7 +102,7 @@ aiohttp = "~3.6"
 questionary = ">=1.5.1,<1.10.0"
 prompt-toolkit = "^2.0"
 python-socketio = ">=4.4,<6"
-python-engineio = ">=3.11,<3.14"
+python-engineio = ">=4,<6,!=5.0.0"
 pydot = "~1.4"
 async_generator = "~1.10"
 SQLAlchemy = "~1.3.3"