jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/447480 )
Change subject: isbn_tests.py: Suppress stdnum stdnum.isbn ImportWarning
......................................................................
isbn_tests.py: Suppress stdnum stdnum.isbn ImportWarning
Also, fix the typo in the word "documention" in aspects.py.
Bug: T195825
Change-Id: Iccab75e0f9b89b41ee668c902f87498cf663cc06
---
M tests/aspects.py
M tests/isbn_tests.py
2 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/aspects.py b/tests/aspects.py
index b7bcb07..e634b92 100644
--- a/tests/aspects.py
+++ b/tests/aspects.py
@@ -817,8 +817,6 @@
'sites', 'family', 'code', 'dry', 'hostname', 'oauth',
'hostnames', 'cached', 'cacheinfo', 'wikibase'):
if hasattr(base, key) and key not in dct:
- # print('%s has %s; copying to %s'
- # % (base.__name__, key, name))
dct[key] = getattr(base, key)
# Will be inserted into dct[sites] later
@@ -967,7 +965,7 @@
@staticmethod
def add_method(dct, test_name, method, doc=None, doc_suffix=None):
- """Add a method to a dictionary and set its name and documention."""
+ """Set method's __name__ and __doc__ and add it to dct."""
dct[test_name] = method
# it's explicitly using str() because __name__ must be str
dct[test_name].__name__ = str(test_name)
diff --git a/tests/isbn_tests.py b/tests/isbn_tests.py
index 621ce38..5bb57b9 100644
--- a/tests/isbn_tests.py
+++ b/tests/isbn_tests.py
@@ -23,6 +23,7 @@
main
)
+from tests import patch, Mock
from tests.aspects import (
unittest, TestCase, DefaultDrySiteTestCase,
WikibaseTestCase, ScriptMainTestCase,
@@ -35,6 +36,8 @@
AnyIsbnValidationException = IsbnExc
+# Suppress ImportWarning: package stdnum.isbn not found; using scripts.isbn
+@patch('pywikibot.cosmetic_changes.warn', Mock())
class TestCosmeticChangesISBN(DefaultDrySiteTestCase):
"""Test CosmeticChanges ISBN fix."""
--
To view, visit https://gerrit.wikimedia.org/r/447480
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: Iccab75e0f9b89b41ee668c902f87498cf663cc06
Gerrit-Change-Number: 447480
Gerrit-PatchSet: 4
Gerrit-Owner: Dalba <dalba.wiki(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
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/444557 )
Change subject: [bugfix] Skip test_allpages_langlinks_enabled on beta wikis
......................................................................
[bugfix] Skip test_allpages_langlinks_enabled on beta wikis
Skip TestSiteGenerators.test_allpages_langlinks_enabled test for
wpbeta and wsbeta. Seems language links are outside the given family.
Bug: T199085
Change-Id: Iab47b645b5e2f1ce602ecfd4f0c3e1b28f6538dd
---
M tests/site_tests.py
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Dalba: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/site_tests.py b/tests/site_tests.py
index b11501b..e7bf22f 100644
--- a/tests/site_tests.py
+++ b/tests/site_tests.py
@@ -672,6 +672,8 @@
def test_allpages_langlinks_enabled(self):
"""Test allpages with langlinks enabled."""
mysite = self.get_site()
+ if mysite.family.name in ('wpbeta', 'wsbeta'):
+ raise unittest.SkipTest('Test fails on betawikis; T199085')
for page in mysite.allpages(
filterlanglinks=True, total=3, namespace=4):
self.assertIsInstance(page, pywikibot.Page)
--
To view, visit https://gerrit.wikimedia.org/r/444557
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: Iab47b645b5e2f1ce602ecfd4f0c3e1b28f6538dd
Gerrit-Change-Number: 444557
Gerrit-PatchSet: 3
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com>
Gerrit-Reviewer: jenkins-bot
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/447040 )
Change subject: Require cryptography<2.3 for Python 2.7.6 or older
......................................................................
Require cryptography<2.3 for Python 2.7.6 or older
We could also use cryptography<=2.3, but then we would have to silence the
deprecation warning in our code which needs extra work.
I believe this is enough for most pywikibot users, others should simply
override the requirement or upgrade their python version.
No need to install cryptography or idna for python 3. Fix the requirement
discrepancy between requests-requirements.txt and requirements.txt
Bug: T199959
Change-Id: I1632be7078bb0820d3d3feaaa3a0ddf0eff87503
---
M requests-requirements.txt
M requirements.txt
2 files changed, 5 insertions(+), 3 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/requests-requirements.txt b/requests-requirements.txt
index a1e6994..98c4f2c 100644
--- a/requests-requirements.txt
+++ b/requests-requirements.txt
@@ -4,8 +4,9 @@
# requests security extra
# Bug T105767 on Python 2.7 release 9+
-cryptography>=1.3.4 ; python_full_version < '2.7.9' or python_version > '3.3'
+cryptography>=1.3.4 ; python_full_version == '2.7.7' or python_full_version == '2.7.8'
+cryptography>=1.3.4,<2.3 ; python_full_version <= '2.7.6'
pyOpenSSL>=0.14,!=17.2.0 ; python_full_version < '2.7.9'
-idna>=2.0.0 ; python_full_version < '2.7.9' or python_version >= '3'
+idna>=2.0.0 ; python_full_version < '2.7.9'
# https://github.com/eliben/pycparser/issues/147
pycparser != 2.14
diff --git a/requirements.txt b/requirements.txt
index 75c17c1..18c5c52 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -22,7 +22,8 @@
requests>=2.9,!=2.18.2
# requests security extra
-cryptography>=1.3.4 ; python_full_version < '2.7.9'
+cryptography>=1.3.4 ; python_full_version == '2.7.7' or python_full_version == '2.7.8'
+cryptography>=1.3.4,<2.3 ; python_full_version <= '2.7.6'
pyOpenSSL>=0.14,!=17.2.0 ; python_full_version < '2.7.9'
idna>=2.0.0 ; python_full_version < '2.7.9'
--
To view, visit https://gerrit.wikimedia.org/r/447040
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: I1632be7078bb0820d3d3feaaa3a0ddf0eff87503
Gerrit-Change-Number: 447040
Gerrit-PatchSet: 3
Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: Dalba <dalba.wiki(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
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/446688 )
Change subject: [doc] update site.user()
......................................................................
[doc] update site.user()
As I can see it returns a string, not an User object
Change-Id: I6a854b197a6b93da2cf7b36bc1435fdaae136da0
---
M pywikibot/site.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Dvorapa: Looks good to me, but someone else must approve
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/site.py b/pywikibot/site.py
index f504133..ea6c6b3 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -884,7 +884,7 @@
self._pagemutex = threading.Lock()
def user(self):
- """Return the currently-logged in bot user, or None."""
+ """Return the currently-logged in bot username, or None."""
if self.logged_in(True):
return self._username[True]
elif self.logged_in(False):
--
To view, visit https://gerrit.wikimedia.org/r/446688
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: I6a854b197a6b93da2cf7b36bc1435fdaae136da0
Gerrit-Change-Number: 446688
Gerrit-PatchSet: 1
Gerrit-Owner: Framawiki <framawiki(a)tools.wmflabs.org>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
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