jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/495739 )
Change subject: mysql: remove traces of 'oursql' dependency
......................................................................
mysql: remove traces of 'oursql' dependency
72f072f0c removed code relying on importing 'oursql' in favor of the
pure python module PyMySql.
Stop adding 'oursql' to setuptools extra_requires['MySQL'].
Bug: T89976
Bug: T142021
Change-Id: Ic85174ef4aaf9272b71e469afa6781597c698ca6
---
M setup.py
1 file changed, 0 insertions(+), 3 deletions(-)
Approvals:
Dvorapa: Looks good to me, but someone else must approve
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/setup.py b/setup.py
index 0e41237..ce1b87e 100644
--- a/setup.py
+++ b/setup.py
@@ -73,7 +73,6 @@
# Additional core library dependencies which are only available on Python 2
extra_deps.update({
'csv': ['unicodecsv'],
- 'MySQL': ['oursql'],
})
script_deps = {
@@ -153,8 +152,6 @@
# so all scripts can be compiled for script_tests, etc.
if 'PYSETUP_TEST_EXTRAS' in os.environ:
test_deps += [i for k, v in extra_deps.items() if k != 'flake8' for i in v]
- if 'oursql' in test_deps and os.name == 'nt':
- test_deps.remove('oursql') # depends on Cython
if 'requests[security]' in test_deps:
# Bug T105767 on Python 2.7 release 9+
--
To view, visit https://gerrit.wikimedia.org/r/495739
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic85174ef4aaf9272b71e469afa6781597c698ca6
Gerrit-Change-Number: 495739
Gerrit-PatchSet: 1
Gerrit-Owner: Hashar <hashar(a)free.fr>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/495457 )
Change subject: pwb.py: Add ability to display similar scripts when misspelled
......................................................................
pwb.py: Add ability to display similar scripts when misspelled
Implemented the difflib.get_close_matches function to find the
similar scripts. The 'cutoff' and 'n' parameters are set as 0.7
and 10 respectively based on observations.
Bug: T217195
Change-Id: I23d5aa14b358ae9b13221f24f38f6091ad8698ed
---
M CREDITS
M pwb.py
2 files changed, 19 insertions(+), 0 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CREDITS b/CREDITS
index fb66ea8..6df9eab 100644
--- a/CREDITS
+++ b/CREDITS
@@ -116,6 +116,7 @@
murfel
MuhammadShuaib
Nicolas Dumazet
+Nikhil Prakash
Nikiwiki
notconfusing
Nullzero
diff --git a/pwb.py b/pwb.py
index 601fa44..1316bda 100755
--- a/pwb.py
+++ b/pwb.py
@@ -16,6 +16,7 @@
from __future__ import (absolute_import, division,
print_function, unicode_literals)
+from difflib import get_close_matches
from importlib import import_module
import os
import sys
@@ -195,6 +196,23 @@
else:
print('ERROR: {} not found! Misspelling?'.format(filename),
file=sys.stderr)
+
+ scripts = []
+ for file_package in script_paths:
+ path = file_package.split('.')
+ for script_name in os.listdir(os.path.join(*path)):
+ if script_name.endswith('.py'):
+ scripts.append(script_name)
+
+ similar_scripts = get_close_matches(filename, scripts,
+ n=10, cutoff=0.7)
+
+ if similar_scripts:
+ print(
+ '\nThe most similar {}:'
+ .format('script is' if len(similar_scripts) == 1
+ else 'scripts are'))
+ print('\t' + '\n\t'.join(similar_scripts))
return True
# When both pwb.py and the filename to run are within the current
--
To view, visit https://gerrit.wikimedia.org/r/495457
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I23d5aa14b358ae9b13221f24f38f6091ad8698ed
Gerrit-Change-Number: 495457
Gerrit-PatchSet: 18
Gerrit-Owner: Nikhil <nikhil07prakash(a)gmail.com>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Nikhil <nikhil07prakash(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot (75)
Gerrit-CC: Welcome, new contributor! <ssethi(a)wikimedia.org>
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/495709 )
Change subject: tox: stop setting a default command
......................................................................
tox: stop setting a default command
The default testenv defines a default command which might have
unattended effect. A current example is the envlist defining
'doctest-py27' and 'doctest-py34', they are not matched by the section
[testenv:doctest] and end runnining the default command.
Prefix py27 and py34 with 'test-', tox will thus generate a factor named
'test' which we can use to define a command for.
Change-Id: Ic907ea89d8b6d96efe1bf3149cc637c9d33cc627
---
M tox.ini
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tox.ini b/tox.ini
index 02f2d86..0aeba1e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@
flake8
pyflakes-{py27,py3,pypy}
doctest-{py27,py34}
- py27,py34
+ test-{py27,py34}
[tox:jenkins]
# Override default for WM Jenkins
@@ -28,7 +28,8 @@
VIRTUAL_ENV={envdir}
PYWIKIBOT_NO_USER_CONFIG=2
usedevelop = True
-commands = python setup.py test
+commands =
+ test: python setup.py test
[testenv:diff-checker]
deps = unidiff
--
To view, visit https://gerrit.wikimedia.org/r/495709
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic907ea89d8b6d96efe1bf3149cc637c9d33cc627
Gerrit-Change-Number: 495709
Gerrit-PatchSet: 1
Gerrit-Owner: Hashar <hashar(a)free.fr>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/495701 )
Change subject: tox: split envlist to one entry per line
......................................................................
tox: split envlist to one entry per line
When a list is rather long, it is easier to read when each element is on
its own line. Diff are also easier to read when the list are altered.
Split elements from tox.ini 'envlist'.
Change-Id: I144717f05ed3c5a7409a9d6c13e0b61767fb42d3
---
M tox.ini
1 file changed, 12 insertions(+), 2 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tox.ini b/tox.ini
index 216e276..02f2d86 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,12 +3,22 @@
minversion = 1.7.2
skipsdist = True
skip_missing_interpreters = True
-envlist = diff-checker,commit-message,flake8,pyflakes-{py27,py3,pypy},doctest-{py27,py34},py27,py34
+envlist =
+ diff-checker
+ commit-message
+ flake8
+ pyflakes-{py27,py3,pypy}
+ doctest-{py27,py34}
+ py27,py34
[tox:jenkins]
# Override default for WM Jenkins
# Others are run in their own individual jobs on WM Jenkins
-envlist = diff-checker,commit-message,flake8,pyflakes-{py3,pypy}
+envlist =
+ diff-checker
+ commit-message
+ flake8
+ pyflakes-{py3,pypy}
[params]
doctest_skip = --ignore-files=(gui\.py|botirc\.py|eventstreams\.py)
--
To view, visit https://gerrit.wikimedia.org/r/495701
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I144717f05ed3c5a7409a9d6c13e0b61767fb42d3
Gerrit-Change-Number: 495701
Gerrit-PatchSet: 1
Gerrit-Owner: Hashar <hashar(a)free.fr>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/495514 )
Change subject: Updated message for Serbian per content of sandbox on wiki
......................................................................
Updated message for Serbian per content of sandbox on wiki
Change-Id: Ice18570405a2fd5d1ec233be1ae23de3bdcf0d78
---
M scripts/clean_sandbox.py
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Zoranzoki21: Looks good to me, but someone else must approve
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/clean_sandbox.py b/scripts/clean_sandbox.py
index d47ec0f..52a1d9c 100755
--- a/scripts/clean_sandbox.py
+++ b/scripts/clean_sandbox.py
@@ -110,7 +110,8 @@
'simple': '{{subst:/Text}}',
'sco': '{{subst:Saundbox}}',
'shn': '{{subst:Sandbox reset}}',
- 'sr': '{{песак}}\n<!-- Молимо, испробавајте испод ове линије. Хвала. -->',
+ 'sr': '{{песак}}\n'
+ '<!-- Молимо, увежбавајте уређивање испод ове линије. Хвала. -->',
'sv': '{{subst:Sandlådan}}',
'th': '{{กระบะทราย}}\n<!-- กรุณาอย่าแก้ไขบรรทัดนี้ ขอบคุณครับ/ค่ะ -- '
'Please leave this line as they are. Thank you! -->',
--
To view, visit https://gerrit.wikimedia.org/r/495514
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice18570405a2fd5d1ec233be1ae23de3bdcf0d78
Gerrit-Change-Number: 495514
Gerrit-PatchSet: 4
Gerrit-Owner: Zoranzoki21 <zorandori4444(a)gmail.com>
Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com>
Gerrit-Reviewer: jenkins-bot (75)
Gerrit-CC: Acamicamacaraca <acamicamaca006(a)gmail.com>
Gerrit-CC: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-CC: Framawiki <framawiki(a)tools.wmflabs.org>