Fix for limiting the Python Protobuf to 3.x and set the minimum

requirement to 3.11.0

Author: kboortz

cpydist/data/deb/rules

@@ -134,31 +134,12 @@ override_dh_installdocs:
 # the Python 3 default install this is provided by "python3-distutils".
 # Debian 9 and Ubuntu 16 lacks "python3-distutils" but has "sysconfig"
 # anyway.
-
-ifeq ($(shell lsb_release --short --codename),stretch)
-  SUBSTVARS = -Vpython3-distutils:Depends=
-else ifeq ($(shell lsb_release --short --codename),xenial)
-  SUBSTVARS = -Vpython3-distutils:Depends=
-else
-  SUBSTVARS = -Vpython3-distutils:Depends="python3-distutils"
-endif
+SUBSTVARS = -Vpython3-distutils:Depends="python3-distutils"
 
 # Python PROTOBUF is required to communicate with the server using a pure
-# Python implementation of the protocol. Ubuntu 16.04 lacks a recent enough Python
-# protobuf module and then can't communicate using pure Python. But if installing
-# the C extension Deb it can be used for the communication instead. At least
-# if using the default settings to use the binary driver.
-#
-# So on Ubuntu 16.04 instead letting the pure Python Deb depend on Python protobuf,
-# we let it depend on the C extension Deb. Making it a cross dependency that APT
-# can sort out. If installing using "dpkg" you need to force install or install
-# both Debs at the same time.
-
-ifeq ($(shell lsb_release --short --codename),xenial)
-  SUBSTVARS += -Vpython3-protobuf:Depends='mysql-connector-python$(LIC_EXT)-py3 (= $${binary:Version})'
-else
-  SUBSTVARS += -Vpython3-protobuf:Depends='python3-protobuf (>= 3.0.0)'
-endif
+# Note that at this time, using PROTOBUF 4 is not supported
+SUBSTVARS += -Vpython3-protobuf:Depends='python3-protobuf (>= 3.11.0)'
+SUBSTVARS += -Vpython3-protobuf:Depends='python3-protobuf (<< 4)'
 
 override_dh_gencontrol:
 	dh_gencontrol -- $(SUBSTVARS)

cpydist/data/rpm/mysql-connector-python.spec

@@ -26,7 +26,7 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
-%global requires_py_protobuf_version 3.0.0
+%global requires_py_protobuf_version 3.11.0
 %global wants_py_dnspython_version 1.16.0
 
 %undefine _package_note_file
@@ -175,12 +175,16 @@ Requires:      python38
 # Some operations requires DNSPYTHON but this is not a strict
 # requirement for the RPM install as currently few RPM platforms has
 # the required version as RPMs. Users need to install using PIP.
-# Most of the linux distros except fedora got older version of python3-protobuf.
 %if 0%{?fedora}
 Requires:      python3-dns >= %{wants_py_dnspython_version}
-Requires:      python3-protobuf >= %{requires_py_protobuf_version}
 %endif
 
+# We have no python3-protobuf on EL7, too old versions on EL8 and openSUSE 15
+%if 0%{?fedora} || 0%{?rhel} >= 9
+Requires:      python3-protobuf >= %{requires_py_protobuf_version}, python3-protobuf < 4
+%endif
+
+
 %description -n mysql-connector-python3%{?product_suffix}
 MySQL Connector/Python enables Python programs to access MySQL
 databases, using an API that is compliant with the Python DB API

docs/mysqlx/requirements.rst

@@ -4,7 +4,7 @@ Requirements
 * MySQL 8.0.0 or higher, with the X Plugin enabled
 * Python >= 3.7
 * Protobuf C++ (version >= 3.0.0)
-* Python Protobuf (version >= 3.0.0)
+* Python Protobuf (version >= 3.11.0)
 * dnspython (version >= 1.16.0) for DNS SRV support
 * lz4 (version >= 2.1.6) for connection compression support
 * zstandard (version >= 0.12.0) for connection compression support

lib/mysqlx/protobuf/__init__.py

@@ -347,7 +347,7 @@ def parse_server_message(msg_type, payload):
 except (ImportError, SyntaxError, TypeError) as err:
     HAVE_PROTOBUF = False
     HAVE_PROTOBUF_ERROR = (
-        err if PROTOBUF_VERSION is not None else "Protobuf >=3.0.0 is required"
+        err if PROTOBUF_VERSION is not None else "Protobuf >=3.11.0 is required"
     )
     if not HAVE_MYSQLXPB_CEXT:
         raise ImportError(f"Protobuf is not available: {HAVE_PROTOBUF_ERROR}") from err

setup.py

@@ -138,7 +138,7 @@
     ],
     ext_modules=EXTENSIONS,
     cmdclass=COMMAND_CLASSES,
-    install_requires=["protobuf>=3.0.0"],
+    install_requires=["protobuf>=3.11.0,<=3.20.1"],
     extras_require={
         "dns-srv": ["dnspython>=1.16.0"],
         "compression": ["lz4>=2.1.6", "zstandard>=0.12.0"],