diff --git a/.travis.yml b/.travis.yml index 2ab11056..32cf59a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: python python: - - 2.6 - 2.7 - pypy-5.3.1 - 3.5 diff --git a/setup.py b/setup.py index 0a0385cf..c5706b2e 100644 --- a/setup.py +++ b/setup.py @@ -53,8 +53,8 @@ def run_tests(self): url='https://github.com/cablehead/python-consul', license='MIT', description=description, - long_description=open('README.rst').read() + '\n\n' + - open('CHANGELOG.rst').read(), + long_description=open('README.rst') + .read() + '\n\n' + open('CHANGELOG.rst').read(), py_modules=py_modules, install_requires=requirements, extras_require={ diff --git a/tests/conftest.py b/tests/conftest.py index bb77449b..e28a3f10 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -68,6 +68,8 @@ def start_consul_instance(acl_master_token=None): (system, node, release, version, machine, processor) = platform.uname() if system == 'Darwin': postfix = 'osx' + elif machine == 'aarch64': + postfix = 'aarch64' else: postfix = 'linux64' bin = os.path.join(os.path.dirname(__file__), 'consul.'+postfix) diff --git a/tests/consul.aarch64 b/tests/consul.aarch64 new file mode 100755 index 00000000..77c5e518 Binary files /dev/null and b/tests/consul.aarch64 differ diff --git a/tests/test_aio.py b/tests/test_aio.py index b251231f..43bb66e7 100644 --- a/tests/test_aio.py +++ b/tests/test_aio.py @@ -74,7 +74,8 @@ def test_kv_missing(self, loop, consul_port): @asyncio.coroutine def main(): - fut = asyncio.async(put(), loop=loop) + x = getattr(asyncio, 'async') + fut = x(put(), loop=loop) yield from c.kv.put('index', 'bump') index, data = yield from c.kv.get('foo') assert data is None @@ -133,7 +134,8 @@ def test_kv_subscribe(self, loop, consul_port): @asyncio.coroutine def get(): - fut = asyncio.async(put(), loop=loop) + x = getattr(asyncio, 'async') + fut = x(put(), loop=loop) index, data = yield from c.kv.get('foo') assert data is None index, data = yield from c.kv.get('foo', index=index) @@ -197,7 +199,8 @@ def test_catalog(self, loop, consul_port): @asyncio.coroutine def nodes(): - fut = asyncio.async(register(), loop=loop) + x = getattr(asyncio, 'async') + fut = x(register(), loop=loop) index, nodes = yield from c.catalog.nodes() assert len(nodes) == 1 current = nodes[0] @@ -228,7 +231,8 @@ def test_session(self, loop, consul_port): @asyncio.coroutine def monitor(): - fut = asyncio.async(register(), loop=loop) + x = getattr(asyncio, 'async') + fut = x(register(), loop=loop) index, services = yield from c.session.list() assert services == [] yield from asyncio.sleep(20/1000.0, loop=loop) diff --git a/tox.ini b/tox.ini index 4df9a5fc..587e56d6 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = flake8, py26, py27, pypy, py35, py36 +envlist = flake8, py27, pypy, py35, py36 [flake8] ignore = F811,E226 @@ -17,13 +17,6 @@ deps = commands = py.test --reruns=3 {posargs:consul tests} -[testenv:py26] -deps = - pytest - pytest-rerunfailures -commands = - py.test --reruns=3 {posargs:consul tests} - [testenv:py35] deps = pytest