jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/370166 )

Change subject: [DOC] core release is 3.0
......................................................................


[DOC] core release is 3.0

The current core release is 3.0 and the older 2.0 branch has been deleted.

Change-Id: Iea4599da6c52ee2dfdb5ea3a26ae9a8f2f439bb5
---
M README-conversion.txt
M README.rst
M pywikibot/bot.py
M pywikibot/i18n.py
M scripts/commonscat.py
M scripts/maintenance/compat2core.py
6 files changed, 12 insertions(+), 13 deletions(-)

Approvals:
  Merlijn van Deen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/README-conversion.txt b/README-conversion.txt
index d2fd9ee..d89dec1 100644
--- a/README-conversion.txt
+++ b/README-conversion.txt
@@ -1,7 +1,7 @@
 This is a guide to converting bot scripts from version 1 of the
-Pywikibot framework to version 2.
+Pywikibot framework to version 3.
 
-Most importantly, note that the version 2 framework *only* supports wikis
+Most importantly, note that the version 3 framework *only* supports wikis
 using MediaWiki v.1.14 or higher software.  If you need to access a wiki that
 uses older software, you should continue using version 1 for this purpose.
 
@@ -150,5 +150,3 @@
 now need only that the titles be wrapped in quotes, as:
 
     python unlink.py "A title"
-
-# MORE TO COME #
diff --git a/README.rst b/README.rst
index 4294017..7858840 100644
--- a/README.rst
+++ b/README.rst
@@ -70,13 +70,13 @@
     |    pwb.py                 | Wrapper script to use Pywikibot in 
'directory' mode  |
     
+---------------------------+------------------------------------------------------+
     |    README-conversion.txt  | Guide to converting bot scripts from version 
1       |
-    |                           | of the Pywikibot framework to version 2      
        |
+    |                           | of the Pywikibot framework to version 3      
        |
     
+---------------------------+------------------------------------------------------+
     |    README.rst             | Short info string used by Pywikibot 
Nightlies        |
     
+---------------------------+------------------------------------------------------+
     |    requirements.txt       | PIP requirements file                        
        |
     
+---------------------------+------------------------------------------------------+
-    |    setup.py               | Installer script for Pywikibot 2.0 framework 
        |
+    |    setup.py               | Installer script for Pywikibot 3.0 framework 
        |
     
+---------------------------+------------------------------------------------------+
     |    user-config.py.sample  | Example user-config.py file for reference    
        |
     
+---------------------------+------------------------------------------------------+
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index 500fb5d..c2ba886 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -316,7 +316,7 @@
     if not http or not hasattr(http, 'threads') or not len(http.threads):
         return
 
-    log(u'=== Pywikibot framework v2.0 -- Logging header ===')
+    log(u'=== Pywikibot framework v3.0 -- Logging header ===')
 
     # script call
     log(u'COMMAND: {0}'.format(sys.argv))
diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py
index 5eaf069..241a819 100644
--- a/pywikibot/i18n.py
+++ b/pywikibot/i18n.py
@@ -6,8 +6,8 @@
 and for TranslateWiki-based translations.
 
 By default messages are assumed to reside in a package called
-'scripts.i18n'. In pywikibot 2.0, that package is not packaged
-with pywikibot, and pywikibot 2.0 does not have a hard dependency
+'scripts.i18n'. In pywikibot 3.0, that package is not packaged
+with pywikibot, and pywikibot 3.0 does not have a hard dependency
 on any i18n messages. However, there are three user input questions
 in pagegenerators which will use i18 messages if they can be loaded.
 
diff --git a/scripts/commonscat.py b/scripts/commonscat.py
index 63d8eef..e192065 100755
--- a/scripts/commonscat.py
+++ b/scripts/commonscat.py
@@ -378,7 +378,7 @@
     def findCommonscatLink(self, page=None):
         """Find CommonsCat template on interwiki pages.
 
-        In Pywikibot 2.0, page.interwiki() now returns Link objects,
+        In Pywikibot >=2.0, page.interwiki() now returns Link objects,
         not Page objects
 
         @rtype: unicode, name of a valid commons category
diff --git a/scripts/maintenance/compat2core.py 
b/scripts/maintenance/compat2core.py
index 6ec2fea..161baee 100755
--- a/scripts/maintenance/compat2core.py
+++ b/scripts/maintenance/compat2core.py
@@ -1,15 +1,16 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 """
-A helper script to convert compat 1.0 scripts to the new core 2.0 framework.
+A helper script to convert compat 1.0 scripts to the new core 3.0 framework.
 
 NOTE: Please be aware that this script is not able to convert your codes
 completely. It may support you with some automatic replacements and it gives
 some warnings and hints for converting. Please refer to the converting guide
-README-conversion.txt in the core framework folder and check your codes 
finally.
+README-conversion.txt in the core framework folder and check your codes
+finally.
 
 The scripts asks for the .py file and converts it to
-<scriptname>-core.py in the same directory. The following options are 
supported:
+<scriptname>-core.py in the same directory. The following option is supported:
 
 - warnonly: Do not convert the source but show warning messages. This is good
             to check already merged scripts.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iea4599da6c52ee2dfdb5ea3a26ae9a8f2f439bb5
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <i...@gno.de>
Gerrit-Reviewer: John Vandenberg <jay...@gmail.com>
Gerrit-Reviewer: Magul <tomasz.magul...@gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhall...@arctus.nl>
Gerrit-Reviewer: Mpaa <mpaa.w...@gmail.com>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
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

Reply via email to