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.

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

Add python 3.7 to CI #420

Merged
merged 5 commits into from Oct 7, 2018
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 27 additions & 0 deletions .travis.yml
Expand Up @@ -22,6 +22,9 @@ jobs:
script: tox
env: TOXENV=py35,codecov
python: 3.5
- script: tox
env: TOXENV=py35,codecov
python: 3.5-dev
- script: tox
env: TOXENV=py35-ujson,codecov
python: 3.5
Expand All @@ -35,6 +38,9 @@ jobs:
- script: tox
env: TOXENV=py36,codecov
python: 3.6
- script: tox
env: TOXENV=py36,codecov
python: 3.6-dev
- script: tox
env: TOXENV=py36-ujson,codecov
python: 3.6
Expand All @@ -45,6 +51,27 @@ jobs:
env: TOXENV=py36-deps-devel,codecov
python: 3.6

- script: tox
env: TOXENV=py37,codecov
python: 3.7
dist: xenial
sudo: true
- script: tox
env: TOXENV=py37-ujson,codecov
python: 3.7
dist: xenial
sudo: true
- script: tox
env: TOXENV=py37-deps-lowest,codecov
python: 3.7
dist: xenial
sudo: true
- script: tox
env: TOXENV=py37-deps-devel,codecov
python: 3.7
dist: xenial
sudo: true

- stage: deploy
script: skip
python: 3.6
Expand Down
3 changes: 0 additions & 3 deletions Makefile
Expand Up @@ -40,8 +40,5 @@ _release:

release: test _release

freeze:
pipenv lock -d

changelog:
gitchangelog
4 changes: 3 additions & 1 deletion setup.py
Expand Up @@ -30,12 +30,14 @@
'Programming Language :: Python',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Framework :: AsyncIO',
],
packages=find_packages(),
install_requires=None,
extras_require={
'redis': ['aioredis>=0.3.3'],
'redis:python_version<"3.7"': ['aioredis>=0.3.3'],
'redis:python_version>="3.7"': ['aioredis>=1.0.0'],
'memcached': ['aiomcache>=0.5.2'],
'msgpack': ['msgpack'],
}
Expand Down
9 changes: 5 additions & 4 deletions tox.ini
@@ -1,7 +1,7 @@
[tox]
envlist =
py{36}-{deps-lowest,deps-devel}
py{35,36}-ujson
py{36,37}-{deps-lowest,deps-devel}
py{35,36,37}-ujson
codecov
syntax
docs-html
Expand All @@ -14,7 +14,8 @@ whitelist_externals =
bash

deps =
deps-lowest: aioredis==0.3.3
py37-deps-lowest: aioredis==1.0.0
py36-deps-lowest: aioredis==0.3.3
deps-lowest: aiomcache==0.5.2
deps-devel: https://github.com/aio-libs/aiomcache/archive/master.tar.gz
deps-devel: https://github.com/aio-libs/aioredis/archive/master.tar.gz
Expand All @@ -26,7 +27,7 @@ deps =
.[msgpack]

commands =
pip install pipenv
pip install pipenv==2018.5.18
make install-dev
pipenv graph
make unit cov-report=false
Expand Down