Skip to content

Commit

Permalink
Merge pull request #471 from kbandla/fix-#453
Browse files Browse the repository at this point in the history
release 1.9.3 (#453)
  • Loading branch information
brifordwylie authored Jul 15, 2020
2 parents bc0fc98 + a1e2ac0 commit 3671da1
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -28,4 +30,3 @@ notifications:
email:
on_success: never
on_failure: always

4 changes: 2 additions & 2 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ Tim Yardley <[email protected]>
DHCP definitions

obormot <[email protected]>
pcapng module, Packet repr improvements
pcapng module, Ethernet, core improvements

Kyle Keppler <[email protected]>
Python 3 port

Expand Down
2 changes: 1 addition & 1 deletion dpkt/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
__author_email__ = '[email protected]'
__license__ = 'BSD-3-Clause'
__url__ = 'https://github.com/kbandla/dpkt'
__version__ = '1.9.2'
__version__ = '1.9.3'



Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -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'
Expand Down Expand Up @@ -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',
]
Expand Down
7 changes: 3 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 3671da1

Please sign in to comment.