jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/676438 )
Change subject: [doc] Additional doc from mediawiki
......................................................................
[doc] Additional doc from mediawiki
See https://www.mediawiki.org/wiki/Manual:Pywikibot/Overview
Also
- fix flake8 bugbear dependency
- use strftime('%Y') for current copyright year
Change-Id: Ifb92d192a85f7a5485568e237c143dd13407d6a8
---
M docs/conf.py
M docs/index.rst
M pywikibot/__metadata__.py
M setup.py
4 files changed, 26 insertions(+), 8 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docs/conf.py b/docs/conf.py
index c9a39d9..265636b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -79,7 +79,7 @@
# built documents.
#
# The short X.Y version.
-version = pywikibot.__version__
+version = pywikibot.__version__.partition('.dev')[0]
# The full version, including alpha/beta/rc tags.
release = pywikibot.__version__
diff --git a/docs/index.rst b/docs/index.rst
index 3607626..22ceaa0 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,5 +1,7 @@
-Welcome to Pywikibot!
-=====================
+Pywikibot 6.1.0 Documentation
+=============================
+
+Welcome! This is the documentation for Pywikibot 6.1.0.
.. note::
@@ -10,12 +12,27 @@
`Manual:Pywikibot on mediawiki.org <https://www.mediawiki.org/wiki/Manual:Pywikibot>`_
+**Pywikibot** is a Python library and collection of tools that automate work
+on `MediaWiki <https://mediawiki.org>`_ sites. Originally designed for
+Wikipedia, it is now used throughout the Wikimedia Foundation's projects and
+on many other MediaWiki wikis.
-Pywikibot is a Python library and collection of scripts that automate work on `MediaWiki <https://mediawiki.org>`_ sites.
+The project started in 2003 and is currently on core version 6.1.0.
+It features full API usage and is up-to-date with new MediaWiki features and
+a Pythonic package layout. But it also works with older installations of
+MediaWiki 1.23 or higher.
-Pywikibot supports Python 3.5+.
+Pywikibot supports Microsoft Windows, macOS and Linux when used with a
+compatible version of Python. It should also work on any other operating
+system that has a compatible version of Python installed. To check
+whether you have Python installed and to find its version, just type
+``python`` at the CMD or shell prompt.
-Pywikibot and this documentation are licensed under the :ref:`MIT license <licenses-MIT>`;
+Python 3.5 or higher is currently required to run the bot, but Python 3.6
+or higher is recommended.
+
+Pywikibot and this documentation are licensed under the
+:ref:`MIT license <licenses-MIT>`;
manual pages on mediawiki.org are licensed under the `CC-BY-SA 3.0`_ license.
The documentation consists of four major parts:
diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py
index 9c335de..45e3e59 100644
--- a/pywikibot/__metadata__.py
+++ b/pywikibot/__metadata__.py
@@ -4,6 +4,7 @@
#
# Distributed under the terms of the MIT license.
#
+from time import strftime
__name__ = 'pywikibot'
__version__ = '6.1.0.dev0'
__description__ = 'Python MediaWiki Bot Framework'
@@ -12,7 +13,7 @@
__license__ = 'MIT License'
__url__ = 'https://www.mediawiki.org/wiki/Manual:Pywikibot'
__download_url__ = 'https://pywikibot.toolforge.org/'
-__copyright__ = '(C) Pywikibot team, 2003-2021'
+__copyright__ = '(C) Pywikibot team, 2003-' + strftime('%Y')
__keywords__ = 'API bot client framework mediawiki pwb pybot python pywiki ' \
'pywikibase pywikibot pywikipedia pywikipediabot wiki ' \
'wikibase wikidata wikimedia wikipedia'
diff --git a/setup.py b/setup.py
index 6e60450..58d111e 100644
--- a/setup.py
+++ b/setup.py
@@ -72,7 +72,7 @@
'flake8>=3.7.5',
'pydocstyle>=4.0.0',
'hacking',
- 'flake8-bugbear',
+ 'flake8-bugbear!=21.4.1',
'flake8-coding',
'flake8-colors>=0.1.9',
'flake8-comprehensions>=3.1.4;python_version>="3.8"',
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/676438
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: Ifb92d192a85f7a5485568e237c143dd13407d6a8
Gerrit-Change-Number: 676438
Gerrit-PatchSet: 8
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/676313 )
Change subject: [doc] Update ROADMAP.rst
......................................................................
[doc] Update ROADMAP.rst
- add changelog
- add deprecation warnings
- highlight dependency changes
- fix RuntimeError message gui.py
Change-Id: I7f4447a7aaf56ba4d7ccb1861123890394b63bbd
---
M ROADMAP.rst
M pywikibot/userinterfaces/gui.py
2 files changed, 12 insertions(+), 1 deletion(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ROADMAP.rst b/ROADMAP.rst
index cea9631..b47f76d 100644
--- a/ROADMAP.rst
+++ b/ROADMAP.rst
@@ -1,6 +1,14 @@
Current release changes
~~~~~~~~~~~~~~~~~~~~~~~
+* Require **Pillow**>=8.1.1 due to vulnerability found (T278743)
+* TkDialog of GUI userinterface requires **Python 3.6+** (T278743)
+* Enable textlib.extract_templates_and_params with **wikitextparser** package
+* Add support for **PyMySQL** 1.0.0+
+* Exclude expressions from parsed template in **mwparserfromhell** (T71384)
+* Provide an object representation for DequeGenerator
+* Allow deleting any subclass of BasePage by title (T278659)
+* Add support for API:Revisiondelete with Site.deleterevs() method (T276726)
* L10N updates
* Family files can be collected from a zip folder (T278076)
* Deprecated getuserinfo and getglobaluserinfo Site methods were removed
@@ -9,6 +17,9 @@
Future release notes
~~~~~~~~~~~~~~~~~~~~
+* 6.0.1: Site.undeletepage() and Site.undelete_file_versions() will be removed in favour of Site.undelete() method
+* 6.0.1: Site.deletepage() and Site.deleteoldimage() will be removed in favour of Site.delete() method
+* 6.0.1: DataSite.createNewItemFromPage() method will be removed in favour of ImagePage.fromPage() (T98663)
* 6.0.0: User.name() method will be removed in favour of User.username property
* 5.6.0: pagenenerators.handleArg() method will be removed in favour of handle_arg() (T271437)
* 5.6.0: Family.ignore_certificate_error() method will be removed in favour of verify_SSL_certificate() (T265205)
diff --git a/pywikibot/userinterfaces/gui.py b/pywikibot/userinterfaces/gui.py
index 0f0b488..1b32aac 100644
--- a/pywikibot/userinterfaces/gui.py
+++ b/pywikibot/userinterfaces/gui.py
@@ -564,7 +564,7 @@
# vulnerability found in Pillow<8.1.1
from sys import version
raise RuntimeError(
- 'This script requires Python 3.5+ for GUI support.\n'
+ 'This script requires Python 3.6+ for GUI support.\n'
'{version} is not supported. Please update your Python.'
.format(version=version.split(maxsplit=1)[0])
)
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/676313
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: I7f4447a7aaf56ba4d7ccb1861123890394b63bbd
Gerrit-Change-Number: 676313
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/676368 )
Change subject: [doc] use a more readable scheme for sphinx
......................................................................
[doc] use a more readable scheme for sphinx
Change-Id: Ic3728568123ea1d89c23ef9a4019ca773d6a59fb
---
M docs/conf.py
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docs/conf.py b/docs/conf.py
index 7d4363a..c9a39d9 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -38,7 +38,7 @@
# If your documentation needs a minimal Sphinx version, state it here.
#
-# needs_sphinx = '1.0'
+needs_sphinx = '1.8'
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
@@ -60,8 +60,7 @@
# The suffix(es) of source filenames.
# You can specify multiple suffix as a list of string:
#
-# source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
+source_suffix = ['.rst', '.md']
# The encoding of source files.
#
@@ -142,7 +141,7 @@
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
-html_theme = 'alabaster'
+html_theme = 'nature'
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/676368
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: Ic3728568123ea1d89c23ef9a4019ca773d6a59fb
Gerrit-Change-Number: 676368
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged