Skip to content

Switch from hbmqtt to amqtt, websockets 9 #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
decompil3d merged 2 commits into from
Jan 25, 2022
Merged

Switch from hbmqtt to amqtt, websockets 9 #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebe4111
Switch from hbmqtt to amqtt, websockets 9
decompil3d Jan 13, 2022
0529993
Add python_requires, better dependency version requirements
decompil3d Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ geopy>=1.14.0
docopt
pyyaml
certifi
hbmqtt
websockets<=8.1
amqtt>=0.10.0,<0.11.0
websockets>=9.0
aiohttp
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@
packages=["volvooncall"],
install_requires=list(open("requirements.txt").read().strip().split("\n")),
extras_require={"console": ["docopt"]},
python_requires=">=3.8"
Copy link
Copy Markdown

@cdce8p cdce8p Jan 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
python_requires=">=3.8"
python_requires=">=3.7"

3.7 should work too :)

Copy link
Copy Markdown
Collaborator Author

@decompil3d decompil3d Jan 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The package already only supports 3.8+ per the readme and CI workflow.

Copy link
Copy Markdown

@cdce8p cdce8p Jan 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't saw that 🙈

)
6 changes: 3 additions & 3 deletions volvooncall/mqtt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import asyncio

import certifi
from hbmqtt.client import ClientException, ConnectException, MQTTClient
from amqtt.client import ClientException, ConnectException, MQTTClient

from .dashboard import Lock, Position, Sensor, BinarySensor, Switch
from .util import camel2slug, whitelisted, owntracks_encrypt
Expand Down Expand Up @@ -288,7 +288,7 @@ async def publish(self, topic, payload, retain=False):

async def subscribe_to(self, topic):
_LOGGER.debug("Subscribing to %s", topic)
from hbmqtt.mqtt.constants import QOS_1
from amqtt.mqtt.constants import QOS_1

await self.client.subscribe([(topic, QOS_1)])
_LOGGER.debug("Subscribed to %s", topic)
Expand Down Expand Up @@ -379,7 +379,7 @@ async def publish_state(self):

async def run(voc, config):

logging.getLogger("hbmqtt.client.plugins.packet_logger_plugin").setLevel(
logging.getLogger("amqtt.client.plugins.packet_logger_plugin").setLevel(
logging.WARNING
)

Expand Down