unify repository layout

Author: Kriechi

MANIFEST.in

@@ -1,4 +1,4 @@
-graft src
+graft src/wsproto
 graft compliance
 graft example
 graft docs

setup.py

@@ -1,8 +1,7 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import os
 import re
-import sys
 
 from setuptools import setup, find_packages
 
@@ -11,22 +10,15 @@
 with open(os.path.join(PROJECT_ROOT, 'README.rst')) as file_:
     long_description = file_.read()
 
-# Get the version
 version_regex = r'__version__ = ["\']([^"\']*)["\']'
 with open(os.path.join(PROJECT_ROOT, 'src/wsproto/__init__.py')) as file_:
     text = file_.read()
     match = re.search(version_regex, text)
-
     if match:
         version = match.group(1)
     else:
         raise RuntimeError("No version number found!")
 
-# Stealing this from Cory Benfield who stole it from Kenneth Reitz
-if sys.argv[-1] == 'publish':
-    os.system('python setup.py sdist upload')
-    sys.exit()
-
 setup(
     name='wsproto',
     version=version,
@@ -37,10 +29,9 @@
     author_email='[email protected]',
     url='https://github.com/python-hyper/wsproto/',
     packages=find_packages(where="src"),
-    package_data={'': ['LICENSE', 'README.rst', 'CHANGELOG.rst']},
+    package_data={'wsproto': ['py.typed']},
     package_dir={'': 'src'},
     python_requires='>=3.6.1',
-    include_package_data=True,
     license='MIT License',
     classifiers=[
         'Development Status :: 5 - Production/Stable',

tox.ini

@@ -1,75 +1,73 @@
 [tox]
-envlist = py36, py37, py38, py39, pypy3, format, mypy, lint, docs, packaging
+envlist = py36, py37, py38, py39, pypy3, lint, docs, packaging
 
 [gh-actions]
 python =
     3.6: py36
     3.7: py37
-    3.8: py38, format, mypy, lint, docs, packaging
-    3.9: py39
+    3.8: py38
+    3.9: py39, lint, docs, packaging
     pypy3: pypy3
 
 [testenv]
 passenv =
     GITHUB_*
 deps =
-    pytest==6.1.2
-    pytest-cov==2.10.1
-    pytest-xdist==2.1.0
+    pytest>=6.1.2,<7
+    pytest-cov>=2.10.1,<3
+    pytest-xdist>=2.2.1,<3
 commands =
     pytest --cov-report=xml --cov-report=term --cov=wsproto {posargs}
 
 [testenv:pypy3]
 # temporarily disable coverage testing on PyPy due to performance problems
 commands = pytest {posargs}
 
-[testenv:autobahn]
-changedir = {toxinidir}/compliance
-commands =
-    python run-autobahn-tests.py {env:SIDE:}
-
-[testenv:format]
-basepython = python3.8
+[testenv:lint]
 deps =
+    prospector==1.3.1
     black==20.8b1
     isort==5.6.4
-commands =
-    black --check --diff src/ test/ example/ compliance/ bench/
-    isort --check --diff src/ test/ example/ compliance/ bench/
-
-[testenv:mypy]
-basepython = python3.8
-deps =
     mypy==0.790
     pytest==6.1.2
 commands =
+    prospector
+    black --check --diff src/ test/ example/ compliance/ bench/
+    isort --check --diff src/ test/ example/ compliance/ bench/
     mypy src/ test/ example/ bench/
 
-[testenv:lint]
-basepython = python3.8
-deps =
-    prospector==1.3.1
-commands = prospector
-
 [testenv:docs]
-basepython = python3.8
 deps =
-    sphinx==3.3.1
+    sphinx>=4.0.2,<5
 whitelist_externals = make
 changedir = {toxinidir}/docs
 commands =
     make clean
     make html
 
 [testenv:packaging]
-basepython = python3.8
+basepython = python3.9
 deps =
-    check-manifest==0.45
-    readme-renderer==28.0
-    twine==3.2.0
+    check-manifest==0.46
+    readme-renderer==29.0
+    twine>=3.4.1,<4
 whitelist_externals = rm
 commands =
     rm -rf dist/
     check-manifest
     python setup.py sdist bdist_wheel
     twine check dist/*
+
+[testenv:publish]
+basepython = {[testenv:packaging]basepython}
+deps =
+    {[testenv:packaging]deps}
+whitelist_externals = {[testenv:packaging]whitelist_externals}
+commands =
+    {[testenv:packaging]commands}
+    twine upload dist/*
+
+[testenv:autobahn]
+changedir = {toxinidir}/compliance
+commands =
+    python run-autobahn-tests.py {env:SIDE:}