OpenLP

Merge lp:~raoul-snyman/openlp/pymysql into lp:openlp

  1. pymysql
  2. Merge into trunk
Proposed by Raoul Snyman
Status: Merged
Merged at revision: 2895
Proposed branch: lp:~raoul-snyman/openlp/pymysql
Merge into: lp:openlp
Diff against target: 38 lines (+3/-3)
3 files modified
openlp/core/lib/db.py (+1/-1)
scripts/check_dependencies.py (+1/-1)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~raoul-snyman/openlp/pymysql
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Review via email: mp+371851@code.launchpad.net

This proposal supersedes a proposal from 2019-08-26.

Commit message

Change MySQL-Connector optional dependency to pymysql, a pure-Python MySQL client.

Description of the change

Change MySQL-Connector optional dependency to pymysql, a pure-Python MySQL client.

To post a comment you must log in.
Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal

JavaScript tests failed, please see https://ci.openlp.io/job/MP-02-JavaScript-Tests/6/ for more details

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

JavaScript tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Linux tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

macOS tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Linting passed!

Revision history for this message
Tim Bentley (trb143) wrote :

Approved

Revision history for this message
Tim Bentley (trb143) wrote :

Approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/core/lib/db.py'
2--- openlp/core/lib/db.py 2019-07-03 13:23:23 +0000
3+++ openlp/core/lib/db.py 2019-08-27 04:42:28 +0000
4@@ -67,7 +67,7 @@
5 create_database(engine.url)
6 database_exists(engine.url) #=> True
7
8- Borrowed from SQLAlchemy_Utils (v0.32.14 )since we only need this one function.
9+ Borrowed from SQLAlchemy_Utils (v0.32.14) since we only need this one function.
10 """
11
12 url = copy(make_url(url))
13
14=== modified file 'scripts/check_dependencies.py'
15--- scripts/check_dependencies.py 2019-07-01 22:48:52 +0000
16+++ scripts/check_dependencies.py 2019-08-27 04:42:28 +0000
17@@ -97,7 +97,7 @@
18
19 OPTIONAL_MODULES = [
20 ('qdarkstyle', '(dark style support)'),
21- ('mysql.connector', '(MySQL support)'),
22+ ('pymysql', '(MySQL support)'),
23 ('pyodbc', '(ODBC support)'),
24 ('psycopg2', '(PostgreSQL support)'),
25 ('enchant', '(spell checker)'),
26
27=== modified file 'setup.py'
28--- setup.py 2019-07-02 20:29:42 +0000
29+++ setup.py 2019-08-27 04:42:28 +0000
30@@ -191,7 +191,7 @@
31 extras_require={
32 'agpl-pdf': ['PyMuPDF'],
33 'darkstyle': ['QDarkStyle'],
34- 'mysql': ['mysql-connector-python'],
35+ 'mysql': ['pymysql'],
36 'odbc': ['pyodbc'],
37 'postgresql': ['psycopg2'],
38 'spellcheck': ['pyenchant >= 1.6'],