From 30fd9746d11f48b6e15041dd150b180423903ee4 Mon Sep 17 00:00:00 2001 From: hugovk Date: Thu, 12 Oct 2017 08:26:30 +0300 Subject: [PATCH 1/3] Ignore .cache --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 70f5746e..800f1c22 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ msgpack/*.cpp /venv /tags /docs/_build +.cache From 10403c7c01abb3de160b000b5041e1d345c061ca Mon Sep 17 00:00:00 2001 From: hugovk Date: Thu, 12 Oct 2017 08:27:18 +0300 Subject: [PATCH 2/3] Remove Python 2.6 test code --- test/test_pack.py | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/test/test_pack.py b/test/test_pack.py index a704fdbc..ac931038 100644 --- a/test/test_pack.py +++ b/test/test_pack.py @@ -7,6 +7,7 @@ from msgpack import packb, unpackb, Unpacker, Packer +from collections import OrderedDict from io import BytesIO def check(data, use_list=False): @@ -136,24 +137,9 @@ def testMapSize(sizes=[0, 5, 50, 1000]): assert unpacker.unpack() == dict((i, i * 2) for i in range(size)) -class odict(dict): - """Reimplement OrderedDict to run test on Python 2.6""" - def __init__(self, seq): - self._seq = seq - dict.__init__(self, seq) - - def items(self): - return self._seq[:] - - def iteritems(self): - return iter(self._seq) - - def keys(self): - return [x[0] for x in self._seq] - def test_odict(): seq = [(b'one', 1), (b'two', 2), (b'three', 3), (b'four', 4)] - od = odict(seq) + od = OrderedDict(seq) assert unpackb(packb(od), use_list=1) == dict(seq) def pair_hook(seq): return list(seq) From 0506e1d0aa5151171c0ba017fb759a6a260fbed4 Mon Sep 17 00:00:00 2001 From: hugovk Date: Thu, 12 Oct 2017 08:30:14 +0300 Subject: [PATCH 3/3] Remove restriction to allow test of feature branches --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0170360e..f5141d60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,10 +10,6 @@ python: - "3.6" - "3.7-dev" -branches: - only: - - master - matrix: include: - sudo: required