From a34d789c5a7fc7fba391be8024df0b160e5b2ec5 Mon Sep 17 00:00:00 2001 From: FilipZZZ Date: Wed, 7 Sep 2022 15:14:37 +0200 Subject: [PATCH 1/7] Fix flake8 error --- nixnet/_utils.py | 2 +- nixnet/system/_collection.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nixnet/_utils.py b/nixnet/_utils.py index 4ac0769..646d36e 100644 --- a/nixnet/_utils.py +++ b/nixnet/_utils.py @@ -3,7 +3,7 @@ from __future__ import print_function try: - from collections.abc import Iterable # python 3.3+ + from collections.abc import Iterable # python 3.3+ except ImportError: from collections import Iterable # python 2.7 import typing # NOQA: F401 diff --git a/nixnet/system/_collection.py b/nixnet/system/_collection.py index adb650b..4090b27 100644 --- a/nixnet/system/_collection.py +++ b/nixnet/system/_collection.py @@ -3,9 +3,11 @@ from __future__ import print_function try: - from collections.abc import Iterable, Sized # python 3.3+ + from collections.abc import Iterable # python 3.3+ + from collections.abc import Sized # python 3.3+ except ImportError: - from collections import Iterable, Sized # python 2.7 + from collections import Iterable # python 2.7 + from collections import Sized # python 2.7 import typing # NOQA: F401 from nixnet import _cprops From c68b75941c0cfd955f2f036b0032be82c0ed8fff Mon Sep 17 00:00:00 2001 From: FilipZZZ Date: Wed, 7 Sep 2022 15:41:36 +0200 Subject: [PATCH 2/7] Fixing CI failure --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9ee78ff..2ea0ef3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,11 +10,13 @@ python: - 3.7 - 3.8 - 3.9 + - 3.10 - pypy2.7-6.0 - pypy3.5-6.0 install: - python -m pip install --upgrade pip + - pip install --upgrade 'importlib-metadata > 4' - pip install --upgrade setuptools - pip install -U tox-travis - pip install -U coveralls From e2ebf4ad25360b88d7fcbad409ce6e842b5ca775 Mon Sep 17 00:00:00 2001 From: FilipZZZ Date: Wed, 7 Sep 2022 16:15:09 +0200 Subject: [PATCH 3/7] Fixing CI error --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2ea0ef3..b3ef81e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ python: install: - python -m pip install --upgrade pip - - pip install --upgrade 'importlib-metadata > 4' + - pip install -U importlib-metadata - pip install --upgrade setuptools - pip install -U tox-travis - pip install -U coveralls From 4f0ea396ae1f6633007a8a71ff8bf12ef75f9bc4 Mon Sep 17 00:00:00 2001 From: FilipZZZ Date: Wed, 7 Sep 2022 16:21:04 +0200 Subject: [PATCH 4/7] Fixing CI errors --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b3ef81e..f8f6cf6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ python: - 3.7 - 3.8 - 3.9 - - 3.10 + - "3.10" - pypy2.7-6.0 - pypy3.5-6.0 From 756d3cac327c8e2b3397a1aac04b3f54dcf11d9d Mon Sep 17 00:00:00 2001 From: FilipZZZ Date: Wed, 7 Sep 2022 16:25:40 +0200 Subject: [PATCH 5/7] Fixing CI error --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f8f6cf6..ec6bc7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ python: - 3.7 - 3.8 - 3.9 - - "3.10" + - "3.10.2" - pypy2.7-6.0 - pypy3.5-6.0 From f4295b815e3f9b7139b830dc7f79b63dec7988c9 Mon Sep 17 00:00:00 2001 From: FilipZZZ Date: Wed, 7 Sep 2022 16:29:10 +0200 Subject: [PATCH 6/7] Fix CI error --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ec6bc7d..7b2128f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,6 @@ python: - 3.7 - 3.8 - 3.9 - - "3.10.2" - pypy2.7-6.0 - pypy3.5-6.0 From c7ec0d4f300361413ee93b4cb7e63943298689ad Mon Sep 17 00:00:00 2001 From: FilipZZZ Date: Wed, 7 Sep 2022 16:33:03 +0200 Subject: [PATCH 7/7] Fix CI error squashed --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 9ee78ff..7b2128f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ python: install: - python -m pip install --upgrade pip + - pip install -U importlib-metadata - pip install --upgrade setuptools - pip install -U tox-travis - pip install -U coveralls