Skip to content

Commit

Permalink
Fix for CONPY-85:
Browse files Browse the repository at this point in the history
Version checking in setup fails with 2 digit minor or patch version number.
Instead of comparing version numers directly we need to parse them before
using packaging.version.parse().
  • Loading branch information
9EOR9 committed Jul 15, 2020
1 parent 92d8c40 commit c6ad169
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
5 changes: 3 additions & 2 deletions mariadb_posix.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import subprocess
import sys
from packaging import version


class MariaDBConfiguration():
Expand Down Expand Up @@ -35,7 +36,7 @@ def dequote(s):


def get_config(options):
required_version = "3.1.3"
required_version = "3.1.5"
no_env = 0
static = options["link_static"]

Expand All @@ -47,7 +48,7 @@ def get_config(options):
config_prg = "mariadb_config"

cc_version = mariadb_config(config_prg, "cc_version")
if cc_version[0] < required_version:
if version.parse(cc_version[0]) < version.parse(required_version):
print ('MariaDB Connector/Python requires MariaDB Connector/C >= %s, found version %s' % (
required_version, cc_version[0]))
sys.exit(2)
Expand Down
3 changes: 2 additions & 1 deletion mariadb_windows.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import sys

from winreg import *
from packaging import version


class MariaDBConfiguration():
Expand Down Expand Up @@ -38,7 +39,7 @@ def get_config(options):
'SOFTWARE\\MariaDB Corporation\\MariaDB Connector C 64-bit',
access=KEY_READ | KEY_WOW64_64KEY)
cc_version = QueryValueEx(connector_key, "Version")
if cc_version[0] < required_version:
if version.parse(cc_version[0]) < version.parse(required_version):
print("MariaDB Connector/Python requires MariaDB Connector/C >= %s (found version: %s") \
% (required_version, cc_version[0])
sys.exit(2)
Expand Down

0 comments on commit c6ad169

Please sign in to comment.