Merge branch '2.3.x'

.gitignore

@@ -1,19 +1,17 @@
-*.pyc
-*.pyo
+/.idea/
+/.vscode/
+/env/
+/venv/
 __pycache__/
-.*.swp
-.idea/
-.DS_Store
-env/
-venv/
-src/WTForms.egg-info/
+*.pyc
 .eggs/
-src/wtforms/locale/**/wtforms.mo
-build/
-dist/
-docs/_build
-.pytest_cache/
-.tox/
+*.egg-info/
+/build/
+/dist/
+/.pytest_cache/
+/.tox/
 .coverage
 .coverage.*
-htmlcov/
+/htmlcov/
+/docs/_build/
+/src/wtforms/locale/**/wtforms.mo

.readthedocs.yaml

@@ -0,0 +1,8 @@
+version: 2
+python:
+  install:
+    - method: pip
+      path: .
+    - requirements: docs/requirements.txt
+sphinx:
+  builder: dirhtml

.travis.yml

@@ -4,21 +4,17 @@ dist: xenial
 language: python
 
 python:
-  - 3.8
-  - 3.7
-  - 3.6
-  - nightly
+  - '3.8'
+  - '3.7'
+  - '3.6'
   - pypy3
-env: TOXENV=py,coveralls
 
-jobs:
+env: TOXENV=py,coverage-ci
+
+matrix:
   include:
-    - python: "3.8"
-      env: TOXENV=py38,stylecheck,docs-html,coveralls
-  allow_failures:
-    - python: nightly
-    - python: pypy3
-  fast_finish: true
+    - env: TOXENV=style
+    - env: TOXENV=docs
 
 install:
   - pip install tox
@@ -32,7 +28,7 @@ cache:
 branches:
   only:
     - master
-    - /^.*-maintenance$/
+    - /^.*\.x$/
 
 notifications:
   email: false