Skip to content

Commit 7ba481f

Browse files
authored
Merge pull request #38 from Natim/run-tests-with-python36
Run tests with Python3.6 on travis.
2 parents 36555b6 + 6b1030c commit 7ba481f

File tree

2 files changed

+35
-28
lines changed

2 files changed

+35
-28
lines changed

.travis.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
language: python
22
python:
3-
- "2.7"
3+
- "2.7"
4+
- "3.6"
45
install:
5-
- pip install -r requirements.txt
6-
- pip install -r test-requirements.txt
6+
- pip install -r requirements.txt
7+
- pip install -r test-requirements.txt
78
script:
8-
- nosetests
9-
- flake8 pywebpush
9+
- nosetests
10+
- flake8 pywebpush
1011
after_success:
11-
- codecov
12+
- codecov

setup.py

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,31 @@ def read_from(file):
2424
with io.open(os.path.join(here, 'CHANGELOG.md'), encoding='utf8') as f:
2525
CHANGES = f.read()
2626

27-
setup(name="pywebpush",
28-
version=__version__,
29-
packages=find_packages(),
30-
description='WebPush publication library',
31-
long_description=README + '\n\n' + CHANGES,
32-
classifiers=["Topic :: Internet :: WWW/HTTP",
33-
"Programming Language :: Python :: Implementation :: PyPy",
34-
'Programming Language :: Python',
35-
"Programming Language :: Python :: 2",
36-
"Programming Language :: Python :: 2.7"
37-
],
38-
keywords='push webpush publication',
39-
author="jr conlin",
40-
author_email="[email protected]",
41-
url='https://github.com/web-push-libs/pywebpush',
42-
license="MPL2",
43-
test_suite="nose.collector",
44-
include_package_data=True,
45-
zip_safe=False,
46-
install_requires=read_from('requirements.txt'),
47-
tests_require=read_from('test-requirements.txt')
48-
)
27+
setup(
28+
name="pywebpush",
29+
version=__version__,
30+
packages=find_packages(),
31+
description='WebPush publication library',
32+
long_description=README + '\n\n' + CHANGES,
33+
classifiers=[
34+
"Topic :: Internet :: WWW/HTTP",
35+
"Programming Language :: Python :: Implementation :: PyPy",
36+
'Programming Language :: Python',
37+
"Programming Language :: Python :: 2",
38+
"Programming Language :: Python :: 2.7",
39+
"Programming Language :: Python :: 3",
40+
"Programming Language :: Python :: 3.4",
41+
"Programming Language :: Python :: 3.5",
42+
"Programming Language :: Python :: 3.6",
43+
],
44+
keywords='push webpush publication',
45+
author="JR Conlin",
46+
author_email="[email protected]",
47+
url='https://github.com/web-push-libs/pywebpush',
48+
license="MPL2",
49+
test_suite="nose.collector",
50+
include_package_data=True,
51+
zip_safe=False,
52+
install_requires=read_from('requirements.txt'),
53+
tests_require=read_from('test-requirements.txt')
54+
)

0 commit comments

Comments
 (0)