Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Travis CI migration and packaging improvements #2990

Merged
merged 13 commits into from
May 17, 2018
Merged

Travis CI migration and packaging improvements #2990

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ab017b3
Opt-in to use edge Travis CI config parser
webknjaz May 10, 2018
4dd1cb7
Drop outdated comment from Travis CI config
webknjaz May 10, 2018
a2f21b0
Turn env vars in Travis CI config to key-value
webknjaz May 10, 2018
dfa709c
Move towncrier linter into its own job
webknjaz May 10, 2018
d242c61
Upgrade refs across repo to point to travis-ci.com
webknjaz May 10, 2018
1fb2194
Make run_docker script saver to maintain
webknjaz May 10, 2018
b0223a0
Announce support for Python 3.7
webknjaz May 10, 2018
9f6f891
Use pytest-runner in dist setup
webknjaz May 10, 2018
8396818
Don't install mypy under PyPy
webknjaz May 10, 2018
b705aaa
Don't install uvloop under 3.7
webknjaz May 10, 2018
9396516
Run pytest directly in AppVeyor CI
webknjaz May 11, 2018
952c254
Polish job names
asvetlov May 15, 2018
a045cff
Use idiomatic python setup.py sdist
asvetlov May 17, 2018
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
Prev Previous commit
Next Next commit
Use pytest-runner in dist setup
  • Loading branch information
@webknjaz
webknjaz committed May 14, 2018
commit 9f6f89195a5fc18ab462f5e6621bc6bef20479b5
3 changes: 3 additions & 0 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[aliases]
test = pytest

[metadata]
license_file = LICENSE.txt

Expand Down
20 changes: 7 additions & 13 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
DistutilsPlatformError)

from setuptools import Extension, setup
from setuptools.command.test import test as TestCommand


if sys.version_info < (3, 5, 3):
Expand Down Expand Up @@ -85,17 +84,11 @@ def read(f):
return (here / f).read_text('utf-8').strip()


class PyTest(TestCommand):
user_options = []
NEEDS_PYTEST = {'pytest', 'test'}.intersection(sys.argv)
pytest_runner = ['pytest-runner'] if NEEDS_PYTEST else []

def run(self):
import subprocess
errno = subprocess.call([sys.executable, '-m', 'pytest', 'tests'])
raise SystemExit(errno)


tests_require = install_requires + ['pytest', 'gunicorn',
'pytest-timeout', 'async-generator']
tests_require = ['pytest', 'gunicorn',
'pytest-timeout', 'async-generator']


args = dict(
Expand Down Expand Up @@ -140,10 +133,11 @@ def run(self):
python_requires='>=3.5.3',
install_requires=install_requires,
tests_require=tests_require,
setup_requires=pytest_runner,
include_package_data=True,
ext_modules=extensions,
cmdclass=dict(build_ext=ve_build_ext,
test=PyTest))
cmdclass=dict(build_ext=ve_build_ext),
)

try:
setup(**args)
Expand Down