Merge branch 'master' into add-flake8

federicotdn · federicotdn · commit 9c50f01c8d62 · 2019-07-03T16:44:57.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -119,27 +119,13 @@ jobs:
     - git remote set-url --push origin "git@github.com:$TRAVIS_REPO_SLUG"
     - export ${!TRAVIS*}
     - sphinx-versioning push docs docs . -- -b dirhtml -A html_theme=rasabaster
-  - stage: trigger website rebuild
-    if: fork = false AND branch = "master" AND type != "pull_request"
+  - stage: docs-netlify
+    if: branch = master AND type != pull_request OR tag IS present
+    install: skip
     script:
-    - eval "$(ssh-agent -s)";
-      touch nlu_docs_to_website_trigger_key;
-      chmod 0600 nlu_docs_to_website_trigger_key
-    - openssl aes-256-cbc
-      -K $encrypted_1708c37fe733_key
-      -iv $encrypted_1708c37fe733_iv
-      -in secrets.tar.enc
-      -out secrets.tar
-      -d
-    - tar xvf secrets.tar
-    - ssh-add nlu_docs_to_website_trigger_key
-    - git config --global user.email "builds@travis-ci.com"
-    - git config --global user.name "Travis CI"
-    - git clone -b master --single-branch git@github.com:RasaHQ/rasa-website.git
-    - cd rasa-website
-    - git commit --allow-empty -m "trigger rasa docs update"
-    - git push origin master
+    - curl -X POST -d "docs" https://api.netlify.com/build_hooks/${NETLIFY_HOOK_ID}
   - stage: deploy
+    if: branch = "master" AND tag IS present
     name: "Deploy to PyPI"
     python: 3.6
     install: skip
@@ -149,8 +135,5 @@ jobs:
       user: amn41
       # server: https://test.pypi.org/legacy/
       distributions: "sdist bdist_wheel"
-      on:
-        branch: master
-        tags: true
       password:
         secure: "MeL1Ve97eBY+VbNWuQNuLzkPs0TPc+Zh8OfZkhw69ez5imsiWpvp0LrUOLVW3CcC0vNTANEBOVX/n1kHxfcqkf/cChNqAkZ6zTMmvR9zHDwQxXVGZ3jEQSQM+fHdQpjwtH7BwojyxaCIC/5iza7DFMcca/Q6Xr+atdTd0V8Q7Nc5jFHEQf3/4oIIm6YeCUiHcEu981LRdS04+jvuFUN0Ejy+KLukGVyIWyYDjjGjs880Mj4J1mgmCihvVkJ1ujB65rYBdTjls3JpP3eTk63+xH8aHilIuvqB8TDYih8ovE/Vv6YwLI+u2HoEHAtBD4Ez3r71Ju6JKJM7DhWb5aurN4M7K6DC8AvpUl+PsJbNP4ZeW2jXMH6lT6qXKVaSw7lhZ0XY3wunyVcAbArX4RS0B9pb1nHBYUBWZjxXtr8lhkpGFu7H43hw63Y19qb8z4+1cGnijgz1mqXSAssuc+3r0W0cSr+OsCjmOs7cwT6HMQvPEKxLohwBOS/I3EbuKQOYMjFN5BWP5JXbsG45awV9tquxEW8zxjMetR+AOcYoyrDeiR8sAnj1/F99DE0bL1KyW/G5VNu2Xi/c+0M3KvP3+F8XTCuUY/5zTvqh1Qz1jcdiwsiAhO4eBQzQnjeFlxdiVeue2kmD5qsh+VLKKuKLfyVoaV7b1kBlAtBDu7+hDpA="
diff --git a/README.md b/README.md
@@ -166,6 +166,16 @@ To check the types execute
 pytype rasa
 ```
 
+### Deploying documentation updates
+
+We use `sphinx-versioning` to build docs for tagged versions and for the master branch.
+The static site that gets built is pushed to the `docs` branch of this repo, which doesn't contain
+any code, only the site.
+
+We host the site on netlify. When there is a reason to update the docs (e.g. master has changed or we have
+tagged a new version) we trigger a webhook on netlify (see `.travis.yml`). 
+
+
 ## License
 Licensed under the Apache License, Version 2.0.
 Copyright 2019 Rasa Technologies GmbH. [Copy of the license](LICENSE.txt).
diff --git a/setup.cfg b/setup.cfg
@@ -14,8 +14,8 @@ codestyle_exclude =
 filterwarnings =
     ignore::ResourceWarning:ruamel[.*]
 
-log_cli = 1
-log_cli_level = DEBUG
+log_cli = true
+log_cli_level = WARNING
 
 [metadata]
 description-file = README.md
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,4 +1,5 @@
 import pytest
+import logging
 
 from rasa import server
 from rasa.core import config
@@ -24,6 +25,14 @@
 pytest_plugins = ["pytester"]
 
 
+@pytest.fixture(autouse=True)
+def set_log_level_debug(caplog):
+    # Set the post-test log level to DEBUG for failing tests.  For all tests
+    # (failing and successful), the live log level can be additionally set in
+    # `setup.cfg`. It should be set to WARNING.
+    caplog.set_level(logging.DEBUG)
+
+
 @pytest.fixture
 async def default_agent(tmpdir_factory) -> Agent:
     model_path = tmpdir_factory.mktemp("model").strpath
diff --git a/tests/core/conftest.py b/tests/core/conftest.py
@@ -29,8 +29,6 @@
 
 matplotlib.use("Agg")
 
-logging.basicConfig(level="DEBUG")
-
 DEFAULT_DOMAIN_PATH = "data/test_domains/default_with_slots.yml"
 
 DEFAULT_STORIES_FILE = "data/test_stories/stories_defaultdomain.md"
diff --git a/tests/nlu/base/test_evaluation.py b/tests/nlu/base/test_evaluation.py
@@ -39,8 +39,6 @@
 from tests.nlu import utilities
 from tests.nlu.conftest import DEFAULT_DATA_PATH, NLU_DEFAULT_CONFIG_PATH
 
-logging.basicConfig(level="DEBUG")
-
 
 @pytest.fixture(scope="session")
 def pretrained_interpreter(component_builder, tmpdir_factory):
diff --git a/tests/nlu/conftest.py b/tests/nlu/conftest.py
@@ -6,8 +6,6 @@
 from rasa.nlu import config, train
 from rasa.nlu.components import ComponentBuilder
 
-logging.basicConfig(level="DEBUG")
-
 CONFIG_DEFAULTS_PATH = "sample_configs/config_defaults.yml"
 
 NLU_DEFAULT_CONFIG_PATH = "sample_configs/config_pretrained_embeddings_mitie.yml"
