Skip to content

Commit 8b6bcfc

Browse files
authored
Merge pull request #31 from fredthomsen/addLatestPy3Support
Add latest py3 support and fix CI
2 parents dd7c75b + e71fcc1 commit 8b6bcfc

File tree

4 files changed

+15
-16
lines changed

4 files changed

+15
-16
lines changed

.travis.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,24 @@ matrix:
1212
env: TOXENV=py34
1313
- python: 3.5
1414
env: TOXENV=py35
15+
- python: 3.6
16+
env: TOXENV=py36
1517
- python: pypy
1618
env: TOXENV=pypy
19+
allow_failures:
20+
- python: 2.6
21+
env: TOXENV=py26
22+
- python: 2.7
23+
env: TOXENV=py27
24+
- python: 3.3
25+
env: TOXENV=py33
26+
- python: pypy
27+
env: TOXENV=pypy
28+
1729
install:
1830
- pip install tox
19-
- pip install python-coveralls
2031
- pip install codecov
2132
script:
2233
- tox
2334
after_success:
2435
- codecov
25-
deploy:
26-
provider: pypi
27-
distributions: sdist bdist_wheel
28-
user: sbuss
29-
password:
30-
secure: BGA4p5oEaBizDZe9q6bjItszJonBSJWxIe+uaAWZqHB+S0XDUV2oc9vIPTVn8AHiqW4fYxHaNzPrJ2+yd9GNRLh4vgQH24RJ3XaXG3z1RQp5HOb6lzS//h5IumU8nFTFZP2R5rNfBwi8ZK1SLtUk0FKhqB4CUFkoy1IRo55MQLg1QSqf5rK6KVflVKOyRbBCd2+mTyga4g2r1o2JEQ1/cnDt916B/io7KhgugliOPmh6oDWDYy5NOCQy9Jzg6mgAVeQJ7YyO5OpMOVyX49oGWgkmk2d1CWnOKie/gSHptIt9rrv4bBqDOIeqTC42Ti7MZNMcg7/lZJTYmdJL79Wgutc3vzOjwK4VrAq7gqO1h6aMWmi2o205ZLghvC7/4CISroUFblMN2KlzYL6rhiTeXTYMX2WwXtXESJBRBweKBfoMvwNuefWVUSPOAqwXJBzr8lbvoRkMu+HfGsYbXH/4FvEe1MPV76SI8gcd+Y1KAlclIdTbRG/zv3wutLDghIuUWu2XZ9SNV1hfeadZ5ys7iNqv4YQPV7vCGldoihcKheZKkswjUqdSDH7dHclXHi+U8zlXhfTAv4baqcIP5a2liWERRZKOv9s0ruZ/iGubCLFyc+2UXOXRPP1lBqjE8QZI1xVDlMDPBIvkS1ITSvSXVH9fTpbeIshO+azw/Nm7/lQ=
31-
on:
32-
tags: true
33-
repo: sbuss/py-multiaddr
34-
branch: master
35-
condition: "$TOXENV == py27"

README.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ Dual-licensed:
116116
- `MIT`_ © 2014 Steven Buss
117117
- `Apache 2`_ © 2014 Steven Buss
118118

119-
.. _@sbuss: https://github.com/sbuss
120119
.. _the issues: https://github.com/multiformats/py-multiaddr/issues
121120
.. _contributing document: https://github.com/multiformats/multiformats/blob/master/contributing.md
122121
.. _Code of Conduct: https://github.com/ipfs/community/blob/master/code-of-conduct.md

requirements_dev.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ bumpversion==0.5.3
44
wheel==0.29.0
55
watchdog==0.8.3
66
flake8==2.5.4
7-
tox==2.3.1
8-
coverage==4.0.3
7+
tox==3.6.1
8+
coverage==4.5.2
99
Sphinx==1.3.6
1010
pytest
1111
pytest-cov

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py26, py27, py33, py34, py35, pypy
2+
envlist = py26, py27, py33, py34, py35, py36, pypy
33

44
[testenv]
55
setenv =

0 commit comments

Comments
 (0)