[checkmk-commits] Replaced MySQL-python-1.2.5 with mysqlclient 1.3.13.

Module: check_mk Branch: master Commit: b51695e2381ce10318cf290440ac92d2df4946de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b51695e2381ce1… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Tue Jul 17 09:11:43 2018 +0200 Replaced MySQL-python-1.2.5 with mysqlclient 1.3.13. The old package doesn't work with Python 3.6 anymore, so we couldn't build a virtual environment with it. The new package is a friendly fork of it, and it is backwards-compatible. Change-Id: I16386316135431d44ba606e3f401773bd215ff01 --- Pipfile | 2 +- Pipfile.lock | 12 +++++------ omd/packages/python-modules/Makefile | 2 +- .../patches/0002_MySQL-python-use-distutils.dif | 24 --------------------- .../python-modules/src/MySQL-python-1.2.5.zip | Bin 108935 -> 0 bytes .../python-modules/src/MySQL-python.README | 1 - .../python-modules/src/mysqlclient-1.3.13.tar.gz | Bin 0 -> 90368 bytes 7 files changed, 8 insertions(+), 33 deletions(-) diff --git a/Pipfile b/Pipfile index 3d2b4d6..f7ac946 100644 --- a/Pipfile +++ b/Pipfile @@ -34,7 +34,7 @@ pysnmp = "==4.4.4" pymssql = "==2.1.3" python-ldap = "==3.1.0" simplejson = "==3.15.0" -MySQL-python = "==1.2.5" +mysqlclient = "==1.3.13" psycopg2 = "==2.7" # This is actually a lie: We ship 2.6.2, but installation fails for PostgreSQL > 9. Alas, 2.7 removed support for clients < 9.1. >:-( dicttoxml = "==1.7.4" pycparser = "==2.18" diff --git a/Pipfile.lock b/Pipfile.lock index 2197797..9967e43 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "7858d6851e8d8d5c4b05cfb25d8a846e688ffe665d9161a4fc0c8036c965d39a" + "sha256": "57b0d66b9c7ccea9a4d35946335eb67299e7c7c8da1d41da2f4be9dd9e456af2" }, "pipfile-spec": 6, "requires": { @@ -141,12 +141,12 @@ "index": "pypi", "version": "==1.0.22" }, - "mysql-python": { + "mysqlclient": { "hashes": [ - "sha256:811040b647e5d5686f84db415efd697e6250008b112b6909ba77ac059e140c74" + "sha256:ff8ee1be84215e6c30a746b728c41eb0701a46ca76e343af445b35ce6250644f" ], "index": "pypi", - "version": "==1.2.5" + "version": "==1.3.13" }, "netifaces": { "hashes": [ @@ -591,7 +591,7 @@ "sha256:9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a", "sha256:f0b0e4eba956de51238e17573b7087e852dfe9854afd2e9c873f73fc0ca0a6dd" ], - "markers": "python_version < '3.4'", + "markers": "python_version == '2.7'", "version": "==1.5" }, "bandit": { @@ -674,7 +674,7 @@ "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca", "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50" ], - "markers": "python_version < '3.3'", + "markers": "python_version < '3.0'", "version": "==1.0.2" }, "futures": { diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index 329b39e..56e4350 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -39,7 +39,7 @@ endif # Check_MK Edition specific MODULES += simplejson-3.15.0.tar.gz -MODULES += MySQL-python-1.2.5.zip # needed by check_sql +MODULES += mysqlclient-1.3.13.tar.gz # needed by check_sql MODULES += psycopg2-2.6.2.tar.gz # needed by check_sql MODULES += dicttoxml-1.7.4.tar.gz # needed by inventory XML export MODULES += pycparser-2.18.tar.gz # needed for cffi diff --git a/omd/packages/python-modules/patches/0002_MySQL-python-use-distutils.dif b/omd/packages/python-modules/patches/0002_MySQL-python-use-distutils.dif deleted file mode 100644 index 79f653c..0000000 --- a/omd/packages/python-modules/patches/0002_MySQL-python-use-distutils.dif +++ /dev/null @@ -1,24 +0,0 @@ ---- dest/MySQL-python-1.2.5/setup.py.orig 2016-03-29 13:14:46.285150371 +0200 -+++ dest/MySQL-python-1.2.5/setup.py 2016-03-29 13:14:54.084943460 +0200 -@@ -4,7 +4,11 @@ - import sys - - import distutils.errors --import setuptools -+ -+try: -+ from setuptools import setup, Extension -+except ImportError: -+ from distutils.core import setup, Extension - - if not hasattr(sys, "hexversion") or sys.hexversion < 0x02040000: - raise distutils.errors.DistutilsError("Python 2.4 or newer is required") -@@ -16,6 +20,6 @@ - - metadata, options = get_config() - metadata['ext_modules'] = [ -- setuptools.Extension(sources=['_mysql.c'], **options)] -+ Extension(sources=['_mysql.c'], **options)] - metadata['long_description'] = metadata['long_description'].replace(r'\n', '') --setuptools.setup(**metadata) -+setup(**metadata) diff --git a/omd/packages/python-modules/src/MySQL-python-1.2.5.zip b/omd/packages/python-modules/src/MySQL-python-1.2.5.zip deleted file mode 100644 index 9cbd069..0000000 Binary files a/omd/packages/python-modules/src/MySQL-python-1.2.5.zip and /dev/null differ diff --git a/omd/packages/python-modules/src/MySQL-python.README b/omd/packages/python-modules/src/MySQL-python.README deleted file mode 100644 index 50664d5..0000000 --- a/omd/packages/python-modules/src/MySQL-python.README +++ /dev/null @@ -1 +0,0 @@ -https://pypi.python.org/pypi/MySQL-python/1.2.5 diff --git a/omd/packages/python-modules/src/mysqlclient-1.3.13.tar.gz b/omd/packages/python-modules/src/mysqlclient-1.3.13.tar.gz new file mode 100644 index 0000000..c31dd2b Binary files /dev/null and b/omd/packages/python-modules/src/mysqlclient-1.3.13.tar.gz differ