Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@ python:
- "3.5"
- "3.6"

install:
- pip install tox tox-travis
install: pip install tox-travis coveralls

script: tox

after_success:
- pip install coveralls && cd tests && coveralls
after_success: coveralls
12 changes: 11 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
[coverage:run]
source = pytest_asyncio

[coverage:report]
show_missing = true

[tool:pytest]
addopts = -rsx --tb=short --cov
testpaths = tests

[metadata]
# ensure LICENSE is included in wheel metadata
license_file = LICENSE
license_file = LICENSE
27 changes: 11 additions & 16 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,36 +1,29 @@
import codecs
import os
import re
from setuptools import setup, find_packages

with open('README.rst') as f:
readme = f.read()

from pathlib import Path

def read(*parts):
here = os.path.abspath(os.path.dirname(__file__))
return codecs.open(os.path.join(here, *parts), 'r').read()
from setuptools import setup, find_packages


def find_version(*file_paths):
version_file = read(*file_paths)
def find_version():
version_file = Path(__file__).parent.joinpath('pytest_asyncio', '__init__.py').read_text()
version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]",
version_file, re.M)
if version_match:
return version_match.group(1)

raise RuntimeError("Unable to find version string.")


setup(
name='pytest-asyncio',
version=find_version('pytest_asyncio', '__init__.py'),
version=find_version(),
packages=find_packages(),
url='https://github.com/pytest-dev/pytest-asyncio',
license='Apache 2.0',
author='Tin Tvrtkovic',
author='Tin Tvrtković',
author_email='tinchester@gmail.com',
description='Pytest support for asyncio.',
long_description=readme,
long_description=Path(__file__).parent.joinpath('README.rst').read_text(),
classifiers=[
"Development Status :: 4 - Beta",
"Intended Audience :: Developers",
Expand All @@ -40,11 +33,13 @@ def find_version(*file_paths):
"Topic :: Software Development :: Testing",
"Framework :: Pytest",
],
python_requires='>= 3.5',
install_requires=[
'pytest >= 3.0.6',
],
extras_require={
':python_version == "3.5"': 'async_generator >= 1.3'
':python_version == "3.5"': 'async_generator >= 1.3',
'testing': ['pytest-cov', 'async_generator >= 1.3'],
},
entry_points={
'pytest11': ['asyncio = pytest_asyncio.plugin'],
Expand Down
3 changes: 0 additions & 3 deletions test_requirements.txt

This file was deleted.

10 changes: 3 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
[tox]
envlist = py35, py36
minversion = 2.5.0

[testenv]
deps =
pip >= 6
-rtest_requirements.txt
commands =
coverage run --source pytest_asyncio -m py.test
coverage report
changedir = tests
extras = testing
commands = python -m pytest {posargs}