Skip to content

Commit

Permalink
Merge 4598793 into 4d2a4ff
Browse files Browse the repository at this point in the history
  • Loading branch information
aawilson committed Mar 15, 2019
2 parents 4d2a4ff + 4598793 commit c15cec6
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
14 changes: 8 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
language: python
python:
- 2.7
- 3.4
- 3.5
- 3.6
- 3.7

sudo: required
install:
- pip install tox
env:
- TOXENV=py27
- TOXENV=py34
- TOXENV=py35
- pip install tox-travis
script:
- tox

Expand All @@ -14,7 +17,6 @@ cache:
- thrift-0.9.3

before_install:
- pyenv global system 3.5
- ls "thrift-0.9.3" | grep "bootstrap.sh" || wget https://github.com/apache/thrift/archive/0.9.3.tar.gz -O thrift.tar.gz
- ls "thrift-0.9.3" | grep "bootstrap.sh" || tar xf thrift.tar.gz
- cd thrift-0.9.3
Expand Down
2 changes: 1 addition & 1 deletion requirements_py3x.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
setproctitle==1.1.10
gevent>=1.2,<1.3
gevent>=1.2
gunicorn>=19.4.0
thriftpy2>=0.4.0
2 changes: 1 addition & 1 deletion test_requirements_py3x.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pytest
pytest-cov
gevent==1.2.2
gevent==1.4.0
thrift>=0.9.3

0 comments on commit c15cec6

Please sign in to comment.