summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml38
-rwxr-xr-xdocker/runtests.sh14
-rw-r--r--msgpack/_packer.pyx4
3 files changed, 43 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml
index e7e9b63..b4396cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,39 @@
sudo: false
+language: python
+python: 3.5
cache:
directories:
- $HOME/.cache/pip
-language: python
-python:
- - 3.5
branches:
- only:
- - master
+ only:
+ - master
env:
- - TOXENV=py27-c,py33-c,py34-c,py35-c
- - TOXENV=py27-pure,py33-pure,py34-pure,py35-pure
- - TOXENV=pypy-pure,pypy3-pure
+ - TOXENV=py27-c,py33-c,py34-c,py35-c
+ - TOXENV=py27-pure,py33-pure,py34-pure,py35-pure
+ - TOXENV=pypy-pure,pypy3-pure
+
+matrix:
+ include:
+ - sudo: required
+ services:
+ - docker
+ env:
+ - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
+ install:
+ - pip install -U pip
+ - pip install cython
+ - cython --cplus msgpack/_packer.pyx msgpack/_unpacker.pyx
+ - docker pull $DOCKER_IMAGE
+ script:
+ - docker run --rm -v `pwd`:/io -w /io $DOCKER_IMAGE /io/docker/runtests.sh
install:
- - pip install -U pip
- - pip install tox cython
- - cython --cplus msgpack/_packer.pyx msgpack/_unpacker.pyx
+ - pip install -U pip
+ - pip install tox cython
+ - cython --cplus msgpack/_packer.pyx msgpack/_unpacker.pyx
script: tox
+
+# vim: sw=2 ts=2
diff --git a/docker/runtests.sh b/docker/runtests.sh
new file mode 100755
index 0000000..0d74802
--- /dev/null
+++ b/docker/runtests.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -e -x
+
+for V in cp35-cp35m cp34-cp34m cp27-cp27m cp27-cp27mu; do
+ PYBIN=/opt/python/$V/bin
+ $PYBIN/python setup.py install
+ rm -rf build/ # Avoid lib build by narrow Python is used by wide python
+ $PYBIN/pip install pytest
+ pushd test # prevent importing msgpack package in current directory.
+ $PYBIN/python -c 'import sys; print(hex(sys.maxsize))'
+ $PYBIN/python -c 'from msgpack import _packer, _unpacker'
+ $PYBIN/py.test -v
+ popd
+done
diff --git a/msgpack/_packer.pyx b/msgpack/_packer.pyx
index e07b194..3981f20 100644
--- a/msgpack/_packer.pyx
+++ b/msgpack/_packer.pyx
@@ -272,7 +272,7 @@ cdef class Packer(object):
msgpack_pack_ext(&self.pk, typecode, len(data))
msgpack_pack_raw_body(&self.pk, data, len(data))
- def pack_array_header(self, size_t size):
+ def pack_array_header(self, long long size):
if size > ITEM_LIMIT:
raise PackValueError
cdef int ret = msgpack_pack_array(&self.pk, size)
@@ -285,7 +285,7 @@ cdef class Packer(object):
self.pk.length = 0
return buf
- def pack_map_header(self, size_t size):
+ def pack_map_header(self, long long size):
if size > ITEM_LIMIT:
raise PackValueError
cdef int ret = msgpack_pack_map(&self.pk, size)