Hello community,
here is the log from the commit of package python-mysqlclient for
openSUSE:Leap:15.2 checked in at 2020-03-06 12:35:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/python-mysqlclient (Old)
and /work/SRC/openSUSE:Leap:15.2/.python-mysqlclient.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-mysqlclient"
Fri Mar 6 12:35:57 2020 rev:5 rq:779236 version:1.4.6
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/python-mysqlclient/python-mysqlclient.changes
2020-01-15 15:50:44.131504779 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.python-mysqlclient.new.26092/python-mysqlclient.changes
2020-03-06 12:36:01.714565768 +0100
@@ -1,0 +2,49 @@
+Mon Feb 24 11:08:54 UTC 2020 - Kristyna Streitova <[email protected]>
+
+- reorganize test conditionals to try to avoid hitting
+ "_debugsource_packages sometimes crashes due to non-existing
+ debugsourcefiles.list #279" rpm bug
+
+-------------------------------------------------------------------
+Fri Feb 21 10:04:38 UTC 2020 - Kristyna Streitova <[email protected]>
+
+- switch to multibuild to run tests and avoid a buildcycle with
+ mariadb
+
+-------------------------------------------------------------------
+Mon Dec 9 20:22:50 UTC 2019 - [email protected]
+
+- run the testsuite against test mysqld server
+
+-------------------------------------------------------------------
+Fri Nov 22 17:31:43 UTC 2019 - Alexei Podvalsky <[email protected]>
+
+- Update to 1.4.6:
+ * The cp1252 encoding is used when charset is "latin1". (#390)
+- Change in 1.4.5:
+ * The auth_plugin option is added. (#389)
+
+-------------------------------------------------------------------
+Thu Aug 15 19:25:35 UTC 2019 - Alexei Podvalsky <[email protected]>
+
+- Update to 1.4.4:
+ * charset option is passed to mysql_options(mysql, MYSQL_SET_CHARSET_NAME,
+ charset) before mysql_real_connect is called. This avoid extra
+ SET NAMES <charset> query when creating connection.
+- Change in 1.4.3:
+ * --static build supports libmariadbclient.a
+ * Try mariadb_config when mysql_config is not found
+ * Fixed warning happend in Python 3.8 (#359)
+ * Fixed from MySQLdb import *, while I don't recommend it. (#369)
+ * Fixed SEGV MySQLdb.escape_string("1") when libmariadb is used and
+ no connection is created. (#367)
+ * Fixed many circular references are created in Cursor.executemany().
+- Add python3-attrs to build
+
+-------------------------------------------------------------------
+Thu Jun 6 14:30:26 UTC 2019 - Tomáš Chvátal <[email protected]>
+
+- Generate documentation only with sphinx3 no need to do it
+ twice
+
+-------------------------------------------------------------------
Old:
----
mysqlclient-1.4.2.tar.gz
New:
----
_multibuild
mysqlclient-1.4.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-mysqlclient.spec ++++++
--- /var/tmp/diff_new_pack.IS5zwL/_old 2020-03-06 12:36:02.158566038 +0100
+++ /var/tmp/diff_new_pack.IS5zwL/_new 2020-03-06 12:36:02.170566045 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-mysqlclient
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,26 +12,40 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define oldpython python
-Name: python-mysqlclient
-Version: 1.4.2
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
+%define psuffix -test
+%bcond_without test
+%else
+%define psuffix %{nil}
+%bcond_with test
+%endif
+Name: python-mysqlclient%{psuffix}
+Version: 1.4.6
Release: 0
Summary: Python interface to MySQL
License: GPL-2.0-or-later
Group: Development/Languages/Python
URL: https://github.com/PyMySQL/mysqlclient-python
Source:
https://files.pythonhosted.org/packages/source/m/mysqlclient/mysqlclient-%{version}.tar.gz
-BuildRequires: %{python_module Sphinx}
BuildRequires: %{python_module devel}
+BuildRequires: %{python_module mock}
+BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: libmysqlclient-devel
+%if %{with test}
+BuildRequires: mariadb-rpm-macros
+%endif
BuildRequires: python-rpm-macros
+BuildRequires: python3-Sphinx
+BuildRequires: python3-attrs
BuildRequires: unzip
Recommends: mariadb
Provides: python-mysql = %{version}
@@ -44,7 +58,6 @@
Provides: %{oldpython}-MySQL-python = %{version}
Obsoletes: %{oldpython}-MySQL-python < %{version}
%endif
-
%python_subpackages
%description
@@ -56,18 +69,48 @@
%setup -q -n mysqlclient-%{version}
%build
+%if !%{with test}
%python_build
-%{python_expand $python setup.py build
-$python setup.py build_sphinx && rm build/sphinx/html/.buildinfo}
+python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo
+%endif
+
+%check
+%if %{with test}
+exit_code=0
+cconf=abuild-myclient.cnf
+#
+# start the mariadb server
+#
+%mysql_testserver_start -u abuild -p abuildpw
+#
+# creating client mysql config
+#
+%mysql_testserver_cconf -n $cconf
+#
+# running the test
+#
+rm -r MySQLdb
+export TESTDB="$PWD/$cconf"
+%pytest_arch -k "not (test_LONG or test_TEXT)"
+#
+# stopping mariadb
+#
+%mysql_testserver_stop
+exit $exit_code
+%endif
%install
+%if !%{with test}
%python_install
%python_expand %fdupes %{buildroot}%{$python_sitearch}
+%endif
+%if !%{with test}
%files %{python_files}
%license LICENSE
-%doc HISTORY.rst MANIFEST.in README.md
+%doc HISTORY.rst MANIFEST.in README.md build/sphinx/html
%{python_sitearch}/*
+%endif
%changelog
++++++ _multibuild ++++++
<multibuild>
<package>test</package>
</multibuild>
++++++ mysqlclient-1.4.2.tar.gz -> mysqlclient-1.4.6.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mysqlclient-1.4.2/HISTORY.rst
new/mysqlclient-1.4.6/HISTORY.rst
--- old/mysqlclient-1.4.2/HISTORY.rst 2019-02-08 13:23:27.000000000 +0100
+++ new/mysqlclient-1.4.6/HISTORY.rst 2019-11-21 13:36:29.000000000 +0100
@@ -1,4 +1,47 @@
======================
+ What's new in 1.4.6
+======================
+
+Release: 2019-11-21
+
+* The ``cp1252`` encoding is used when charset is "latin1". (#390)
+
+======================
+ What's new in 1.4.5
+======================
+
+Release: 2019-11-06
+
+* The ``auth_plugin`` option is added. (#389)
+
+
+======================
+ What's new in 1.4.4
+======================
+
+Release: 2019-08-12
+
+* ``charset`` option is passed to ``mysql_options(mysql,
MYSQL_SET_CHARSET_NAME, charset)``
+ before ``mysql_real_connect`` is called.
+ This avoid extra ``SET NAMES <charset>`` query when creating connection.
+
+
+======================
+ What's new in 1.4.3
+======================
+
+Release: 2019-08-09
+
+* ``--static`` build supports ``libmariadbclient.a``
+* Try ``mariadb_config`` when ``mysql_config`` is not found
+* Fixed warning happend in Python 3.8 (#359)
+* Fixed ``from MySQLdb import *``, while I don't recommend it. (#369)
+* Fixed SEGV ``MySQLdb.escape_string("1")`` when libmariadb is used and
+ no connection is created. (#367)
+* Fixed many circular references are created in ``Cursor.executemany()``.
(#375)
+
+
+======================
What's new in 1.4.2
======================
@@ -73,8 +116,9 @@
* Add ``Connection._get_native_connection`` for XTA project (#269)
-* Fix SEGV on MariaDB Connector/C when ``Connection.close()`` is called
- for closed connection. (#270, #272, #276)
+* Fix SEGV on MariaDB Connector/C when some methods of ``Connection``
+ objects are called after ``Connection.close()`` is called. (#270, #272, #276)
+ See https://jira.mariadb.org/browse/CONC-289
* Fix ``Connection.client_flag`` (#266)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mysqlclient-1.4.2/MySQLdb/__init__.py
new/mysqlclient-1.4.6/MySQLdb/__init__.py
--- old/mysqlclient-1.4.2/MySQLdb/__init__.py 2019-01-17 13:30:38.000000000
+0100
+++ new/mysqlclient-1.4.6/MySQLdb/__init__.py 2019-11-18 13:13:21.000000000
+0100
@@ -18,8 +18,8 @@
from . import _mysql
if version_info != _mysql.version_info:
- raise ImportError("this is MySQLdb version %s, but _mysql is version %r" %
- (version_info, _mysql.version_info))
+ raise ImportError("this is MySQLdb version %s, but _mysql is version
%r\n_mysql: %r" %
+ (version_info, _mysql.version_info, _mysql.__file__))
threadsafety = 1
apilevel = "2.0"
@@ -89,7 +89,7 @@
'Date', 'Time', 'Timestamp', 'DateFromTicks', 'TimeFromTicks',
'TimestampFromTicks', 'DataError', 'DatabaseError', 'Error',
'FIELD_TYPE', 'IntegrityError', 'InterfaceError', 'InternalError',
- 'MySQLError', 'NULL', 'NUMBER', 'NotSupportedError', 'DBAPISet',
+ 'MySQLError', 'NUMBER', 'NotSupportedError', 'DBAPISet',
'OperationalError', 'ProgrammingError', 'ROWID', 'STRING', 'TIME',
'TIMESTAMP', 'Warning', 'apilevel', 'connect', 'connections',
'constants', 'converters', 'cursors', 'debug', 'escape',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mysqlclient-1.4.2/MySQLdb/_mysql.c
new/mysqlclient-1.4.6/MySQLdb/_mysql.c
--- old/mysqlclient-1.4.2/MySQLdb/_mysql.c 2019-02-07 10:38:02.000000000
+0100
+++ new/mysqlclient-1.4.6/MySQLdb/_mysql.c 2019-11-19 09:28:43.000000000
+0100
@@ -34,6 +34,7 @@
#define my_bool _Bool
#endif
+#define PY_SSIZE_T_CLEAN 1
#include "Python.h"
#if PY_MAJOR_VERSION >= 3
#define IS_PY3K
@@ -216,6 +217,9 @@
if (strncmp(utf8, cs.csname, 4) == 0) { // utf8, utf8mb3, utf8mb4
return utf8;
}
+ else if (strncmp("latin1", cs.csname, 6) == 0) {
+ return "cp1252";
+ }
else if (strncmp("koi8r", cs.csname, 5) == 0) {
return "koi8_r";
}
@@ -396,7 +400,8 @@
"read_default_file", "read_default_group",
"client_flag", "ssl",
"local_infile",
- "read_timeout", "write_timeout",
+ "read_timeout", "write_timeout", "charset",
+ "auth_plugin",
NULL } ;
int connect_timeout = 0;
int read_timeout = 0;
@@ -404,13 +409,15 @@
int compress = -1, named_pipe = -1, local_infile = -1;
char *init_command=NULL,
*read_default_file=NULL,
- *read_default_group=NULL;
+ *read_default_group=NULL,
+ *charset=NULL,
+ *auth_plugin=NULL;
self->converter = NULL;
self->open = 0;
if (!PyArg_ParseTupleAndKeywords(args, kwargs,
- "|ssssisOiiisssiOiii:connect",
+ "|ssssisOiiisssiOiiiss:connect",
kwlist,
&host, &user, &passwd, &db,
&port, &unix_socket, &conv,
@@ -421,7 +428,9 @@
&client_flag, &ssl,
&local_infile,
&read_timeout,
- &write_timeout
+ &write_timeout,
+ &charset,
+ &auth_plugin
))
return -1;
@@ -444,8 +453,12 @@
_stringsuck(cipher, value, ssl);
}
- Py_BEGIN_ALLOW_THREADS ;
conn = mysql_init(&(self->connection));
+ if (!conn) {
+ PyErr_SetNone(PyExc_MemoryError);
+ return -1;
+ }
+ Py_BEGIN_ALLOW_THREADS ;
self->open = 1;
if (connect_timeout) {
unsigned int timeout = connect_timeout;
@@ -481,6 +494,12 @@
if (ssl) {
mysql_ssl_set(&(self->connection), key, cert, ca, capath, cipher);
}
+ if (charset) {
+ mysql_options(&(self->connection), MYSQL_SET_CHARSET_NAME, charset);
+ }
+ if (auth_plugin) {
+ mysql_options(&(self->connection), MYSQL_DEFAULT_AUTH, auth_plugin);
+ }
conn = mysql_real_connect(&(self->connection), host, user, passwd, db,
port, unix_socket, client_flag);
@@ -497,7 +516,6 @@
if (!conn) {
_mysql_Exception(self);
- self->open = 0;
return -1;
}
@@ -732,7 +750,7 @@
}
static char _mysql_ConnectionObject_rollback__doc__[] =
-"Rolls backs the current transaction\n\
+"Rolls back the current transaction\n\
";
static PyObject *
_mysql_ConnectionObject_rollback(
@@ -879,7 +897,8 @@
{
PyObject *str;
char *in, *out;
- int len, size;
+ int len;
+ Py_ssize_t size;
if (!PyArg_ParseTuple(args, "s#:escape_string", &in, &size)) return NULL;
str = PyBytes_FromStringAndSize((char *) NULL, size*2+1);
if (!str) return PyErr_NoMemory();
@@ -1099,7 +1118,7 @@
_mysql_field_to_python(
PyObject *converter,
const char *rowitem,
- unsigned long length,
+ Py_ssize_t length,
MYSQL_FIELD *field,
const char *encoding)
{
@@ -1147,16 +1166,17 @@
#endif
// Call converter with bytes
binary = 1;
+ break;
default: // e.g. FIELD_TYPE_DATETIME, etc.
// Call converter with unicode string
binary = 0;
}
return PyObject_CallFunction(converter,
binary ? "y#" : "s#",
- rowitem, (int)length);
+ rowitem, (Py_ssize_t)length);
#else
return PyObject_CallFunction(converter,
- "s#", rowitem, (int)length);
+ "s#", rowitem, (Py_ssize_t)length);
#endif
}
@@ -1748,7 +1768,8 @@
PyObject *args)
{
char *query;
- int len, r;
+ Py_ssize_t len;
+ int r;
if (!PyArg_ParseTuple(args, "s#:query", &query, &len)) return NULL;
check_connection(self);
@@ -1770,7 +1791,8 @@
PyObject *args)
{
char *query;
- int len, r;
+ Py_ssize_t len;
+ int r;
MYSQL *mysql = &(self->connection);
if (!PyArg_ParseTuple(args, "s#:query", &query, &len)) return NULL;
check_connection(self);
@@ -2283,7 +2305,7 @@
},
{
"server_capabilities",
- T_UINT,
+ T_ULONG,
offsetof(_mysql_ConnectionObject,connection.server_capabilities),
READONLY,
"Capabilities of server; consult MySQLdb.constants.CLIENT"
@@ -2297,7 +2319,7 @@
},
{
"client_flag",
- T_UINT,
+ T_ULONG,
offsetof(_mysql_ConnectionObject,connection.client_flag),
READONLY,
"Client flags; refer to MySQLdb.constants.CLIENT"
@@ -2635,6 +2657,15 @@
{
PyObject *dict, *module, *emod, *edict;
+ if (mysql_library_init(0, NULL, NULL)) {
+ PyErr_SetString(PyExc_ImportError, "_mysql: mysql_library_init
failed");
+#ifdef IS_PY3K
+ return NULL;
+#else
+ return;
+#endif
+ }
+
#ifdef IS_PY3K
if (PyType_Ready(&_mysql_ConnectionObject_Type) < 0)
return NULL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mysqlclient-1.4.2/MySQLdb/connections.py
new/mysqlclient-1.4.6/MySQLdb/connections.py
--- old/mysqlclient-1.4.2/MySQLdb/connections.py 2019-02-07
10:38:07.000000000 +0100
+++ new/mysqlclient-1.4.6/MySQLdb/connections.py 2019-11-19
09:28:43.000000000 +0100
@@ -15,6 +15,14 @@
NotSupportedError, ProgrammingError,
)
+# Mapping from MySQL charset name to Python codec name
+_charset_to_encoding = {
+ "utf8mb4": "utf8",
+ "utf8mb3": "utf8",
+ "latin1": "cp1252",
+ "koi8r": "koi8_r",
+ "koi8u": "koi8_u",
+}
re_numeric_part = re.compile(r"^(\d+)")
@@ -73,21 +81,28 @@
:param bool use_unicode:
If True, text-like columns are returned as unicode objects
- using the connection's character set. Otherwise, text-like
- columns are returned as strings. columns are returned as
- normal strings. Unicode objects will always be encoded to
- the connection's character set regardless of this setting.
- Default to False on Python 2 and True on Python 3.
+ using the connection's character set. Otherwise, text-like
+ columns are returned as bytes. Unicode objects will always
+ be encoded to the connection's character set regardless of
+ this setting.
+ Default to False on Python 2 and True on Python 3
+ so that you can always get python `str` object by default.
:param str charset:
If supplied, the connection character set will be changed
- to this character set (MySQL-4.1 and newer). This implies
- use_unicode=True.
+ to this character set.
+ On Python 2, this option changes default value of `use_unicode`
+ option from False to True.
+
+ :param str auth_plugin:
+ If supplied, the connection default authentication plugin will be
+ changed to this value. Example values:
+ `mysql_native_password` or `caching_sha2_password`
:param str sql_mode:
If supplied, the session SQL mode will be changed to this
- setting (MySQL-4.1 and newer). For more details and legal
- values, see the MySQL documentation.
+ setting.
+ For more details and legal values, see the MySQL documentation.
:param int client_flag:
flags to use or 0 (see MySQL docs or constants/CLIENTS.py)
@@ -138,7 +153,7 @@
kwargs2['conv'] = conv2
cursorclass = kwargs2.pop('cursorclass', self.default_cursor)
- charset = kwargs2.pop('charset', '')
+ charset = kwargs2.get('charset', '')
if charset or not PY2:
use_unicode = True
@@ -282,10 +297,7 @@
set can only be changed in MySQL-4.1 and newer. If you try
to change the character set from the current value in an
older version, NotSupportedError will be raised."""
- if charset in ("utf8mb4", "utf8mb3"):
- py_charset = "utf8"
- else:
- py_charset = charset
+ py_charset = _charset_to_encoding.get(charset, charset)
if self.character_set_name() != charset:
try:
super(Connection, self).set_character_set(charset)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mysqlclient-1.4.2/MySQLdb/cursors.py
new/mysqlclient-1.4.6/MySQLdb/cursors.py
--- old/mysqlclient-1.4.2/MySQLdb/cursors.py 2019-02-07 10:38:07.000000000
+0100
+++ new/mysqlclient-1.4.6/MySQLdb/cursors.py 2019-11-06 08:21:07.000000000
+0100
@@ -110,14 +110,17 @@
return x
if isinstance(args, (tuple, list)):
- return tuple(literal(ensure_bytes(arg)) for arg in args)
+ ret = tuple(literal(ensure_bytes(arg)) for arg in args)
elif isinstance(args, dict):
- return {ensure_bytes(key): literal(ensure_bytes(val))
- for (key, val) in args.items()}
+ ret = {ensure_bytes(key): literal(ensure_bytes(val))
+ for (key, val) in args.items()}
else:
# If it's not a dictionary let's try escaping it anyways.
# Worst case it will throw a Value error
- return literal(ensure_bytes(args))
+ ret = literal(ensure_bytes(args))
+
+ ensure_bytes = None # break circular reference
+ return ret
def _check_executed(self):
if not self._executed:
@@ -471,7 +474,7 @@
class DictCursor(CursorStoreResultMixIn, CursorDictRowsMixIn,
BaseCursor):
- """This is a Cursor class that returns rows as dictionaries and
+ """This is a Cursor class that returns rows as dictionaries and
stores the result set in the client."""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mysqlclient-1.4.2/MySQLdb/release.py
new/mysqlclient-1.4.6/MySQLdb/release.py
--- old/mysqlclient-1.4.2/MySQLdb/release.py 2019-02-08 13:25:26.000000000
+0100
+++ new/mysqlclient-1.4.6/MySQLdb/release.py 2019-11-21 13:37:13.000000000
+0100
@@ -1,4 +1,4 @@
__author__ = "Inada Naoki <[email protected]>"
-version_info = (1,4,2,'final',0)
-__version__ = "1.4.2"
+version_info = (1,4,6,'final',0)
+__version__ = "1.4.6"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mysqlclient-1.4.2/PKG-INFO
new/mysqlclient-1.4.6/PKG-INFO
--- old/mysqlclient-1.4.2/PKG-INFO 2019-02-08 13:25:26.000000000 +0100
+++ new/mysqlclient-1.4.6/PKG-INFO 2019-11-21 13:37:13.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: mysqlclient
-Version: 1.4.2
+Version: 1.4.6
Summary: Python interface to MySQL
Home-page: https://github.com/PyMySQL/mysqlclient-python
Author: Inada Naoki
@@ -23,7 +23,7 @@
* `sudo apt-get install python-dev default-libmysqlclient-dev` #
Debian / Ubuntu
* `sudo yum install python-devel mysql-devel` # Red Hat / CentOS
- * `brew install mysql-connector-c` # macOS (Homebrew) (Currently, it
has bug. See below)
+ * `brew install mysql-client` # macOS (Homebrew)
On Windows, there are binary wheels you can install without
MySQLConnector/C or MSVC.
@@ -33,33 +33,6 @@
`sudo yum install python3-devel ` # Red Hat / CentOS
- #### **Note about bug of MySQL Connector/C on macOS**
-
- See also: https://bugs.mysql.com/bug.php?id=86971
-
- Versions of MySQL Connector/C may have incorrect default configuration
options that cause compilation errors when `mysqlclient-python` is installed.
(As of November 2017, this is known to be true for homebrew's
`mysql-connector-c` and [official
package](https://dev.mysql.com/downloads/connector/c/))
-
- Modification of `mysql_config` resolves these issues as follows.
-
- Change
-
- ```
- # on macOS, on or about line 112:
- # Create options
- libs="-L$pkglibdir"
- libs="$libs -l "
- ```
-
- to
-
- ```
- # Create options
- libs="-L$pkglibdir"
- libs="$libs -lmysqlclient -lssl -lcrypto"
- ```
-
- An improper ssl configuration may also create issues; see, e.g, `brew
info openssl` for details on macOS.
-
### Install from PyPI
`pip install mysqlclient`
@@ -97,6 +70,7 @@
Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
Classifier: Topic :: Database
Classifier: Topic :: Database :: Database Engines/Servers
Description-Content-Type: text/markdown
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mysqlclient-1.4.2/README.md
new/mysqlclient-1.4.6/README.md
--- old/mysqlclient-1.4.2/README.md 2018-10-20 04:03:50.000000000 +0200
+++ new/mysqlclient-1.4.6/README.md 2019-11-19 09:28:43.000000000 +0100
@@ -15,7 +15,7 @@
* `sudo apt-get install python-dev default-libmysqlclient-dev` # Debian /
Ubuntu
* `sudo yum install python-devel mysql-devel` # Red Hat / CentOS
-* `brew install mysql-connector-c` # macOS (Homebrew) (Currently, it has
bug. See below)
+* `brew install mysql-client` # macOS (Homebrew)
On Windows, there are binary wheels you can install without MySQLConnector/C
or MSVC.
@@ -25,33 +25,6 @@
`sudo yum install python3-devel ` # Red Hat / CentOS
-#### **Note about bug of MySQL Connector/C on macOS**
-
-See also: https://bugs.mysql.com/bug.php?id=86971
-
-Versions of MySQL Connector/C may have incorrect default configuration options
that cause compilation errors when `mysqlclient-python` is installed. (As of
November 2017, this is known to be true for homebrew's `mysql-connector-c` and
[official package](https://dev.mysql.com/downloads/connector/c/))
-
-Modification of `mysql_config` resolves these issues as follows.
-
-Change
-
-```
-# on macOS, on or about line 112:
-# Create options
-libs="-L$pkglibdir"
-libs="$libs -l "
-```
-
-to
-
-```
-# Create options
-libs="-L$pkglibdir"
-libs="$libs -lmysqlclient -lssl -lcrypto"
-```
-
-An improper ssl configuration may also create issues; see, e.g, `brew info
openssl` for details on macOS.
-
### Install from PyPI
`pip install mysqlclient`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mysqlclient-1.4.2/doc/MySQLdb.rst
new/mysqlclient-1.4.6/doc/MySQLdb.rst
--- old/mysqlclient-1.4.2/doc/MySQLdb.rst 2018-12-05 10:43:29.000000000
+0100
+++ new/mysqlclient-1.4.6/doc/MySQLdb.rst 2019-11-19 09:27:19.000000000
+0100
@@ -41,6 +41,23 @@
:undoc-members:
:show-inheritance:
+:mod:`_mysql` Module
+--------------------
+
+.. automodule:: MySQLdb._mysql
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+:mod:`_exceptions` Module
+-------------------------
+
+.. automodule:: MySQLdb._exceptions
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+
Subpackages
-----------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mysqlclient-1.4.2/doc/_exceptions.rst
new/mysqlclient-1.4.6/doc/_exceptions.rst
--- old/mysqlclient-1.4.2/doc/_exceptions.rst 2019-01-17 13:30:38.000000000
+0100
+++ new/mysqlclient-1.4.6/doc/_exceptions.rst 1970-01-01 01:00:00.000000000
+0100
@@ -1,7 +0,0 @@
-_exceptions Module
-========================
-
-.. automodule:: MySQLdb._exceptions
- :members:
- :undoc-members:
- :show-inheritance:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mysqlclient-1.4.2/doc/_mysql.rst
new/mysqlclient-1.4.6/doc/_mysql.rst
--- old/mysqlclient-1.4.2/doc/_mysql.rst 2019-01-17 13:30:38.000000000
+0100
+++ new/mysqlclient-1.4.6/doc/_mysql.rst 1970-01-01 01:00:00.000000000
+0100
@@ -1,7 +0,0 @@
-_mysql Module
-=============
-
-.. automodule:: MySQLdb._mysql
- :members:
- :undoc-members:
- :show-inheritance:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mysqlclient-1.4.2/doc/conf.py
new/mysqlclient-1.4.6/doc/conf.py
--- old/mysqlclient-1.4.2/doc/conf.py 2018-12-05 10:43:45.000000000 +0100
+++ new/mysqlclient-1.4.6/doc/conf.py 2019-11-18 13:14:11.000000000 +0100
@@ -16,7 +16,7 @@
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.insert(0, os.path.abspath('..'))
+#sys.path.insert(0, os.path.abspath('..'))
# -- General configuration
-----------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mysqlclient-1.4.2/doc/modules.rst
new/mysqlclient-1.4.6/doc/modules.rst
--- old/mysqlclient-1.4.2/doc/modules.rst 2018-12-06 11:27:28.000000000
+0100
+++ new/mysqlclient-1.4.6/doc/modules.rst 1970-01-01 01:00:00.000000000
+0100
@@ -1,7 +0,0 @@
-MySQLdb
-=======
-
-.. toctree::
- :maxdepth: 4
-
- MySQLdb
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mysqlclient-1.4.2/doc/user_guide.rst
new/mysqlclient-1.4.6/doc/user_guide.rst
--- old/mysqlclient-1.4.2/doc/user_guide.rst 2019-01-17 13:30:38.000000000
+0100
+++ new/mysqlclient-1.4.6/doc/user_guide.rst 2019-11-19 09:21:32.000000000
+0100
@@ -8,7 +8,7 @@
Introduction
------------
-MySQLdb is a interface to the popular MySQL
+MySQLdb is an interface to the popular MySQL
database server that provides the Python database API.
Installation
@@ -546,7 +546,7 @@
Some examples
.............
-The ``connect()`` method works nearly the same as with `_mysql`_::
+The ``connect()`` method works nearly the same as with `MySQLDB._mysql`_::
import MySQLdb
db=MySQLdb.connect(passwd="moonpie",db="thangs")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mysqlclient-1.4.2/metadata.cfg
new/mysqlclient-1.4.6/metadata.cfg
--- old/mysqlclient-1.4.2/metadata.cfg 2019-02-08 13:23:27.000000000 +0100
+++ new/mysqlclient-1.4.6/metadata.cfg 2019-11-21 13:06:17.000000000 +0100
@@ -1,6 +1,6 @@
[metadata]
-version: 1.4.2
-version_info: (1,4,2,'final',0)
+version: 1.4.6
+version_info: (1,4,6,'final',0)
description: Python interface to MySQL
author: Inada Naoki
author_email: [email protected]
@@ -25,6 +25,7 @@
Programming Language :: Python :: 3.5
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
+ Programming Language :: Python :: 3.8
Topic :: Database
Topic :: Database :: Database Engines/Servers
py_modules:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mysqlclient-1.4.2/mysqlclient.egg-info/PKG-INFO
new/mysqlclient-1.4.6/mysqlclient.egg-info/PKG-INFO
--- old/mysqlclient-1.4.2/mysqlclient.egg-info/PKG-INFO 2019-02-08
13:25:26.000000000 +0100
+++ new/mysqlclient-1.4.6/mysqlclient.egg-info/PKG-INFO 2019-11-21
13:37:13.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: mysqlclient
-Version: 1.4.2
+Version: 1.4.6
Summary: Python interface to MySQL
Home-page: https://github.com/PyMySQL/mysqlclient-python
Author: Inada Naoki
@@ -23,7 +23,7 @@
* `sudo apt-get install python-dev default-libmysqlclient-dev` #
Debian / Ubuntu
* `sudo yum install python-devel mysql-devel` # Red Hat / CentOS
- * `brew install mysql-connector-c` # macOS (Homebrew) (Currently, it
has bug. See below)
+ * `brew install mysql-client` # macOS (Homebrew)
On Windows, there are binary wheels you can install without
MySQLConnector/C or MSVC.
@@ -33,33 +33,6 @@
`sudo yum install python3-devel ` # Red Hat / CentOS
- #### **Note about bug of MySQL Connector/C on macOS**
-
- See also: https://bugs.mysql.com/bug.php?id=86971
-
- Versions of MySQL Connector/C may have incorrect default configuration
options that cause compilation errors when `mysqlclient-python` is installed.
(As of November 2017, this is known to be true for homebrew's
`mysql-connector-c` and [official
package](https://dev.mysql.com/downloads/connector/c/))
-
- Modification of `mysql_config` resolves these issues as follows.
-
- Change
-
- ```
- # on macOS, on or about line 112:
- # Create options
- libs="-L$pkglibdir"
- libs="$libs -l "
- ```
-
- to
-
- ```
- # Create options
- libs="-L$pkglibdir"
- libs="$libs -lmysqlclient -lssl -lcrypto"
- ```
-
- An improper ssl configuration may also create issues; see, e.g, `brew
info openssl` for details on macOS.
-
### Install from PyPI
`pip install mysqlclient`
@@ -97,6 +70,7 @@
Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
Classifier: Topic :: Database
Classifier: Topic :: Database :: Database Engines/Servers
Description-Content-Type: text/markdown
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mysqlclient-1.4.2/mysqlclient.egg-info/SOURCES.txt
new/mysqlclient-1.4.6/mysqlclient.egg-info/SOURCES.txt
--- old/mysqlclient-1.4.2/mysqlclient.egg-info/SOURCES.txt 2019-02-08
13:25:26.000000000 +0100
+++ new/mysqlclient-1.4.6/mysqlclient.egg-info/SOURCES.txt 2019-11-21
13:37:13.000000000 +0100
@@ -27,11 +27,8 @@
doc/FAQ.rst
doc/MySQLdb.constants.rst
doc/MySQLdb.rst
-doc/_exceptions.rst
-doc/_mysql.rst
doc/conf.py
doc/index.rst
-doc/modules.rst
doc/user_guide.rst
mysqlclient.egg-info/PKG-INFO
mysqlclient.egg-info/SOURCES.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mysqlclient-1.4.2/setup_posix.py
new/mysqlclient-1.4.6/setup_posix.py
--- old/mysqlclient-1.4.2/setup_posix.py 2018-12-05 10:33:59.000000000
+0100
+++ new/mysqlclient-1.4.6/setup_posix.py 2019-11-06 08:21:07.000000000
+0100
@@ -37,6 +37,16 @@
if 'mysql_config' in options:
_mysql_config_path = options['mysql_config']
+ else:
+ try:
+ mysql_config('version')
+ except EnvironmentError:
+ # try mariadb_config
+ _mysql_config_path = "mariadb_config"
+ try:
+ mysql_config('version')
+ except EnvironmentError:
+ _mysql_config_path = "mysql_config"
extra_objects = []
static = enabled(options, 'static')
@@ -69,7 +79,7 @@
# properly handle mysql client libraries that are not called
libmysqlclient
client = None
CLIENT_LIST = ['mysqlclient', 'mysqlclient_r', 'mysqld', 'mariadb',
- 'perconaserverclient', 'perconaserverclient_r']
+ 'mariadbclient', 'perconaserverclient',
'perconaserverclient_r']
for c in CLIENT_LIST:
if c in libraries:
client = c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mysqlclient-1.4.2/tests/test_MySQLdb_nonstandard.py
new/mysqlclient-1.4.6/tests/test_MySQLdb_nonstandard.py
--- old/mysqlclient-1.4.2/tests/test_MySQLdb_nonstandard.py 2019-01-17
13:30:38.000000000 +0100
+++ new/mysqlclient-1.4.6/tests/test_MySQLdb_nonstandard.py 2019-11-06
08:21:07.000000000 +0100
@@ -83,7 +83,7 @@
def test_server_info(self):
self.assertTrue(isinstance(self.conn.get_server_info(), str),
- "Should return an str.")
+ "Should return a string.")
def test_client_flag(self):
conn = connection_factory(