From e906502120219b2d147bddada286e3b061a97feb Mon Sep 17 00:00:00 2001 From: chillipeper Date: Wed, 30 Jan 2019 13:20:19 +0000 Subject: [PATCH 01/12] Fix tox.ini. Add py35, py36, py37 envlist --- tox.ini | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index 8998c475..80e15c24 100644 --- a/tox.ini +++ b/tox.ini @@ -1,15 +1,16 @@ [tox] -envlist = py27, 35, flake8 +envlist = py27, py35, py36, py37, flake8 [testenv] -commands = - python setup.py test deps = flake8 sleekxmpp==1.3.2 -rrequirements.txt +commands = + python setup.py test [testenv:flake8] +basepython = python3 commands = - flake8 \ No newline at end of file + flake8 From acfeb2a71726c1a71ea5a5c94f6f0b4d1785a662 Mon Sep 17 00:00:00 2001 From: chillipeper Date: Wed, 30 Jan 2019 13:35:45 +0000 Subject: [PATCH 02/12] Bump versions of PyYAML and requests to support py37 --- will/requirements/base.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/will/requirements/base.txt b/will/requirements/base.txt index 04a51091..e1bc2420 100644 --- a/will/requirements/base.txt +++ b/will/requirements/base.txt @@ -19,10 +19,10 @@ pyasn1==0.1.7 pycrypto==2.6.1 pygerduty==0.28 pytz==2017.2 -PyYAML==3.10 +PyYAML==3.13 regex==2017.9.23 redis==2.10.6 -requests==2.18.4 +requests==2.20.0 six==1.10.0 urllib3[secure] -websocket-client==0.44.0 \ No newline at end of file +websocket-client==0.44.0 From 80ada85211f761913fc5f4ebc3e9f433581faa44 Mon Sep 17 00:00:00 2001 From: chillipeper Date: Wed, 30 Jan 2019 13:50:39 +0000 Subject: [PATCH 03/12] Fix flake8 L288:25: E117 over-indented --- will/backends/io_adapters/hipchat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/will/backends/io_adapters/hipchat.py b/will/backends/io_adapters/hipchat.py index 0bea6544..c9c52cb2 100644 --- a/will/backends/io_adapters/hipchat.py +++ b/will/backends/io_adapters/hipchat.py @@ -285,7 +285,7 @@ def start_xmpp_client(self, xmpp_bridge_queue=None, backend_name=""): else: for name, r in self.available_rooms.items(): if not hasattr(self, "default_room"): - self.default_room = r + self.default_room = r self.rooms.append(r) self.nick = settings.HIPCHAT_HANDLE From 296923d251e11bb78804a48ddf988feb80ed9345 Mon Sep 17 00:00:00 2001 From: chillipeper Date: Wed, 30 Jan 2019 13:51:19 +0000 Subject: [PATCH 04/12] Fix flake8 39:5: F821 undefined name 'reload' and 565:17: E117 over-indented --- will/main.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/will/main.py b/will/main.py index 8f9506cc..c42b1b45 100644 --- a/will/main.py +++ b/will/main.py @@ -36,7 +36,7 @@ # Force UTF8 if sys.version_info < (3, 0): - reload(sys) # flake8: noqa + reload(sys) # noqa sys.setdefaultencoding('utf8') else: raw_input = input @@ -562,9 +562,9 @@ def handle_sys_exit(self, *args, **kwargs): # or # ("hipchat" in settings.CHAT_BACKENDS and xmpp_thread and xmpp_thread.is_alive()) ): - sys.stdout.write(".") - sys.stdout.flush() - time.sleep(0.5) + sys.stdout.write(".") + sys.stdout.flush() + time.sleep(0.5) print(". done.\n") sys.exit(1) From 6916822780db4ddf1d725ecdddc01a69b6be9876 Mon Sep 17 00:00:00 2001 From: chillipeper Date: Wed, 30 Jan 2019 13:52:12 +0000 Subject: [PATCH 05/12] Fix flake8 L102:9: E117 over-indented --- will/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/will/utils.py b/will/utils.py index 04136a4d..6fbbcb85 100644 --- a/will/utils.py +++ b/will/utils.py @@ -99,7 +99,7 @@ def note(warn_string): def print_head(): - puts(r""" + puts(r""" ___/-\___ ___|_________|___ | | From 350c61c998002fc1ceb7175f82eead18daf2e69d Mon Sep 17 00:00:00 2001 From: chillipeper Date: Wed, 30 Jan 2019 14:10:10 +0000 Subject: [PATCH 06/12] Add py versions to travis.yml --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index d1f7eb3e..fa34586b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,9 @@ language: python +python: + - "2.7" + - "3.5" + - "3.6" + - "3.7" sudo: false services: - docker From 2d5551eaee0b0dde96fc2d82a006abc25a4cf596 Mon Sep 17 00:00:00 2001 From: chillipeper Date: Wed, 30 Jan 2019 14:29:39 +0000 Subject: [PATCH 07/12] Add tox-travis --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fa34586b..0d834ff5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ python: - "2.7" - "3.5" - "3.6" - - "3.7" sudo: false services: - docker @@ -11,7 +10,7 @@ before_install: - sudo apt-get update - sudo apt-get install -y libffi-dev libxml2-dev install: -- pip install -U tox +- pip install tox-travis - pip install -r will/requirements/dev.txt script: - tox From e4e98f7676b83ea4204396d3c4464de22b294ba4 Mon Sep 17 00:00:00 2001 From: chillipeper Date: Wed, 30 Jan 2019 14:35:50 +0000 Subject: [PATCH 08/12] Add python 3.7 to travis --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0d834ff5..06e68ac3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,9 @@ python: - "2.7" - "3.5" - "3.6" +dist: xenial +language: python +python: 3.7 sudo: false services: - docker From 13c3a8ff3b397e57dc24a232eb7634e4d1a3882f Mon Sep 17 00:00:00 2001 From: chillipeper Date: Wed, 30 Jan 2019 14:46:46 +0000 Subject: [PATCH 09/12] Adding all xenial 2.7, 3.5, 3.6, 3.7 python versions to travis.yml --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 06e68ac3..98996378 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,10 @@ +dist: xenial language: python python: - "2.7" - "3.5" - "3.6" -dist: xenial -language: python -python: 3.7 + - "3.7" sudo: false services: - docker From d72874bc68622cae10daf87275ab21771f4232cf Mon Sep 17 00:00:00 2001 From: chillipeper Date: Wed, 30 Jan 2019 15:39:58 +0000 Subject: [PATCH 10/12] Add 3.4 support --- .travis.yml | 1 + tox.ini | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 98996378..96e361fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ dist: xenial language: python python: - "2.7" + - "3.4" - "3.5" - "3.6" - "3.7" diff --git a/tox.ini b/tox.ini index 80e15c24..695ff7d6 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27, py35, py36, py37, flake8 +envlist = py27, py34, py35, py36, py37, flake8 [testenv] From 6a8956dc65c83aa1e93af76641b70d94486504d4 Mon Sep 17 00:00:00 2001 From: chillipeper Date: Wed, 30 Jan 2019 16:03:39 +0000 Subject: [PATCH 11/12] remove python3 from flake8 testenv --- tox.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/tox.ini b/tox.ini index 695ff7d6..86984e96 100644 --- a/tox.ini +++ b/tox.ini @@ -11,6 +11,5 @@ commands = python setup.py test [testenv:flake8] -basepython = python3 commands = flake8 From 58ee05c919ec80759ee661386ad68aeb3c987658 Mon Sep 17 00:00:00 2001 From: chillipeper Date: Wed, 30 Jan 2019 16:18:55 +0000 Subject: [PATCH 12/12] Add flake8 command to testenv and remove flake8 from envlist --- tox.ini | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index 86984e96..582d6121 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27, py34, py35, py36, py37, flake8 +envlist = py27, py34, py35, py36, py37 [testenv] @@ -9,7 +9,4 @@ deps = -rrequirements.txt commands = python setup.py test - -[testenv:flake8] -commands = flake8