diff --git a/.travis.yml b/.travis.yml index c5e883c0..4dfd669b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,8 @@ matrix: env: TOXENV=py36 - python: "3.7" env: TOXENV=py37,coveralls,docs + - python: "3.8" + env: TOXENV=py38 - python: "pypy3.5" env: TOXENV=pypy before_install: @@ -28,4 +30,3 @@ notifications: email: on_success: never on_failure: always - diff --git a/AUTHORS b/AUTHORS index 15503a08..10432aa1 100644 --- a/AUTHORS +++ b/AUTHORS @@ -60,8 +60,8 @@ Tim Yardley DHCP definitions obormot - pcapng module, Packet repr improvements - + pcapng module, Ethernet, core improvements + Kyle Keppler Python 3 port diff --git a/dpkt/__init__.py b/dpkt/__init__.py index 5e3c1958..0610b127 100644 --- a/dpkt/__init__.py +++ b/dpkt/__init__.py @@ -7,7 +7,7 @@ __author_email__ = 'dugsong@monkey.org' __license__ = 'BSD-3-Clause' __url__ = 'https://github.com/kbandla/dpkt' -__version__ = '1.9.2' +__version__ = '1.9.3' diff --git a/setup.py b/setup.py index 24eb8ab9..fc736db5 100755 --- a/setup.py +++ b/setup.py @@ -1,10 +1,9 @@ -import os import sys try: - from setuptools import setup, Command + from setuptools import setup except ImportError: - from distutils.core import setup, Command + from distutils.core import setup package_name = 'dpkt' description = 'fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols' @@ -42,6 +41,7 @@ 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', ] diff --git a/tox.ini b/tox.ini index d59caa45..7d538a7c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,13 +1,12 @@ [tox] -envlist = py27, py35, py36, py37, docs +envlist = py27, py35, py36, py37, py38, docs [testenv] install_command = pip install {opts} {packages} -# FIXME: remove version pinning when py26 support is no longer needed deps = - setuptools==36.8.0 - wheel==0.29 + setuptools + wheel pytest==3.2.5 coverage pytest-cov==2.5.1