Skip to content

Commit

Permalink
Merge pull request #144 from aio-libs/3.6
Browse files Browse the repository at this point in the history
support 3.6 and drop 3.4
  • Loading branch information
JelleZijlstra committed Jul 6, 2018
2 parents 9be792e + 93aeb45 commit 3ae6d52
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 20 deletions.
9 changes: 3 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
language: python

python:
- "3.4"
- "3.5"
- "3.6"

before_install:
- sudo apt-get update -qq
- sudo apt-get install -qq libzmq3-dev

install:
- pip install pip setuptools wheel
- pip install --upgrade pip setuptools wheel
- python setup.py install
- test $USE_MSGPACK == 1 && pip install msgpack-python || true
- pip install pyflakes
- pip install pycodestyle
- pip install docutils
- pip install codecov
- pip install pyflakes pycodestyle docutils codecov

script:
- python -c "import zmq; print('ZMQ version:', zmq.zmq_version())"
Expand Down
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ asyncio integration with ZeroMQ

asyncio (PEP 3156) support for ZeroMQ.

.. image:: https://travis-ci.org/aio-libs/aiozmq.svg?branch=master
:target: https://travis-ci.org/aio-libs/aiozmq
.. image:: https://travis-ci.com/aio-libs/aiozmq.svg?branch=master
:target: https://travis-ci.com/aio-libs/aiozmq

The difference between ``aiozmq`` and vanilla ``pyzmq`` (``zmq.asyncio``).

Expand Down Expand Up @@ -105,7 +105,7 @@ For details see https://github.com/zeromq/pyzmq/issues/894
Requirements
------------

* Python_ 3.4+
* Python_ 3.5+
* pyzmq_ 13.1+
* optional submodule ``aiozmq.rpc`` requires msgpack-python_ 0.4+

Expand Down
16 changes: 5 additions & 11 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,15 @@

install_requires = ['pyzmq>=13.1']

PY_VER = sys.version_info

if PY_VER >= (3, 4):
pass
elif PY_VER >= (3, 3):
install_requires.append('asyncio')
else:
raise RuntimeError("aiozmq doesn't support Python earlier than 3.3")

tests_require = install_requires + ['msgpack>=0.5.0']

extras_require = {'rpc': ['msgpack>=0.5.0']}


if sys.version_info < (3, 5):
raise RuntimeError("aiozmq requires Python 3.5 or higher")


def read(f):
return open(os.path.join(os.path.dirname(__file__), f)).read().strip()

Expand All @@ -40,9 +35,8 @@ def read_version():
'License :: OSI Approved :: BSD License',
'Intended Audience :: Developers',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Operating System :: POSIX',
'Operating System :: MacOS :: MacOS X',
'Operating System :: Microsoft :: Windows',
Expand Down

0 comments on commit 3ae6d52

Please sign in to comment.