[MediaWiki-commits] [Gerrit] update url regex - change (pywikibot...xqbot)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: update url regex
......................................................................


update url regex

Change-Id: Id106a6959586a0d38a59ac58dd02bf5c023bfc34
---
M checkvotes.py
M tests/checkvotes_tests.py
M tox.ini
3 files changed, 7 insertions(+), 7 deletions(-)

Approvals:
  Xqt: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/checkvotes.py b/checkvotes.py
index 0c80aeb..bfb1a9b 100644
--- a/checkvotes.py
+++ b/checkvotes.py
@@ -37,9 +37,7 @@
     '&params;': pagegenerators.parameterHelp
 }
 SB_TOOL_NEW = 'stimmberechtigung/'
-SB_TOOL = '~?stimmberechtigung/(?:index.php)?'
-SB_TOOL2 = 'stimmberechtigung/index.php'
-SB_TOOL3 = 'stimmberechtigung/'
+SB_TOOL = '~?stimmberechtigung(?:/|/index.php)?'
 
 
 def VotingPageGenerator():
diff --git a/tests/checkvotes_tests.py b/tests/checkvotes_tests.py
index 2ae9adc..027e404 100644
--- a/tests/checkvotes_tests.py
+++ b/tests/checkvotes_tests.py
@@ -14,7 +14,7 @@
 from tests import utils  # noqa
 from pywikibot.comms.http import fetch
 
-from checkvotes import SB_TOOL, SB_TOOL2, SB_TOOL3, SB_TOOL_NEW
+from checkvotes import SB_TOOL, SB_TOOL_NEW
 
 
 class TestPathsMeta(type):
@@ -37,7 +37,7 @@
 
             return test_tools_path
 
-        for i, tool in enumerate((SB_TOOL, SB_TOOL2, SB_TOOL3, SB_TOOL_NEW)):
+        for i, tool in enumerate((SB_TOOL, SB_TOOL_NEW)):
             test_name = 'test_SB_TOOL_' + str(i)
             dct[test_name] = test_method(tool)
 
diff --git a/tox.ini b/tox.ini
index 755bcda..2853b12 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,10 @@
 [tox]
-# Ensure 1.6+ is used to support 'skipsdist'
-minversion = 1.6
+# minversion = 1.7.2 needed for skip_missing_interpreters
+minversion = 1.7.2
 
 # Do not run install command
 skipsdist = True
+skip_missing_interpreters = True
 
 # Environements to execute when invoking 'tox'
 envlist = flake8,flake8-py3,py27,py34
@@ -49,6 +50,7 @@
 # P102,P103: string does contain unindexed parameters; see I36355923
 ignore = D211,E115,E266,E402,FI10,FI12,FI15,FI5,P102
 exclude = .tox,.git,./*.egg,ez_setup.py,build
+min-version = 2.7
 max_line_length = 80
 accept-encodings = utf-8
 require-code = true

-- 
To view, visit https://gerrit.wikimedia.org/r/291877
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id106a6959586a0d38a59ac58dd02bf5c023bfc34
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/bots/xqbot
Gerrit-Branch: master
Gerrit-Owner: Xqt <i...@gno.de>
Gerrit-Reviewer: Xqt <i...@gno.de>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits