mrg from master

This commit is contained in:
Daniel Black
2015-08-27 18:27:28 +10:00
6 changed files with 27 additions and 3 deletions

16
.coveragerc Normal file
View File

@@ -0,0 +1,16 @@
[run]
branch = True
source =
pymysql
[report]
exclude_lines =
pragma: no cover
except ImportError:
if DEBUG:
def __repr__
def __str__
raise NotImplementedError
def __getattr__
raise ValueError

1
.gitignore vendored
View File

@@ -1,6 +1,7 @@
*.pyc *.pyc
*.pyo *.pyo
__pycache__ __pycache__
.coverage
/dist /dist
/PyMySQL.egg-info /PyMySQL.egg-info
/.tox /.tox

View File

@@ -55,7 +55,7 @@ matrix:
# really only need libaio1 for DB builds however libaio-dev is whitelisted for container builds and liaio1 isn't # really only need libaio1 for DB builds however libaio-dev is whitelisted for container builds and liaio1 isn't
install: install:
- pip install -U tox - pip install -U tox coveralls
before_script: before_script:
- ./.travis.initialize.db.sh; - ./.travis.initialize.db.sh;
@@ -65,9 +65,13 @@ before_script:
- mysql -u root -e "create user travis_pymysql2@localhost identified by 'some password'; grant all on test_pymysql2.* to travis_pymysql2@localhost;" - mysql -u root -e "create user travis_pymysql2@localhost identified by 'some password'; grant all on test_pymysql2.* to travis_pymysql2@localhost;"
- mysql -e 'select VERSION();' - mysql -e 'select VERSION();'
- rm -f ~/.my.cnf # set in .travis.initialize.db.sh for the above commands - we should be using database.json however - rm -f ~/.my.cnf # set in .travis.initialize.db.sh for the above commands - we should be using database.json however
- export COVERALLS_PARALLEL=true
script: script:
- tox -e $TOX_ENV - tox -e $TOX_ENV
after_success:
- coveralls
after_failure: after_failure:
- cat /tmp/mysql.err - cat /tmp/mysql.err

View File

@@ -5,6 +5,8 @@ PyMySQL
.. image:: https://travis-ci.org/PyMySQL/PyMySQL.svg?branch=master .. image:: https://travis-ci.org/PyMySQL/PyMySQL.svg?branch=master
:target: https://travis-ci.org/PyMySQL/PyMySQL :target: https://travis-ci.org/PyMySQL/PyMySQL
.. image:: https://coveralls.io/repos/PyMySQL/PyMySQL/badge.svg?branch=coveralls&service=github :target: https://coveralls.io/github/PyMySQL/PyMySQL?branch=coveralls
.. contents:: .. contents::
This package contains a pure-Python MySQL client library. The goal of PyMySQL This package contains a pure-Python MySQL client library. The goal of PyMySQL

View File

@@ -107,7 +107,7 @@ DEFAULT_CHARSET = 'latin1'
MAX_PACKET_LEN = 2**24-1 MAX_PACKET_LEN = 2**24-1
def dump_packet(data): def dump_packet(data): # pragma: no cover
def is_ascii(data): def is_ascii(data):
if 65 <= byte2int(data) <= 122: if 65 <= byte2int(data) <= 122:
if isinstance(data, int): if isinstance(data, int):

View File

@@ -2,5 +2,6 @@
envlist = py26,py27,py33,py34,pypy,pypy3 envlist = py26,py27,py33,py34,pypy,pypy3
[testenv] [testenv]
commands = ./runtests.py commands = coverage run ./runtests.py
deps = unittest2 deps = unittest2
coverage