Skip to content

Commit 83538a7

Browse files
Kriechipgjones
authored andcommitted
unify config structure with other python-hyper projects
1 parent 27882b6 commit 83538a7

File tree

8 files changed

+51
-16
lines changed

8 files changed

+51
-16
lines changed

.codecov.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
comment: off

.github/workflows/ci.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ jobs:
1616
- 3.6
1717
- 3.7
1818
- 3.8
19+
- pypy3
1920

2021
steps:
21-
- uses: actions/checkout@master
22+
- uses: actions/checkout@v2
2223
with:
2324
submodules: recursive
24-
- name: Set up Python ${{ matrix.python-version }}
25-
uses: actions/setup-python@v1
25+
- uses: actions/setup-python@v2
2626
with:
2727
python-version: ${{ matrix.python-version }}
2828
- name: Install tox
@@ -35,3 +35,6 @@ jobs:
3535
- name: Test with tox
3636
run: |
3737
tox --parallel 0
38+
- uses: codecov/codecov-action@v1
39+
with:
40+
file: ./coverage.xml

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ dist/
55
*.pyc
66
__pycache__
77
.coverage
8+
coverage.xml
89
.tox/
910
.cache/

MANIFEST.in

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1-
include README.rst LICENSE CONTRIBUTORS.rst HISTORY.rst
2-
1+
graft hyperframe
2+
graft docs
3+
graft test
4+
prune docs/build
5+
prune test/http2-frame-test-case
6+
include README.rst LICENSE HISTORY.rst CONTRIBUTORS.rst tox.ini .gitmodules
7+
global-exclude *.pyc *.pyo *.swo *.swp *.map *.yml *.DS_Store

README.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ hyperframe: Pure-Python HTTP/2 framing
44

55
.. image:: https://github.com/python-hyper/hyperframe/workflows/CI/badge.svg
66
:target: https://github.com/python-hyper/hyperframe/actions
7-
:alt: Build status
7+
:alt: Build Status
8+
.. image:: https://codecov.io/gh/python-hyper/hyperframe/branch/master/graph/badge.svg
9+
:target: https://codecov.io/gh/python-hyper/hyperframe
10+
:alt: Code Coverage
811
.. image:: https://readthedocs.org/projects/hyperframe/badge/?version=latest
912
:target: https://hyperframe.readthedocs.io/en/latest/
1013
:alt: Documentation Status

setup.cfg

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,4 @@ exclude_lines =
1818
[coverage:paths]
1919
source =
2020
hyperframe/
21-
.tox/*/lib/*/site-packages/hyperframe
22-
.tox/*/site-packages/hyperframe
21+
*/site-packages/hyperframe

setup.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,18 @@
3333
sys.exit()
3434

3535

36-
packages = ['hyperframe']
37-
3836
setup(
3937
name='hyperframe',
4038
version=version,
4139
description='HTTP/2 framing layer for Python',
4240
long_description=long_description,
4341
author='Cory Benfield',
4442
author_email='cory@lukasa.co.uk',
45-
url='https://python-hyper.org/hyperframe/en/latest/',
46-
packages=packages,
43+
url='https://github.com/python-hyper/hyperframe/',
44+
packages=['hyperframe'],
4745
package_data={'': ['LICENSE', 'README.rst', 'CONTRIBUTORS.rst', 'HISTORY.rst']},
4846
package_dir={'hyperframe': 'hyperframe'},
47+
python_requires=">=3.6.1",
4948
include_package_data=True,
5049
license='MIT License',
5150
classifiers=[

tox.ini

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,51 @@
11
[tox]
2-
envlist = py36, py37, py38, pypy3, lint
2+
envlist = py36, py37, py38, pypy3, lint, docs, packaging
33

44
[gh-actions]
55
python =
66
3.6: py36
77
3.7: py37
8-
3.8: py38, lint
8+
3.8: py38, lint, docs, packaging
9+
pypy3: pypy3
910

1011
[testenv]
12+
passenv =
13+
GITHUB_*
1114
deps =
1215
pytest==5.4.3
1316
pytest-cov==2.10.0
1417
pytest-xdist==1.33.0
15-
coverage==5.2
1618
commands =
17-
pytest --cov=hyperframe {posargs}
19+
pytest --cov-report=xml --cov-report=term --cov=hyperframe {posargs}
1820

1921
[testenv:pypy3]
2022
# temporarily disable coverage testing on PyPy due to performance problems
2123
commands = pytest {posargs}
2224

25+
[testenv:docs]
26+
basepython = python3.8
27+
deps =
28+
sphinx==3.1.2
29+
whitelist_externals = make
30+
changedir = {toxinidir}/docs
31+
commands =
32+
make clean
33+
make html
34+
2335
[testenv:lint]
2436
basepython = python3.8
2537
deps =
2638
flake8==3.8.3
2739
commands = flake8 --max-complexity 10 hyperframe test
40+
41+
[testenv:packaging]
42+
basepython = python3.8
43+
deps =
44+
check-manifest==0.40
45+
readme-renderer==24.0
46+
twine==3.2.0
47+
commands =
48+
check-manifest
49+
python setup.py check --metadata --restructuredtext --strict
50+
python setup.py sdist
51+
twine check dist/*

0 commit comments

Comments
 (0)