From 84ce60bc50a6d3123d9a944e0098660e31d32bf9 Mon Sep 17 00:00:00 2001 From: Hemna Date: Mon, 30 Aug 2021 12:18:14 -0400 Subject: [PATCH] Cleaned up some pep8 failures --- aprsd/client.py | 4 ---- aprsd/flask.py | 3 +-- aprsd/main.py | 4 ++-- aprsd/messaging.py | 1 - dev-requirements.in | 4 ++-- dev-requirements.txt | 41 ++++++++++++++++++++++++++++++----------- requirements.txt | 16 +++++++--------- 7 files changed, 42 insertions(+), 31 deletions(-) diff --git a/aprsd/client.py b/aprsd/client.py index 8993d92..dd1e248 100644 --- a/aprsd/client.py +++ b/aprsd/client.py @@ -124,10 +124,8 @@ class Aprsdis(aprslib.IS): ) if not readable: if not blocking: - #self.logger.warning("not fucking readable, not blocking, break!") break else: - #self.logger.warning("not fucking readable, continue") continue try: @@ -275,9 +273,7 @@ class Aprsdis(aprslib.IS): raise if not blocking: - #self.logger.error("Not blocking, bail bitch") break - #self.logger.error("Consumer exiting") def get_client(): diff --git a/aprsd/flask.py b/aprsd/flask.py index d5aa05f..413f36c 100644 --- a/aprsd/flask.py +++ b/aprsd/flask.py @@ -25,6 +25,7 @@ LOG = logging.getLogger("APRSD") auth = HTTPBasicAuth() users = None + class SentMessages: _instance = None lock = None @@ -47,7 +48,6 @@ class SentMessages: self.msgs[msg.id]["message"] = msg.message.rstrip("\n") self.msgs[msg.id]["raw"] = str(msg).rstrip("\n") - def _create(self, id): return { "id": id, @@ -485,7 +485,6 @@ class SendMessageNamespace(Namespace): LOG.debug(f"WS json {data}") - def setup_logging(config, flask_app, loglevel, quiet): flask_log = logging.getLogger("werkzeug") diff --git a/aprsd/main.py b/aprsd/main.py index 8c1fa78..30b2d84 100644 --- a/aprsd/main.py +++ b/aprsd/main.py @@ -516,8 +516,8 @@ def server( (socketio, app) = flask.init_flask(config, loglevel, quiet) socketio.run( app, - host=config["aprsd"]["web"]["host"], - port=config["aprsd"]["web"]["port"], + host=config["aprsd"]["web"]["host"], + port=config["aprsd"]["web"]["port"], ) # If there are items in the msgTracker, then save them diff --git a/aprsd/messaging.py b/aprsd/messaging.py index 8ae987b..0fe54f6 100644 --- a/aprsd/messaging.py +++ b/aprsd/messaging.py @@ -499,7 +499,6 @@ class AckMessage(Message): thread = SendAckThread(self) thread.start() - def send_direct(self, aprsis_client=None): """Send an ack message without a separate thread.""" cl = self.get_transport() diff --git a/dev-requirements.in b/dev-requirements.in index 3cce931..e55ac9e 100644 --- a/dev-requirements.in +++ b/dev-requirements.in @@ -7,6 +7,6 @@ tox twine pre-commit pip-tools -#pytest -#pytest-cov +pytest +pytest-cov gray diff --git a/dev-requirements.txt b/dev-requirements.txt index eba5c04..6f7ad18 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile +# This file is autogenerated by pip-compile with python 3.8 # To update, run: # # pip-compile dev-requirements.in @@ -11,7 +11,9 @@ alabaster==0.7.12 appdirs==1.4.4 # via black attrs==21.2.0 - # via jsonschema + # via + # jsonschema + # pytest autoflake==1.4 # via gray babel==2.9.1 @@ -38,6 +40,8 @@ colorlog==6.4.1 # via prettylog configargparse==1.5.2 # via gray +coverage==5.5 + # via pytest-cov distlib==0.3.2 # via virtualenv docutils==0.17.1 @@ -52,14 +56,14 @@ filelock==3.0.12 # virtualenv fixit==0.1.4 # via gray -flake8-polyfill==1.0.2 - # via pep8-naming flake8==3.9.2 # via # -r dev-requirements.in # fixit # flake8-polyfill # pep8-naming +flake8-polyfill==1.0.2 + # via pep8-naming gray==0.10.1 # via -r dev-requirements.in identify==2.2.13 @@ -74,6 +78,8 @@ importlib-metadata==4.7.1 # twine importlib-resources==5.2.2 # via fixit +iniconfig==1.1.1 + # via pytest isort==5.9.3 # via # -r dev-requirements.in @@ -90,18 +96,19 @@ markupsafe==2.0.1 # via jinja2 mccabe==0.6.1 # via flake8 +mypy==0.910 + # via -r dev-requirements.in mypy-extensions==0.4.3 # via # black # mypy # typing-inspect -mypy==0.910 - # via -r dev-requirements.in nodeenv==1.6.0 # via pre-commit packaging==21.0 # via # bleach + # pytest # sphinx # tox pathspec==0.9.0 @@ -116,14 +123,18 @@ pkginfo==1.7.1 # via twine platformdirs==2.2.0 # via virtualenv -pluggy==1.0.0 - # via tox +pluggy==0.13.1 + # via + # pytest + # tox pre-commit==2.14.0 # via -r dev-requirements.in prettylog==0.3.0 # via gray py==1.10.0 - # via tox + # via + # pytest + # tox pycodestyle==2.7.0 # via flake8 pyflakes==2.3.1 @@ -138,6 +149,12 @@ pyparsing==2.4.7 # via packaging pyrsistent==0.18.0 # via jsonschema +pytest==6.2.4 + # via + # -r dev-requirements.in + # pytest-cov +pytest-cov==2.12.1 + # via -r dev-requirements.in pytz==2021.1 # via babel pyupgrade==2.24.0 @@ -151,13 +168,13 @@ readme-renderer==29.0 # via twine regex==2021.8.27 # via black -requests-toolbelt==0.9.1 - # via twine requests==2.26.0 # via # requests-toolbelt # sphinx # twine +requests-toolbelt==0.9.1 + # via twine rfc3986==1.5.0 # via twine six==1.16.0 @@ -191,6 +208,8 @@ toml==0.10.2 # via # mypy # pre-commit + # pytest + # pytest-cov # tox tomli==1.2.1 # via diff --git a/requirements.txt b/requirements.txt index 1f0e6e2..645eb47 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile +# This file is autogenerated by pip-compile with python 3.8 # To update, run: # # pip-compile requirements.in @@ -18,8 +18,6 @@ cffi==1.14.6 # via cryptography charset-normalizer==2.0.4 # via requests -click-completion==0.5.2 - # via -r requirements.in click==8.0.1 # via # -r requirements.in @@ -33,18 +31,18 @@ dnspython==1.16.0 # via eventlet eventlet==0.31.1 # via -r requirements.in -flask-classful==0.14.2 - # via -r requirements.in -flask-httpauth==4.4.0 - # via -r requirements.in -flask-socketio==5.1.1 - # via -r requirements.in flask==2.0.1 # via # -r requirements.in # flask-classful # flask-httpauth # flask-socketio +flask-classful==0.14.2 + # via -r requirements.in +flask-httpauth==4.4.0 + # via -r requirements.in +flask-socketio==5.1.1 + # via -r requirements.in greenlet==1.1.1 # via eventlet idna==3.2