summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorINADA Naoki <songofacandy@gmail.com>2014-02-15 22:03:38 +0900
committerINADA Naoki <songofacandy@gmail.com>2014-02-15 22:03:38 +0900
commit96d7d0edc6f70ab044b5ba6674f5ea992ef50c4d (patch)
treeb1ba8c499087a32ec6bc5d22fa0633e6722cac1f
parent400a1030cd69022663be5057d4cd7bd63806754d (diff)
parent213f7888c3edbe828533ec08e7a07bac3a98b482 (diff)
downloadmsgpack-python-96d7d0edc6f70ab044b5ba6674f5ea992ef50c4d.tar.gz
Merge pull request #89 from msgpack/better-travis
travis: Simplify .travis.yml and add PyPy env.
-rw-r--r--.travis.yml10
-rw-r--r--test/test_pack.py1
-rw-r--r--tox.ini2
3 files changed, 3 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml
index e536fdc..7cf7f58 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,14 +2,8 @@ language: python
python:
- 2.7
-env:
- - PIP_USE_MIRRORS=true
-
install:
- - sudo apt-get update -qq
- - sudo apt-get install -q python3.3-dev
- - pip install --use-mirrors tox cython
- - cython --cplus msgpack/_packer.pyx
- - cython --cplus msgpack/_unpacker.pyx
+ - pip install tox cython
+ - cython --cplus msgpack/_packer.pyx msgpack/_unpacker.pyx
script: "tox && MSGPACK_PUREPYTHON=x tox"
diff --git a/test/test_pack.py b/test/test_pack.py
index 9dc5ada..0d3ed6d 100644
--- a/test/test_pack.py
+++ b/test/test_pack.py
@@ -12,7 +12,6 @@ from io import BytesIO
def check(data, use_list=False):
re = unpackb(packb(data), use_list=use_list)
assert re == data
- assert type(re) == type(data)
def testPack():
test_data = [
diff --git a/tox.ini b/tox.ini
index 1951352..2c5c596 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py26,py27,py32,py33
+envlist = py26,py27,py32,py33,pypy
[testenv]
deps=