Skip to content

Commit 7413df6

Browse files
committed
Merge branch 'master' into story-testing
2 parents 0fc57e5 + 05a637f commit 7413df6

17 files changed

+212
-189
lines changed

.github/workflows/continous-integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ jobs:
112112
name: Run Tests
113113
runs-on: ubuntu-latest
114114
strategy:
115-
max-parallel: 2
115+
max-parallel: 3
116116
matrix:
117-
python-version: [3.6, 3.7]
117+
python-version: [3.6, 3.7, 3.8]
118118

119119
steps:
120120
- name: Checkout git repository 🕝

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN apt-get update -qq && \
2626

2727
# install poetry
2828
# keep this in sync with the version in pyproject.toml and Dockerfile
29-
ENV POETRY_VERSION 1.0.3
29+
ENV POETRY_VERSION 1.0.5
3030
RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python
3131
ENV PATH "/root/.poetry/bin:/opt/venv/bin:${PATH}"
3232

changelog/4536.improvement.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add support for Python 3.8.
File renamed without changes.

docker/Dockerfile_full

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN apt-get update -qq && \
2626

2727
# install poetry
2828
# keep this in sync with the version in pyproject.toml and Dockerfile
29-
ENV POETRY_VERSION 1.0.3
29+
ENV POETRY_VERSION 1.0.5
3030
RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python
3131
ENV PATH "/root/.poetry/bin:/opt/venv/bin:${PATH}"
3232

docker/Dockerfile_pretrained_embeddings_mitie_en

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN apt-get update -qq && \
2626

2727
# install poetry
2828
# keep this in sync with the version in pyproject.toml and Dockerfile
29-
ENV POETRY_VERSION 1.0.3
29+
ENV POETRY_VERSION 1.0.5
3030
RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python
3131
ENV PATH "/root/.poetry/bin:/opt/venv/bin:${PATH}"
3232

docker/Dockerfile_pretrained_embeddings_spacy_de

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN apt-get update -qq && \
2626

2727
# install poetry
2828
# keep this in sync with the version in pyproject.toml and Dockerfile
29-
ENV POETRY_VERSION 1.0.3
29+
ENV POETRY_VERSION 1.0.5
3030
RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python
3131
ENV PATH "/root/.poetry/bin:/opt/venv/bin:${PATH}"
3232

docker/Dockerfile_pretrained_embeddings_spacy_en

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN apt-get update -qq && \
2626

2727
# install poetry
2828
# keep this in sync with the version in pyproject.toml and Dockerfile
29-
ENV POETRY_VERSION 1.0.3
29+
ENV POETRY_VERSION 1.0.5
3030
RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python
3131
ENV PATH "/root/.poetry/bin:/opt/venv/bin:${PATH}"
3232

docs/user-guide/building-assistants.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ new Rasa project.
4444
rasa init
4545
4646
47-
Let's remove the default content from this bot, so that the ``nlu.md``, ``stories.md``
47+
Let's remove the default content from this bot, so that the ``data/nlu.md``, ``data/stories.md``
4848
and ``domain.yml`` files are empty.
4949

5050
.. _respond-with-memoization-policy:
@@ -71,7 +71,7 @@ You can do this by editing your ``config.yml`` file as follows (you can remove `
7171
which allows you to clear the conversation history and start fresh.
7272

7373
Now that we’ve defined our policies, we can add some stories for the ``goodbye``, ``thank`` and ``greet``
74-
intents to the ``stories.md`` file:
74+
intents to the ``data/stories.md`` file:
7575

7676
.. code-block:: md
7777
@@ -104,7 +104,7 @@ We’ll also need to add the intents, actions and responses to our ``domain.yml`
104104
utter_bye:
105105
- text: Bye!
106106
107-
Finally, we’ll copy over some NLU data from Sara into our ``nlu.md`` file
107+
Finally, we’ll copy over some NLU data from Sara into our ``data/nlu.md`` file
108108
(more can be found `here <https://github.com/RasaHQ/rasa-demo/blob/master/data/nlu/nlu.md>`__):
109109

110110
.. code-block:: md

0 commit comments

Comments
 (0)