Skip to content

Commit

Permalink
Remove support for python 2
Browse files Browse the repository at this point in the history
  • Loading branch information
juga0 committed Feb 18, 2018
1 parent bf32096 commit 23cdeee
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 7 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ env:
- 'PYTHON_LIBS="-L$(python-config --prefix)/lib $(python-config --libs)"'
- PY_ENABLE_SHARD=0
- TOX_ENV=lint
- TOX_ENV=py27,stats
- TOX_ENV=py35,stats
- TOX_ENV=doc

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ VERSION = $(shell sh version.sh)
DESTDIR =

THISFILE = $(lastword $(MAKEFILE_LIST))
PYTHON = python
PYTHON = python3

# GNU command variables
# see http://www.gnu.org/prep/standards/html_node/Command-Variables.html
Expand Down
2 changes: 1 addition & 1 deletion dhcpcanon/dhcpcanon.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# vim:ts=4:sw=4:expandtab 2
# Copyright 2016, 2017 juga (juga at riseup dot net), MIT license.
Expand Down
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ def systemd_tmpfiles_dir():
"lockfile>=0.12",
"pip>=8.1",
"pyroute2>=0.3",
'scapy>=2.2";python_version<="2.7"',
'scapy-python3>=0.20;python_version>="3.4"',
'scapy-python3>=0.20',
],
python_requires=">=3.5",
extras_require={
'dev': ['ipython', 'pyflakes', 'pep8'],
'test': ['coverage', 'coveralls', 'codecov', 'tox', 'pytest'],
Expand All @@ -90,7 +90,6 @@ def systemd_tmpfiles_dir():
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 3',
'Topic :: System :: Networking',
],
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = clean, lint, py27, py35, stats
envlist = clean, lint, py35, stats
#doc{py27,py35}-{pinned,unpinned}, stats

[testenv:clean]
Expand Down

0 comments on commit 23cdeee

Please sign in to comment.