Merge branch 'master' into patch-1

Author: koaning

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

@@ -20,6 +20,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: rasahq/merge-pal-action@v0.5.1
+      - uses: rasahq/merge-pal-action@master
         with:
           token: ${{ secrets.RASABOT_AUTOMERGE_GITHUB_TOKEN || secrets.GITHUB_TOKEN}}

.github/workflows/continous-integration.yml

@@ -200,13 +200,13 @@ jobs:
       run: docker build . --file ${{ matrix.image.file }} --tag rasa/rasa:latest${{ matrix.image.tag_ext }} --cache-from rasa/rasa:latest${{ matrix.image.tag_ext }}
 
     - name: Push image with latest tag 📦
-      if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+      if: github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'RasaHQ/rasa'
       run: docker push rasa/rasa:latest${{ matrix.image.tag_ext }}
 
     - name: Push image with ${{github.ref}} tag 📦
       env:
         GITHUB_TAG: ${{ github.ref }}
-      if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
+      if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') && github.repository == 'RasaHQ/rasa'
       run: |
         GITHUB_TAG=${GITHUB_TAG/refs\/tags\//}
         docker tag rasa/rasa:latest${{ matrix.image.tag_ext }} rasa/rasa:${GITHUB_TAG}${{ matrix.image.tag_ext }}
@@ -217,7 +217,7 @@ jobs:
     runs-on: ubuntu-latest
 
     # deploy will only be run when there is a tag available
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') && github.repository == 'RasaHQ/rasa'
     needs: [quality, test, api, docker]  # only run after all other stages succeeded
 
     steps:
@@ -268,6 +268,14 @@ jobs:
     needs: [quality, test, api, docker]
     steps:
       - uses: actions/checkout@v1
-      - uses: rasahq/[email protected]
+      - name: Make sure there is a github token
+        shell: bash
+        run: |
+          if [ -z "${{ secrets.RASABOT_AUTOMERGE_GITHUB_TOKEN }}" ]; then
+            echo ::set-env name=MERGE_TOKEN::${{ secrets.GITHUB_TOKEN }}
+          else
+            echo ::set-env name=MERGE_TOKEN::${{ secrets.RASABOT_AUTOMERGE_GITHUB_TOKEN }}
+          fi
+      - uses: rasahq/merge-pal-action@master
         with:
-          token: ${{ secrets.RASABOT_AUTOMERGE_GITHUB_TOKEN }}
+          token: ${{ env.MERGE_TOKEN }}

.github/workflows/documentation.yml

@@ -17,6 +17,7 @@ jobs:
   docs:
     name: Build Docs
     runs-on: ubuntu-latest
+    if: github.repository == 'RasaHQ/rasa'  # don't run this for master branches of forks, would fail anyways
 
     steps:
     - name: Checkout git repository 🕝

.gitignore

@@ -67,7 +67,6 @@ graph.html
 story_graph.html
 story_graph.dot
 debug.md
-examples/restaurantbot/models*
 examples/moodbot/*.png
 examples/moodbot/errors.json
 examples/formbot/models*

.pre-commit-config.yaml

@@ -7,3 +7,4 @@ repos:
     rev: master
     hooks:
     -   id: doctoc
+        files: "CONTRIBUTING.md"

CHANGELOG.rst

@@ -416,7 +416,7 @@ Features
 
   DIET (Dual Intent and Entity Transformer) is a multi-task architecture for intent classification and entity
   recognition. You can read more about this component in our :ref:`documentation <diet-classifier>`.
-  The new component will replace the :ref:`EmbeddingIntentClassifier <embedding-intent-classifier>` and the
+  The new component will replace the ``EmbeddingIntentClassifier`` and the
   :ref:`CRFEntityExtractor` in the future.
   Those two components are deprecated from now on.
   See :ref:`migration guide <migration-to-rasa-1.8>` for details on how to

README.md

@@ -11,7 +11,7 @@
 
 <img align="right" height="244" src="https://www.rasa.com/assets/img/sara/sara-open-source-2.0.png">
 
-Rasa is an open source machine learning framework to automate text-and voice-based conversations. With Rasa, you can build contexual assistants on:
+Rasa is an open source machine learning framework to automate text-and voice-based conversations. With Rasa, you can build contextual assistants on:
 - Facebook Messenger
 - Slack
 - Google Hangouts
@@ -189,7 +189,7 @@ Where `[n]` is the number of jobs desired. If omitted, `[n]` will be automatical
 Poetry doesn't include any solution that can help to resolve merge conflicts in
 the lock file `poetry.lock` by default.
 However, there is a great tool called [poetry-merge-lock](https://poetry-merge-lock.readthedocs.io/en/latest/).
-Here is how use can install it:
+Here is how you can install it:
 
 ```bash
 pip install poetry-merge-lock

changelog/5385.bugfix.rst

@@ -0,0 +1 @@
+Stack level for ``FutureWarning`` updated to level 2.

changelog/5758.removal.rst

@@ -0,0 +1,13 @@
+Removed previously deprecated classes:
+- event brokers (``EventChannel`` and ``FileProducer``, ``KafkaProducer``, ``PikaProducer``, ``SQLProducer``)
+- intent classifier ``EmbeddingIntentClassifier``
+- policy ``KerasPolicy``
+
+Removed previously deprecated methods:
+- ``Agent.handle_channels``
+- ``TrackerStore.create_tracker_store``
+
+Removed support for pipeline templates in ``config.yml``
+
+Removed deprecated training data keys ``entity_examples`` and ``intent_examples`` from
+json training data format.

changelog/5834.removal.rst

@@ -0,0 +1 @@
+Removed ``restaurantbot`` example as it was confusing and not a great way to build a bot.