jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/721260 )
Change subject: [7.0] Prepare next release
......................................................................
[7.0] Prepare next release
Change-Id: Ia8f6b1f37a464f39669e54929fcc671473b731ff
---
M .appveyor.yml
M HISTORY.rst
M ROADMAP.rst
M pwb.py
M pywikibot/__metadata__.py
M scripts/__init__.py
6 files changed, 28 insertions(+), 15 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.appveyor.yml b/.appveyor.yml
index 8fc763b..050712d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,7 +1,7 @@
image: Visual Studio 2019
clone_depth: 50
skip_tags: true
-version: 6.6.{build}
+version: 7.0.{build}
environment:
PYWIKIBOT_DIR: "%appdata%\\Pywikibot"
diff --git a/HISTORY.rst b/HISTORY.rst
index 9890a6a..1706147 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,6 +1,16 @@
Release history
^^^^^^^^^^^^^^^
+6.6.0
+-----
+*15 September 2021*
+
+* Drop piprop from meta=proofreadinfo API call (T290585)
+* Remove use_2to3 with setup.py (T290451)
+* Unify WbRepresentation's abstract method signature
+* L10N updates
+
+
6.5.0
-----
*05 August 2021*
diff --git a/ROADMAP.rst b/ROADMAP.rst
index 8cd6f51..9104fe8 100644
--- a/ROADMAP.rst
+++ b/ROADMAP.rst
@@ -1,10 +1,7 @@
Current release changes
^^^^^^^^^^^^^^^^^^^^^^^
-* Drop piprop from meta=proofreadinfo API call (T290585)
-* Remove use_2to3 with setup.py (T290451)
-* Unify WbRepresentation's abstract method signature
-* L10N updates
+* (No changes yet)
Deprecations
diff --git a/pwb.py b/pwb.py
index 698f051..f93eeb9 100755
--- a/pwb.py
+++ b/pwb.py
@@ -52,15 +52,21 @@
'misconfigured.\n'.format(wikibot_version, scripts_version))
# calculate previous minor release
- prev_wikibot = Version('{v.major}.{}.{v.micro}'
- .format(wikibot_version.minor - 1,
- v=wikibot_version,))
+ if wikibot_version.minor > 0:
+ prev_wikibot = Version('{v.major}.{}.{v.micro}'
+ .format(wikibot_version.minor - 1,
+ v=wikibot_version))
- if scripts_version.release < prev_wikibot.release:
- print('WARNING: Scripts package version {} is behind legacy Pywikibot '
- 'version {} and current version {}\nYour scripts may need an '
- 'update or be misconfigured.\n'
- .format(scripts_version, prev_wikibot, wikibot_version, ))
+ if scripts_version.release < prev_wikibot.release:
+ print('WARNING: Scripts package version {} is behind legacy '
+ 'Pywikibot version {} and current version {}\nYour scripts '
+ 'may need an update or be misconfigured.\n'
+ .format(scripts_version, prev_wikibot, wikibot_version))
+ elif scripts_version.release < wikibot_version.release:
+ print('WARNING: Scripts package version {} is behind current version '
+ '{}\nYour scripts may need an update or be misconfigured.\n'
+ .format(scripts_version, wikibot_version))
+
del Version
diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py
index 0020b1f..98f2899 100644
--- a/pywikibot/__metadata__.py
+++ b/pywikibot/__metadata__.py
@@ -11,7 +11,7 @@
__name__ = 'pywikibot'
-__version__ = '6.6.0'
+__version__ = '7.0.0.dev0'
__description__ = 'Python MediaWiki Bot Framework'
__maintainer__ = 'The Pywikibot team'
__maintainer_email__ = 'pywikibot(a)lists.wikimedia.org'
diff --git a/scripts/__init__.py b/scripts/__init__.py
index c9b7324..c99eb71 100644
--- a/scripts/__init__.py
+++ b/scripts/__init__.py
@@ -29,4 +29,4 @@
#
# Distributed under the terms of the MIT license.
#
-__version__ = '6.6.0'
+__version__ = '7.0.0'
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/721260
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: Ia8f6b1f37a464f39669e54929fcc671473b731ff
Gerrit-Change-Number: 721260
Gerrit-PatchSet: 3
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged