Merge pull request #1215 from Kriechi/bump-dev

Kriechi · web-flow · commit f4593f82f473 · 2020-03-15T21:28:40.000+01:00
Bump dev to 4.0.0dev0
diff --git a/.travis.yml b/.travis.yml
@@ -13,39 +13,31 @@ cache:
 matrix:
   include:
     # Main tests on supported Python versions.
-    - python: "2.7"
-      dist: trusty
-      env: TOXENV=py27
-    - python: "3.4"
-      dist: trusty
-      env: TOXENV=py34
-    - python: "3.5"
-      dist: trusty
-      env: TOXENV=py35
     - python: "3.6"
-      dist: trusty
+      dist: bionic
       env: TOXENV=py36
     - python: "3.7"
-      dist: xenial
+      dist: bionic
       env: TOXENV=py37
     - python: "3.8"
-      dist: xenial
+      dist: bionic
       env: TOXENV=py38
-    - python: "pypy-5.3.1"
-      dist: trusty
+    - python: "pypy3.6-7.2.0"
+      dist: bionic
       env: TOXENV=pypy
 
     # Linting, docs, and other non-test stuff.
-    - python: "3.7"
-      dist: xenial
+    - python: "3.8"
+      dist: bionic
       env: TOXENV=lint
-    - python: "3.7"
-      dist: xenial
+    - python: "3.8"
+      dist: bionic
       env: TOXENV=docs
-    - python: "3.7"
-      dist: xenial
+    - python: "3.8"
+      dist: bionic
       env: TOXENV=packaging
-    - python: "3.6"
+    - python: "3.8"
+      dist: bionic
       env: TOXENV=h2spec
 
 install:
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -1,6 +1,18 @@
 Release History
 ===============
 
+4.0.0.dev0
+------------------
+
+API Changes (Backward-Incompatible)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- Support for Python 2.7 has been removed.
+- Support for Python 3.4 has been removed.
+- Support for Python 3.5 has been removed.
+- Support for PyPy (Python 2.7 compatible) has been removed.
+
+
 3.2.0 (2020-02-08)
 ------------------
 
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2016 Cory Benfield and contributors
+Copyright (c) 2015-2020 Cory Benfield and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Makefile b/Makefile
@@ -1,9 +1,7 @@
-.PHONY: publish test
+.PHONY: publish
 
 publish:
 	rm -rf dist/
-	python setup.py sdist bdist_wheel
+	pip3 install -U twine wheel pip setuptools
+	python3 setup.py sdist bdist_wheel
 	twine upload -s dist/*
-
-test:
-	py.test -n 4 --cov h2 test/
diff --git a/README.rst b/README.rst
@@ -61,5 +61,4 @@ License
 Authors
 =======
 
-``hyper-h2`` is maintained by Cory Benfield, with contributions from others. For
-more details about the contributors, please see ``CONTRIBUTORS.rst``.
+``hyper-h2`` is maintained by Cory Benfield, with contributions from others.
diff --git a/docs/source/_static/h2.connection.H2ConnectionStateMachine.dot.png b/docs/source/_static/h2.connection.H2ConnectionStateMachine.dot.png
diff --git a/docs/source/_static/h2.stream.H2StreamStateMachine.dot.png b/docs/source/_static/h2.stream.H2StreamStateMachine.dot.png
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.2.0'
+version = '4.0.0'
 # The full version, including alpha/beta/rc tags.
-release = '3.2.0'
+release = '4.0.0dev0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/source/contributors.rst b/docs/source/contributors.rst
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -38,4 +38,3 @@ Contents
    testimonials
    release-process
    release-notes
-   contributors
diff --git a/docs/source/release-notes.rst b/docs/source/release-notes.rst
@@ -85,7 +85,7 @@ lot of great work has been done by the community. To that end, we'd also like
 to extend a great thankyou to those contributors who made their first contribution
 to the project between release 1.0.0 and 2.0.0. Many thanks to:
 `Thomas Kriechbaumer`_, `Alex Chan`_, `Maximilian Hils`_, and `Glyph`_. For a
-full historical list of contributors, see :doc:`contributors`.
+full historical list of contributors, see `contributors`_.
 
 We're looking forward to the next few months of Python HTTP/2 work, and hoping
 that you'll find lots of excellent HTTP/2 applications to build with Hyper-h2!
@@ -95,6 +95,7 @@ that you'll find lots of excellent HTTP/2 applications to build with Hyper-h2!
 .. _Alex Chan: https://github.com/alexwlchan
 .. _Maximilian Hils: https://github.com/mhils
 .. _Glyph: https://github.com/glyph
+.. _contributors: https://github.com/python-hyper/hyper-h2/blob/b14817b79c7bb1661e1aa84ef7920c009ef1e75b/CONTRIBUTORS.rst
 
 
 .. _detailed-release-notes:
diff --git a/h2/__init__.py b/h2/__init__.py
@@ -5,4 +5,4 @@
 
 A HTTP/2 implementation.
 """
-__version__ = '3.2.0'
+__version__ = '4.0.0dev0'
diff --git a/setup.py b/setup.py
@@ -26,10 +26,6 @@
     os.system('python setup.py sdist upload')
     sys.exit()
 
-packages = [
-    'h2',
-]
-
 readme = codecs.open('README.rst', encoding='utf-8').read()
 history = codecs.open('HISTORY.rst', encoding='utf-8').read()
 
@@ -45,8 +41,8 @@
         'Documentation': 'https://python-hyper.org/projects/h2',
         'Source': 'https://github.com/python-hyper/hyper-h2',
     },
-    packages=packages,
-    package_data={'': ['LICENSE', 'README.rst', 'CONTRIBUTORS.rst', 'HISTORY.rst', 'NOTICES']},
+    packages=['h2'],
+    package_data={'': ['LICENSE', 'README.rst', 'HISTORY.rst']},
     package_dir={'h2': 'h2'},
     include_package_data=True,
     license='MIT License',
@@ -55,22 +51,15 @@
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
     ],
     install_requires=[
-        'hyperframe>=5.2.0, <6',
-        'hpack>=3.0,<4',
+        'hyperframe>=5.2.0,<6',
+        'hpack>=3.0.0,<4',
     ],
-    extras_require={
-        ':python_version == "2.7"': ['enum34>=1.1.6, <2'],
-    }
 )
diff --git a/test_requirements.txt b/test_requirements.txt
@@ -1,5 +1,5 @@
-pytest==4.6.5  # rq.filter: < 5
+pytest==5.3.5
 pytest-cov==2.8.1
 pytest-xdist==1.31.0
-coverage==4.5.4
-hypothesis
+coverage==5.0.3
+hypothesis>=5.5,<6
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py34, py35, py36, py37, py38, pypy, lint, packaging, docs
+envlist = py36, py37, py38, pypy, lint, packaging, docs
 
 [testenv]
 deps= -r{toxinidir}/test_requirements.txt
@@ -12,37 +12,37 @@ commands=
 commands= py.test {posargs}
 
 [testenv:lint]
-basepython=python3.7
-deps = flake8==3.7.8
+basepython=python3.8
+deps = flake8==3.7.9
 commands = flake8 --max-complexity 10 h2 test
 
 [testenv:docs]
-basepython=python3.7
-deps = sphinx==2.2.0
+basepython=python3.8
+deps = sphinx==2.4.0
 changedir = {toxinidir}/docs
 whitelist_externals = rm
 commands =
     rm -rf build
     sphinx-build -nW -b html -d build/doctrees source build/html
 
 [testenv:graphs]
-basepython=python2.7
-deps = graphviz==0.13
+basepython=python3.8
+deps = graphviz==0.13.2
 commands =
     python visualizer/visualize.py -i docs/source/_static
 
 [testenv:packaging]
-basepython=python3.7
+basepython=python3.8
 deps =
-    check-manifest==0.39
+    check-manifest==0.40
     readme-renderer==24.0
 commands =
     check-manifest
     python setup.py check --metadata --restructuredtext --strict
 
 [testenv:h2spec]
-basepython=python3.6
-deps = twisted[tls]==19.7.0
+basepython=python3.8
+deps = twisted[tls]==19.10.0
 whitelist_externals = {toxinidir}/test/h2spectest.sh
 commands =
     {toxinidir}/test/h2spectest.sh
diff --git a/visualizer/visualize.py b/visualizer/visualize.py
@@ -16,7 +16,6 @@
 because it is of minimal value to users who are installing hyper-h2: its use
 is only really for the developers of hyper-h2.
 """
-from __future__ import print_function
 import argparse
 import collections
 import sys
