From 8d8c140a1d7863388c04180c893fce8c8d082297 Mon Sep 17 00:00:00 2001 From: cclauss Date: Thu, 6 Dec 2018 05:06:00 +0100 Subject: [PATCH 1/5] Travis CI: Add Python 3.6 and 3.7 to the testing --- .travis.yml | 4 ++++ tox.ini | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 70c1d3c..23adb1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,11 +3,15 @@ python: - "2.7" - "3.4" - "3.5" + - "3.6" - "pypy" - "pypy3" sudo: false matrix: fast_finish: true + include: + - python: "3.7" + dist: xenial # required for Python >= 3.7 (travis-ci/travis-ci#9069) install: - pip install wheel tox-travis diff --git a/tox.ini b/tox.ini index a99d698..f11b876 100644 --- a/tox.ini +++ b/tox.ini @@ -4,5 +4,5 @@ envlist = py27, py34, py35, pypy, pypy3 [testenv] deps = -r{toxinidir}/tests/requirements.txt commands = - flake8 + flake8 --ignore=E741,W605 nosetests From 5a0ebd9afd659cc1c8f06d241fcd80cd138164bc Mon Sep 17 00:00:00 2001 From: cclauss Date: Thu, 6 Dec 2018 08:48:14 +0100 Subject: [PATCH 2/5] Placate flake8 --- iptools/__init__.py | 2 +- iptools/ipv6.py | 8 ++++---- tox.ini | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/iptools/__init__.py b/iptools/__init__.py index 8d21ce9..dd0fd67 100644 --- a/iptools/__init__.py +++ b/iptools/__init__.py @@ -399,7 +399,7 @@ def __iter__(self): class IpRangeList (object): - """ + r""" List of IpRange objects. Converts a list of ip address and/or CIDR addresses into a list of IpRange diff --git a/iptools/ipv6.py b/iptools/ipv6.py index 9e4c696..073a427 100644 --- a/iptools/ipv6.py +++ b/iptools/ipv6.py @@ -412,12 +412,12 @@ def rfc19242long(s): return None if _RFC1924_REV is None: _RFC1924_REV = {v: k for k, v in enumerate(_RFC1924_ALPHABET)} - l = 0 + x = 0 for c in s: - l = l * 85 + _RFC1924_REV[c] - if l > MAX_IP: + x = x * 85 + _RFC1924_REV[c] + if x > MAX_IP: return None - return l + return x def validate_cidr(s): diff --git a/tox.ini b/tox.ini index f11b876..a99d698 100644 --- a/tox.ini +++ b/tox.ini @@ -4,5 +4,5 @@ envlist = py27, py34, py35, pypy, pypy3 [testenv] deps = -r{toxinidir}/tests/requirements.txt commands = - flake8 --ignore=E741,W605 + flake8 nosetests From b4398244355d46dae161a791102ed4a0f48e0d83 Mon Sep 17 00:00:00 2001 From: cclauss Date: Tue, 11 Dec 2018 04:09:20 +0100 Subject: [PATCH 3/5] tox.ini: Add py36, py37 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index a99d698..4189f95 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27, py34, py35, pypy, pypy3 +envlist = py27, py34, py35, py36, py37, pypy, pypy3 [testenv] deps = -r{toxinidir}/tests/requirements.txt From 5d3fae0056297540355bb7c6c112703cfaa4b6ce Mon Sep 17 00:00:00 2001 From: Bryan Davis Date: Sun, 6 Jan 2019 21:50:08 -0700 Subject: [PATCH 4/5] Prep for 0.7.0 release --- .gitignore | 1 + iptools/__init__.py | 2 +- setup.py | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b11bdd6..33baecb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *.egg-info *.pyc /.coverage +/.python-version /.tox/ /.venv/ /build/ diff --git a/iptools/__init__.py b/iptools/__init__.py index dd0fd67..3a966f7 100644 --- a/iptools/__init__.py +++ b/iptools/__init__.py @@ -47,7 +47,7 @@ def next(iterable): from . import ipv4 from . import ipv6 -__version__ = '0.7.0-dev' +__version__ = '0.7.0' __all__ = ( 'IpRange', diff --git a/setup.py b/setup.py index 996ba0c..a09de1c 100644 --- a/setup.py +++ b/setup.py @@ -32,11 +32,11 @@ 'License :: OSI Approved :: BSD License', 'Operating System :: OS Independent', 'Programming Language :: Python', - 'Programming Language :: Python :: 2.5', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.2', - 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', 'Topic :: Utilities', 'Topic :: Internet', ], From e1cf5b12bc2e305b0525757baed3e2be6f6cbb92 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Thu, 23 Jan 2020 00:37:14 +0100 Subject: [PATCH 5/5] Travis CI: Python 2.7, 3.5, 3.6, 3.7, 3.8 (#24) * Travis CI: Python 2.7, 3.5, 3.6, 3.7, 3.8 * tox.ini: Drop py34 and Add py38 * Setup.py: Drop Py34 and Add Py38 * README.md: Python 2.7, 3.5, 3.6, 3.7, 3.8, pypy, and pypy3 Implementation by @cclauss --- .travis.yml | 9 ++------- README.md | 4 ++-- setup.py | 2 +- tox.ini | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 23adb1b..6a3e3ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,12 @@ language: python python: - "2.7" - - "3.4" - "3.5" - "3.6" + - "3.7" + - "3.8" - "pypy" - "pypy3" -sudo: false -matrix: - fast_finish: true - include: - - python: "3.7" - dist: xenial # required for Python >= 3.7 (travis-ci/travis-ci#9069) install: - pip install wheel tox-travis diff --git a/README.md b/README.md index 8ce94c8..3b3b4c4 100644 --- a/README.md +++ b/README.md @@ -64,8 +64,8 @@ Local documentation can be built using [Sphinx][]: Python Version Compatibility ---------------------------- -[Travis CI][ci-home] automatically runs tests against python 2.7, 3.4, 3.5, -pypy, and pypy3, +[Travis CI][ci-home] automatically runs tests against Python 2.7, 3.5, 3.6, +3.7, 3.8, pypy, and pypy3. Installation ------------ diff --git a/setup.py b/setup.py index a09de1c..551a951 100644 --- a/setup.py +++ b/setup.py @@ -33,10 +33,10 @@ 'Operating System :: OS Independent', 'Programming Language :: Python', 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', 'Topic :: Utilities', 'Topic :: Internet', ], diff --git a/tox.ini b/tox.ini index 4189f95..446681b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27, py34, py35, py36, py37, pypy, pypy3 +envlist = py27, py35, py36, py37, py38, pypy, pypy3 [testenv] deps = -r{toxinidir}/tests/requirements.txt