Merge remote-tracking branch 'origin/master' into typed-readonly

Author: mdickinson

.gitattributes

@@ -0,0 +1,2 @@
+# For archives, substitute the commit hash in the setup.py file.
+/setup.py export-subst

.gitignore

@@ -14,4 +14,4 @@ dist/
 docs/build/
 
 # Auto-generated by setup.py
-traits/_version.py
+traits/version.py

.travis.yml

@@ -1,4 +1,7 @@
 language: generic
+dist: xenial
+services:
+  - xvfb
 
 env:
   global:
@@ -16,21 +19,19 @@ matrix:
       env: RUNTIME=3.5
     - os: osx
       env: RUNTIME=3.6
-  fast_finish: true
 
 cache:
   directories:
     - "~/.cache"
 
 before_install:
   - mkdir -p "${HOME}/.cache/download"
-  - export DISPLAY=:99.0
-  - if [[ ${TRAVIS_OS_NAME} == "linux" ]] ; then sh -e /etc/init.d/xvfb start; fi
   - if [[ ${TRAVIS_OS_NAME} == 'linux' ]]; then ./install-edm-linux.sh; export PATH="${HOME}/edm/bin:${PATH}"; fi
   - if [[ ${TRAVIS_OS_NAME} == 'osx' ]]; then ./install-edm-osx.sh; export PATH="${PATH}:/usr/local/bin"; fi
   - edm install -y wheel click coverage
 install:
   - edm run -- python etstool.py install --runtime=${RUNTIME} || exit
+  - if [[ ${TRAVIS_EVENT_TYPE} == 'cron' ]]; then edm run -- python etstool.py install --runtime=${RUNTIME} --source || exit; fi
 script:
   - edm run -- python etstool.py test --runtime=${RUNTIME} || exit
   - edm run -- python etstool.py docs --runtime=${RUNTIME} || exit
@@ -39,7 +40,3 @@ after_success:
   - edm run -- coverage combine
   - edm run -- pip install codecov
   - edm run -- codecov
-
-notifications:
-  email:
-    - travis-ci@enthought.com

CHANGES.rst

@@ -1,6 +1,17 @@
 Traits CHANGELOG
 ================
 
+Release 5.1.2
+-------------
+
+Released: 2019-07-08
+
+Fixes
+
+* Traits documenter no longer generates bad reST for traits whose definition
+  spans multiple source lines. (#494)
+
+
 Release 5.1.1
 -------------
 

ci-doc-requirements.txt

@@ -1 +0,0 @@
-git+http://github.com/enthought/enthought-sphinx-theme