Merge branch 'master' into fix_889_and_non-ascii_in_setup.cfg_take_2

.codecov.yml

@@ -0,0 +1 @@
+comment: false

.github/pull_request_template.md

@@ -0,0 +1,12 @@
+<!-- First time contributors: Take a moment to review https://setuptools.readthedocs.io/en/latest/developer-guide.html! -->
+<!-- Remove sections if not applicable -->
+
+## Summary of changes
+
+<!-- Summary goes here -->
+
+Closes <!-- issue number here -->
+
+### Pull Request Checklist
+- [ ] Changes have tests
+- [ ] News fragment added in changelog.d. See [documentation](http://setuptools.readthedocs.io/en/latest/developer-guide.html#making-a-pull-request) for details

.gitignore

@@ -2,16 +2,20 @@
 bin
 build
 dist
+docs/build
 include
 lib
 distribute.egg-info
 setuptools.egg-info
 .coverage
 .eggs
 .tox
+.venv
 *.egg
 *.py[cod]
 *.swp
 *~
 .hg*
 .cache
+.idea/
+.pytest_cache/

.mergify.yml

@@ -0,0 +1,11 @@
+pull_request_rules:
+- name: auto-merge
+  conditions:
+  - base=master
+  - label=auto-merge
+  - status-success=continuous-integration/appveyor/pr
+  - status-success=continuous-integration/travis-ci/pr
+  - status-success=deploy/netlify
+  actions:
+    merge:
+      method: merge

.readthedocs.yml

@@ -0,0 +1,4 @@
+python:
+  version: 3
+  requirements_file: docs/requirements.txt
+  pip_install: false

.travis.yml

@@ -1,28 +1,38 @@
 dist: trusty
-sudo: false
 language: python
+
 jobs:
   fast_finish: true
   include:
-  - python: 2.6
-  - python: &latest_py2 2.7
-  - python: 3.3
-  - python: 3.4
-  - python: 3.5
-  - python: &latest_py3 3.6
-  - python: nightly
+  - &latest_py2
+    python: 2.7
+  - <<: *latest_py2
+    env: LANG=C
   - python: pypy
+    env: DISABLE_COVERAGE=1  # Don't run coverage on pypy (too slow).
   - python: pypy3
-  - python: *latest_py3
-    env: LANG=C
-  - python: *latest_py2
+    env: DISABLE_COVERAGE=1
+  - python: 3.4
+  - python: 3.5
+  - &default_py
+    python: 3.6
+  - &latest_py3
+    python: 3.7
+    dist: xenial
+  - <<: *latest_py3
     env: LANG=C
-  - stage: deploy (to PyPI for tagged commits)
+  - python: 3.8-dev
+    dist: xenial
+    env: DISABLE_COVERAGE=1  # Ignore invalid coverage data.
+  - <<: *default_py
+    stage: deploy (to PyPI for tagged commits)
     if: tag IS present
-    python: *latest_py3
     install: skip
     script: skip
-    before_deploy: python bootstrap.py
+    after_success: true
+    before_deploy:
+      - python bootstrap.py
+      - "! grep pyc setuptools.egg-info/SOURCES.txt"
     deploy:
       provider: pypi
       on:
@@ -38,13 +48,37 @@ jobs:
 cache: pip
 
 install:
+
+# ensure we have recent pip/setuptools/wheel
+- pip install --disable-pip-version-check --upgrade pip setuptools wheel
 # need tox to get started
-- pip install tox
+- pip install --upgrade tox tox-venv
 
 # Output the env, to verify behavior
+- pip freeze --all
 - env
 
 # update egg_info based on setup.py in checkout
 - python bootstrap.py
+- "! grep pyc setuptools.egg-info/SOURCES.txt"
+
+script:
+  - |
+    ( # Run testsuite.
+      if [ -z "$DISABLE_COVERAGE" ]
+      then
+        tox -- --cov
+      else
+        tox
+      fi
+    )
 
-script: tox
+after_success:
+  - |
+    ( # Upload coverage data.
+      if [ -z "$DISABLE_COVERAGE" ]
+      then
+        export TRAVIS_JOB_NAME="${TRAVIS_PYTHON_VERSION} (LANG=$LANG)" CODECOV_ENV=TRAVIS_JOB_NAME
+        tox -e coverage,codecov
+      fi
+    )