Merge remote-tracking branch 'main/master'

Author: StefanoChiodino

.coveragerc

@@ -0,0 +1,3 @@
+[run]
+omit =
+  */**/migrations/*

.gitignore

@@ -1,4 +1,5 @@
 *.db
+*.rdb
 *.egg-info
 *.log
 *.pyc
@@ -49,6 +50,7 @@ tags
 .python-version
 *.pyo
 .pytest_cache/
+scripts/travis/elasticsearch*
 
 # Environments
 .env

.travis.yml

@@ -3,21 +3,25 @@ python:
   - 2.7
   - 3.6
 sudo: false
+env:
+  - ES_VERSION=1.3.9 ES_DOWNLOAD_URL=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz
 matrix:
   include:
     - python: 2.7
       env: TOXENV=docs
+    - python: 3.6
+      env: TOXENV=docs-lint
     - python: 2.7
       env: TOXENV=lint
+      script: tox
     - python: 2.7
       env: TOXENV=eslint
-script:
-  - tox
 cache:
   directories:
     - ~/.cache/pip
     - ~/.nvm/nvm.sh
 install:
+  - ./scripts/travis/install_elasticsearch.sh
   - pip install tox-travis
   - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.2/install.sh | bash
   - source ~/.nvm/nvm.sh
@@ -27,7 +31,7 @@ install:
   - npm install
   - bower install
 script:
-  - tox
+  - ./scripts/travis/run_tests.sh
 notifications:
   slack:
     rooms:

CHANGELOG.rst

@@ -28,6 +28,11 @@ the Docs site`_.
 
 .. _the Read the Docs site: https://docs.readthedocs.io/
 
+Get in touch
+------------
+
+You can find information about getting in touch with Read the Docs at our `Contribution page <https://docs.readthedocs.io/en/latest/contribute.html#get-in-touch>`_.
+
 Contributing
 ------------
 

README.rst

@@ -0,0 +1,19 @@
+import logging
+
+import pytest
+
+
+def pytest_addoption(parser):
+    parser.addoption('--including-search', action='store_true', dest="searchtests",
+                     default=False, help="enable search tests")
+
+
+def pytest_configure(config):
+    if not config.option.searchtests:
+        # Include `not search` to parameters so that search test do not perform
+        setattr(config.option, 'markexpr', 'not search')
+
+
+@pytest.fixture(autouse=True)
+def settings_modification(settings):
+    settings.CELERY_ALWAYS_EAGER = True