Merge branch 'master' into remove-gevent

Author: tmbo

.github/workflows/automatic-pr-merger.yml

@@ -0,0 +1,25 @@
+name: Automatic PR Merger
+
+on:
+  push: {} # update PR when base branch is updated
+  status: {} # try to merge when other checks are completed
+  pull_request_review: # try to merge after review
+    types:
+      - submitted
+      - edited
+      - dismissed
+  pull_request: # try to merge if labels have changed (white/black list)
+    types:
+      - labeled
+      - unlabeled
+
+jobs:
+  # thats's all. single step is needed - if PR is mergeable according to
+  # branch protection rules it will be merged automatically
+  mergepal:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: rasahq/[email protected]
+        with:
+          token: ${{ secrets.RASABOT_AUTOMERGE_GITHUB_TOKEN }}

.github/workflows/continous-integration.yml

@@ -261,3 +261,12 @@ jobs:
         pip install -U github3.py pypandoc
         python3 scripts/publish_gh_release_notes.py
         ./scripts/ping_slack_about_package_release.sh
+
+  mergepal-merge: # run merge pal in the end
+    runs-on: ubuntu-latest
+    needs: [quality, test, api, docker]
+    steps:
+      - uses: actions/checkout@v1
+      - uses: rasahq/[email protected]
+        with:
+          token: ${{ secrets.RASABOT_AUTOMERGE_GITHUB_TOKEN }}

.mergepal.yml

@@ -0,0 +1,3 @@
+whitelist:
+  - status:ready-to-merge
+method: merge

changelog/4605.doc.rst

@@ -0,0 +1 @@
+Remove outdated whitespace tokenizer warning in Testing Your Assistant documentation.

changelog/5757.removal.rst

@@ -0,0 +1,3 @@
+Removed previously deprecated packages ``rasa_nlu`` and ``rasa_core``.
+
+Use imports from ``rasa.core`` and ``rasa.nlu`` instead.

docs/user-guide/testing-your-assistant.rst

@@ -198,7 +198,7 @@ to the left of the plot.
     is that an entity cannot stop or start inside a token.
     For example, if you have an example for a ``name`` entity
     like ``[Brian](name)'s house``, this is only valid if your tokenizer splits ``Brian's`` into
-    multiple tokens. A whitespace tokenizer would not work in this case.
+    multiple tokens.
 
 
 Response Selection

rasa/core/channels/webexteams.py

@@ -39,7 +39,7 @@ async def send_image_url(
     async def send_custom_json(
         self, recipient_id: Text, json_message: Dict[Text, Any], **kwargs: Any
     ) -> None:
-        json_message.setdefault("roomID", recipient_id)
+        json_message.setdefault("roomId", recipient_id)
         return self.api.messages.create(**json_message)
 
 
@@ -128,7 +128,7 @@ async def webhook(request: Request) -> HTTPResponse:
             else:
                 metadata = self.get_metadata(request)
                 await self.process_message(
-                    on_new_message, message.text, message.personId, metadata
+                    on_new_message, message.text, message.roomId, metadata
                 )
                 return response.text("")
 

rasa/nlu/training_data/message.py

@@ -25,9 +25,12 @@ def __init__(
             self.output_properties = set()
 
     def set(self, prop, info, add_to_output=False) -> None:
-        self.data[prop] = info
-        if add_to_output:
-            self.output_properties.add(prop)
+        if prop == TEXT:
+            self.text = info
+        else:
+            self.data[prop] = info
+            if add_to_output:
+                self.output_properties.add(prop)
 
     def get(self, prop, default=None) -> Any:
         if prop == TEXT: