From 3af09332fad0749a49e3fad2e22a2666747372bb Mon Sep 17 00:00:00 2001 From: Scott Alfter Date: Fri, 29 Dec 2023 09:39:17 -0800 Subject: [PATCH] remove obsolete heatshrink dependency, as we're all using Python 3 now --- binproto2/protocols.py | 5 +---- setup.py | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/binproto2/protocols.py b/binproto2/protocols.py index 0cd3668..dad2f9e 100755 --- a/binproto2/protocols.py +++ b/binproto2/protocols.py @@ -12,10 +12,7 @@ import serial from binproto2.exceptions import (ConnectionLost, FatalError, PayloadOverflow, ReadTimeout, SynchronizationError) -try: - import heatshrink -except ImportError: - import heatshrink2 as heatshrink +import heatshrink2 as heatshrink try: from time import perf_counter diff --git a/setup.py b/setup.py index 4596436..f43f0ad 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ setuptools.setup( long_description_content_type="text/markdown", url="https://github.com/charleswillis3/marlin-binary-protocol", packages=setuptools.find_packages(), - install_requires=["heatshrink>=0.3.2", "heatshrink2>=0.9", "pyserial>=3.4", "backports.time_perf_counter; python_version < '3.3'"], + install_requires=["heatshrink2>=0.9", "pyserial>=3.4", "backports.time_perf_counter; python_version < '3.3'"], classifiers=[ "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3",