Skip to content

Commit 408f903

Browse files
Kriechipgjones
authored andcommitted
bump all the things
1 parent 809ffe7 commit 408f903

File tree

8 files changed

+73
-85
lines changed

8 files changed

+73
-85
lines changed

.coveragerc

Lines changed: 0 additions & 14 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches: ["master"]
6+
pull_request:
7+
branches: ["master"]
8+
9+
jobs:
10+
tox:
11+
runs-on: ubuntu-latest
12+
strategy:
13+
max-parallel: 5
14+
matrix:
15+
python-version:
16+
- 3.6
17+
- 3.7
18+
- 3.8
19+
20+
steps:
21+
- uses: actions/checkout@master
22+
- name: Set up Python ${{ matrix.python-version }}
23+
uses: actions/setup-python@v1
24+
with:
25+
python-version: ${{ matrix.python-version }}
26+
- name: Install tox
27+
run: |
28+
python -m pip install --upgrade pip setuptools
29+
pip install --upgrade tox tox-gh-actions
30+
- name: Initialize tox envs
31+
run: |
32+
tox --parallel auto --notest
33+
- name: Test with tox
34+
run: |
35+
tox --parallel 0

.travis.yml

Lines changed: 0 additions & 43 deletions
This file was deleted.

Makefile

Lines changed: 0 additions & 6 deletions
This file was deleted.

setup.cfg

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,20 @@ universal = 1
33

44
[tool:pytest]
55
testpaths = test
6+
7+
[coverage:run]
8+
branch = True
9+
source = hyperframe
10+
11+
[coverage:report]
12+
fail_under = 100
13+
show_missing = True
14+
exclude_lines =
15+
pragma: no cover
16+
raise NotImplementedError()
17+
18+
[coverage:paths]
19+
source =
20+
hyperframe/
21+
.tox/*/lib/*/site-packages/hyperframe
22+
.tox/*/site-packages/hyperframe

setup.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@
1010
except ImportError:
1111
from distutils.core import setup
1212

13+
14+
PROJECT_ROOT = os.path.dirname(__file__)
15+
16+
with open(os.path.join(PROJECT_ROOT, 'README.rst')) as file_:
17+
long_description = file_.read()
18+
1319
# Get the version
1420
version_regex = r'__version__ = ["\']([^"\']*)["\']'
1521
with open('hyperframe/__init__.py', 'r') as f:
@@ -33,7 +39,7 @@
3339
name='hyperframe',
3440
version=version,
3541
description='HTTP/2 framing layer for Python',
36-
long_description=open('README.rst').read() + '\n\n' + open('HISTORY.rst').read(),
42+
long_description=long_description,
3743
author='Cory Benfield',
3844
author_email='[email protected]',
3945
url='https://python-hyper.org/hyperframe/en/latest/',
@@ -47,13 +53,11 @@
4753
'Intended Audience :: Developers',
4854
'License :: OSI Approved :: MIT License',
4955
'Programming Language :: Python',
50-
'Programming Language :: Python :: 2',
51-
'Programming Language :: Python :: 2.7',
5256
'Programming Language :: Python :: 3',
53-
'Programming Language :: Python :: 3.4',
54-
'Programming Language :: Python :: 3.5',
5557
'Programming Language :: Python :: 3.6',
5658
'Programming Language :: Python :: 3.7',
59+
'Programming Language :: Python :: 3.8',
5760
'Programming Language :: Python :: Implementation :: CPython',
61+
'Programming Language :: Python :: Implementation :: PyPy',
5862
],
5963
)

test_requirements.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.

tox.ini

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
[tox]
2-
envlist = py27, py34, py35, py36, py37, pypy, pypy3, lint
2+
envlist = py36, py37, py38, pypy3, lint
33

44
[testenv]
5-
deps = -r{toxinidir}/test_requirements.txt
5+
deps =
6+
pytest==5.4.3
7+
pytest-cov==2.10.0
8+
pytest-xdist==1.33.0
9+
coverage==5.2
610
commands =
7-
coverage run -m pytest --cov=hyperframe {posargs}
11+
pytest --cov=hyperframe {posargs}
812

913
[testenv:pypy]
10-
deps = -r{toxinidir}/test_requirements.txt
11-
commands =
12-
pytest {posargs}
13-
14-
[testenv:pypy3]
15-
deps = -r{toxinidir}/test_requirements.txt
16-
commands =
17-
pytest {posargs}
14+
# temporarily disable coverage testing on PyPy due to performance problems
15+
commands = pytest {posargs}
1816

1917
[testenv:lint]
20-
basepython=python3.7
21-
deps = flake8==3.7.7
18+
basepython = python3.8
19+
deps =
20+
flake8==3.8.3
2221
commands = flake8 --max-complexity 10 hyperframe test

0 commit comments

Comments
 (0)