Skip to content

Commit 2d85b24

Browse files
committed
Fixed installation of libraries, when another version of the library already installed
1 parent bf0f1e6 commit 2d85b24

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

thingsboard_gateway/connectors/modbus/modbus_connector.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,7 @@
4242
try:
4343
from pymodbus import __version__ as pymodbus_version
4444

45-
if version.parse(pymodbus_version) < version.parse(required_version):
46-
installation_required = True
47-
48-
if version.parse(
49-
pymodbus_version) > version.parse(required_version):
45+
if version.parse(pymodbus_version) != version.parse(required_version):
5046
installation_required = True
5147
force_install = True
5248

thingsboard_gateway/connectors/opcua/opcua_connector.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,7 @@
4646
try:
4747
from asyncua import __version__ as asyncua_version
4848

49-
if version.parse(asyncua_version) < version.parse(required_version):
50-
installation_required = True
51-
52-
if version.parse(asyncua_version) > version.parse(required_version):
49+
if version.parse(asyncua_version) != version.parse(required_version):
5350
installation_required = True
5451
force_install = True
5552

thingsboard_gateway/tb_utility/tb_utility.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ def convert_key_to_datapoint_key(key, device_report_strategy, key_config, logger
257257

258258
@staticmethod
259259
def install_package(package, version="upgrade", force_install=False):
260-
from sys import executable, prefix, base_prefix
260+
from sys import executable, prefix, base_prefix, modules
261261
from subprocess import check_call
262262
import site
263263
from importlib import reload
@@ -289,6 +289,9 @@ def install_package(package, version="upgrade", force_install=False):
289289
# Refreshing sys.path fixes this. See:
290290
# https://stackoverflow.com/questions/4271494/what-sets-up-sys-path-with-python-and-when
291291
reload(site)
292+
reload(site)
293+
if package in modules:
294+
del modules[package]
292295

293296
return result
294297

0 commit comments

Comments
 (0)