Partially revert "Merge https://github.com/jaraco/skeleton"

This partially reverts commit 9db6125,
reversing changes made to 9f77c31.

.travis.yml

@@ -1,6 +1,6 @@
 conditions: v1
 
-dist: xenial
+dist: trusty
 sudo: false
 language: python
 
@@ -9,7 +9,6 @@ python:
 - 3.4
 - 3.5
 - 3.6
-- &latest_py3 3.7
 - &pypy2 pypy2.7-5.10.0
 - &pypy3 pypy3.5-5.10.1
 

pytest.ini

@@ -1,4 +1,4 @@
 [pytest]
 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
+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
 doctest_optionflags=ALLOW_UNICODE ELLIPSIS

setup.cfg

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

setup.py

@@ -3,8 +3,13 @@
 
 # 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'
@@ -22,6 +27,7 @@
     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),
@@ -44,15 +50,22 @@
         'more_itertools>=2.6',
     ],
     extras_require={
-        'testing': [
+        'docs': [
             # upstream
-            'pytest>=3.5,!=3.7.3',
-            'pytest-sugar>=0.9.1',
-            'collective.checkdocs',
-            'pytest-flake8',
+            'sphinx',
+            'rst.linker>=1.9',
+            'jaraco.packaging>=3.2',
 
             # local
+            'docutils',
+            'alabaster',
+
+            'collective.checkdocs',  # needed for setup-check tox env
+        ],
+        'testing': [
             'ddt',
+            'pytest>=2.8',
+            'pytest-sugar>=0.9.1',
             'pytest-testmon>=0.9.7',
             'pytest-watch',
 
@@ -64,16 +77,6 @@
             '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

@@ -52,7 +52,7 @@ commands = pre-commit run --config .pre-commit-config.yaml.failing --all-files {
 
 [testenv:setup-check]
 extras =
-    testing
+    docs
 usedevelop = False
 commands =
     python -m setup checkdocs check --metadata --restructuredtext --strict --verbose