Merge https://github.com/jaraco/skeleton

.flake8

@@ -0,0 +1,6 @@
+[flake8]
+ignore =
+	# W503 violates spec https://github.com/PyCQA/pycodestyle/issues/513
+	W503
+	# W504 has issues https://github.com/OCA/maintainer-quality-tools/issues/545
+	W504

.travis.yml

@@ -1,6 +1,6 @@
 conditions: v1
 
-dist: trusty
+dist: xenial
 sudo: false
 language: python
 
@@ -9,6 +9,7 @@ python:
 - 3.4
 - 3.5
 - 3.6
+- &latest_py3 3.7
 - &pypy2 pypy2.7-5.10.0
 - &pypy3 pypy3.5-5.10.1
 
@@ -162,7 +163,6 @@ jobs:
         secure: RAfz06AINvz7bfij/YhfkAreRqamgxS8a6jSRNxntYhtJke3ZszUbIDag8+n1I+G5XT2LnMhHqPNR7Plc+AeMz7VXTuy+b81Li5kse20NYlPhd7mBVmTUpXtqYQashV5J39F4qkATBLznCOrMEomM07VTXjO/o2hmQuXniab2Uo=
       distributions: dists
       skip_cleanup: true
-      skip_upload_docs: true
 
 cache:
   pip: true
@@ -173,7 +173,7 @@ cache:
   - $HOME/Library/Caches/Homebrew
 
 install:
-- python -m pip install tox "setuptools>=28.2"
+- python -m pip install tox tox-venv
 - python -m tox --notest  # Pre-populate a virtualenv with dependencies
 
 script:

pyproject.toml

@@ -0,0 +1,2 @@
+[build-system]
+requires = ["setuptools>=30.3", "wheel", "setuptools_scm>=1.15"]

pytest.ini

@@ -1,4 +1,4 @@
 [pytest]
-norecursedirs=dist docs build .tox
-addopts=-v -rxs --testmon --doctest-modules --ignore cheroot/ssl/pyopenssl.py --junitxml=junit-test-results.xml --cov=cheroot --cov-report term-missing:skip-covered --cov-report xml
+norecursedirs=dist docs build .tox .eggs
+addopts=-v -rxs --testmon --doctest-modules --flake8 --ignore cheroot/ssl/pyopenssl.py --junitxml=junit-test-results.xml --cov=cheroot --cov-report term-missing:skip-covered --cov-report xml
 doctest_optionflags=ALLOW_UNICODE ELLIPSIS

setup.cfg

@@ -1,9 +1,9 @@
 [aliases]
-release = dists upload
 dists = clean --all sdist bdist_wheel
 
 [bdist_wheel]
 universal = 1
 
 [metadata]
-license_file = LICENSE.md
+license_file = LICENSE
+long_description = file:README.rst

setup.py

@@ -3,13 +3,8 @@
 
 # Project skeleton maintained at https://github.com/jaraco/skeleton
 
-import io
-
 import setuptools
 
-with io.open('README.rst', encoding='utf-8') as readme:
-    long_description = readme.read()
-
 name = 'cheroot'
 description = 'Highly-optimized, pure-python HTTP server'
 nspkg_technique = 'native'
@@ -27,7 +22,6 @@
     author='CherryPy Team',
     author_email='[email protected]',
     description=description or name,
-    long_description=long_description,
     url=repo_url,
     project_urls={
         'CI: AppVeyor': 'https://ci.appveyor.com/project/{}'.format(repo_slug),
@@ -50,20 +44,15 @@
         'more_itertools>=2.6',
     ],
     extras_require={
-        'docs': [
-            'sphinx',
-            'rst.linker>=1.9',
-            'jaraco.packaging>=3.2',
-
-            'docutils',
-            'alabaster',
-
-            'collective.checkdocs',
-        ],
         'testing': [
+            # upstream
+            'pytest>=3.5,!=3.7.3',
+            'pytest-sugar>=0.9.1',
+            'collective.checkdocs',
+            'pytest-flake8',
+
+            # local
             'ddt',
-            'pytest>=2.8',
-            'pytest-sugar',
             'pytest-testmon>=0.9.7',
             'pytest-watch',
 
@@ -75,6 +64,16 @@
             'pytest-cov',
             'backports.unittest_mock',
         ],
+        'docs': [
+            # upstream
+            'sphinx',
+            'jaraco.packaging>=3.2',
+            'rst.linker>=1.9',
+
+            # local
+            'docutils',
+            'alabaster',
+        ],
     },
     setup_requires=[
         'setuptools_scm>=1.15.0',

tox.ini

@@ -1,11 +1,10 @@
 [tox]
-minversion = 2.4
 envlist = python
+minversion = 2.4
 
 [testenv]
 deps =
-    # workaround for yaml/pyyaml#126
-    git+https://github.com/yaml/pyyaml@master#egg=pyyaml;python_version>="3.7"
+    setuptools>=31.0.1
 whitelist_externals =
     rm
 commands =
@@ -16,18 +15,26 @@ usedevelop = True
 extras = testing
 
 passenv =
-  WEBTEST_INTERACTIVE
-  CI
-  TRAVIS
-  TRAVIS_*
-  APPVEYOR
-  APPVEYOR_*
-  CIRCLECI
-  CIRCLE_*
-  PYTHONDONTWRITEBYTECODE
+    WEBTEST_INTERACTIVE
+    CI
+    TRAVIS
+    TRAVIS_*
+    APPVEYOR
+    APPVEYOR_*
+    CIRCLECI
+    CIRCLE_*
+    PYTHONDONTWRITEBYTECODE
 setenv =
-  PYTHONDONTWRITEBYTECODE=x
-  WEBTEST_INTERACTIVE=false
+    PYTHONDONTWRITEBYTECODE=x
+    WEBTEST_INTERACTIVE=false
+
+[testenv:build-docs]
+extras =
+    docs
+    testing
+changedir = docs
+commands =
+    python -m sphinx . {toxinidir}/build/html
 
 [testenv:watch]
 commands = ptw --runner=pytest
@@ -45,7 +52,7 @@ commands = pre-commit run --config .pre-commit-config.yaml.failing --all-files {
 
 [testenv:setup-check]
 extras =
-    docs
+    testing
 usedevelop = False
 commands =
     python -m setup checkdocs check --metadata --restructuredtext --strict --verbose