[9.0] Prepare Pywikibot 9

Also remove Python 3.6 tests from github action

Bug: T347026
Change-Id: I6a56f584e6d9f21f7a3cf88eb59f55711b01c66d
---
M .appveyor.yml
M ROADMAP.rst
M .github/workflows/doctest.yml
M .github/workflows/oauth_tests-ci.yml
M pywikibot/__metadata__.py
M .github/workflows/pywikibot-ci.yml
M HISTORY.rst
M scripts/__init__.py
M .github/workflows/login_tests-ci.yml
9 files changed, 42 insertions(+), 61 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 0673f20..b53a31c 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,7 +1,7 @@
 image: Visual Studio 2022
 clone_depth: 50
 skip_tags: true
-version: 8.6.{build}
+version: 9.0.{build}
 environment:
 
   PYWIKIBOT_DIR: "%appdata%\\Pywikibot"
@@ -15,17 +15,12 @@
   matrix:
 
     # Test the lowest supported release of each major Python version
+    # TODO: Python 3.7.0
 
-    - PYTHON: "C:\\Python361-x64"
-      PYTHON_VERSION: "3.6.1"
-      PYTHON_ARCH: "64"
+
 
     # AppVeyor pre-installs these versions onto build machines
 
-    - PYTHON: "C:\\Python36"
-      PYTHON_VERSION: "3.6.x"
-      PYTHON_ARCH: "32"
-
     - PYTHON: "C:\\Python37-x64"
       PYTHON_VERSION: "3.7.x"
       PYTHON_ARCH: "64"
@@ -61,8 +56,8 @@
   - git submodule update --init
   # Download the AppVeyor Python build accessories into subdirectory .\appveyor
   - mkdir appveyor
-  # Download Python 3.6.1 which isn't pre-installed
-  - ps: ./appveyor_install.ps1
+  # Download Python 3.7.0 which isn't pre-installed
+  # - ps: ./appveyor_install.ps1
   - python --version
   - python -c "import platform; print(platform.machine())"
   - python -c "import struct; print('PYTHON_ARCH:', struct.calcsize('P') << 3)"
diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml
index c6c649c..335addd 100644
--- a/.github/workflows/doctest.yml
+++ b/.github/workflows/doctest.yml
@@ -25,16 +25,9 @@
 
       matrix:
         os: [ "windows-latest", "macOS-latest", "ubuntu-latest" ]
-        python-version: ["pypy3.7", "3.11", "3.12"]
+        python-version: ["pypy3.7", "3.7", "3.11", "3.12"]
         include:
           - python-version: "3.13-dev"
-          # ubuntu-20.04 required for Python 3.6
-          - python-version: 3.6
-            os: windows-latest
-          - python-version: 3.6
-            os: macOS-latest
-          - python-version: 3.6
-            os: ubuntu-20.04
 
     steps:
     - name: Checkout Repository
diff --git a/.github/workflows/login_tests-ci.yml b/.github/workflows/login_tests-ci.yml
index 0fe95ca..a1f1f7c 100644
--- a/.github/workflows/login_tests-ci.yml
+++ b/.github/workflows/login_tests-ci.yml
@@ -26,17 +26,14 @@
         python-version: ["pypy3.7", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
         site: ['wikipedia:en', 'wikisource:zh']
         include:
-          # ubuntu-20.04 required for Python 3.6
-          - python-version: 3.6
+          - python-version: 3.7
             site: False
             family: wpbeta
             code: en
-            os: ubuntu-20.04
-          - python-version: 3.6
+          - python-version: 3.7
             site: False
             family: wpbeta
             code: zh
-            os: ubuntu-20.04
           - python-version: 3.8
             site: wsbeta:en
           - python-version: 3.7
@@ -45,9 +42,8 @@
             site: wikidata:test
           - python-version: 3.9
             site: wiktionary:ar
-          - python-version: 3.6
+          - python-version: 3.7
             site: wikidata:wikidata
-            os: ubuntu-20.04
           - python-version: 3.8
             site: wowwiki:uk
           - python-version: "3.12"
@@ -55,12 +51,6 @@
           - python-version: 3
             site: wikipedia:de
             os: macOS-latest
-          - python-version: 3.6
-            site: wikipedia:en
-            os: ubuntu-20.04
-          - python-version: 3.6
-            site: wikisource:zh
-            os: ubuntu-20.04
           - python-version: "3.13-dev"
             site: wikipedia:test
 
diff --git a/.github/workflows/oauth_tests-ci.yml b/.github/workflows/oauth_tests-ci.yml
index 8b62c44..497573c 100644
--- a/.github/workflows/oauth_tests-ci.yml
+++ b/.github/workflows/oauth_tests-ci.yml
@@ -29,21 +29,18 @@
         code: ['test']
         domain:  ['test.wikipedia.org']
         include:
-          # ubuntu-20.04 required for Python 3.6
-          - python-version: 3.6
+          - python-version: 3.7
             family: wpbeta
             code: en
             domain: en.wikipedia.beta.wmflabs.org
-            os: ubuntu-20.04
           - python-version: 3.7
             family: wpbeta
             code: zh
             domain: zh.wikipedia.beta.wmflabs.org
-          - python-version: 3.6
+          - python-version: 3.7
             family: wikipedia
             code: test
             domain: test.wikipedia.org
-            os: ubuntu-20.04
           - python-version: "3.13-dev"
             family: wikipedia
             code: test
diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml
index 1b4ff71..8d16258 100644
--- a/.github/workflows/pywikibot-ci.yml
+++ b/.github/workflows/pywikibot-ci.yml
@@ -30,19 +30,16 @@
         site: ['wikipedia:en', 'wikisource:zh']
         test_prod_only: [true]
         include:
-          # ubuntu-20.04 required for Python 3.6
           - python-version: 3.7
             site: wikipedia:test
-          - python-version: 3.6
+          - python-version: 3.7
             site: False
             family: wpbeta
             code: en
-            os: ubuntu-20.04
-          - python-version: 3.6
+          - python-version: 3.7
             site: False
             family: wpbeta
             code: zh
-            os: ubuntu-20.04
           - python-version: 3.8
             site: wsbeta:en
           - python-version: 3.7
@@ -50,22 +47,13 @@
           - python-version: 3.9
             site: wiktionary:ar
             test_no_rc: true
-          - python-version: 3.6
+          - python-version: 3.7
             site: wikidata:wikidata
-            os: ubuntu-20.04
           - python-version: 3.8
             site: wowwiki:uk
           - python-version: 3
             site: wikipedia:de
             os: macOS-latest
-          - python-version: 3.6
-            site: wikipedia:en
-            test_prod_only: true
-            os: ubuntu-20.04
-          - python-version: 3.6
-            site: wikisource:zh
-            test_prod_only: true
-            os: ubuntu-20.04
           - python-version: "3.12"  # 3.12 fails due to T337748
             site: wikipedia:en
             test_prod_only: true
diff --git a/HISTORY.rst b/HISTORY.rst
index a3133e5..2bb6dc5 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,6 +1,19 @@
 Release history
 ===============
 
+8.6.0
+-----
+*05 December 2023*
+
+* Lazy load imageinfo metadata (:phab:`T253591`)
+* Fetch URL of page scan via :api:`imageforpage` in :mod:`proofreadpage` module
+  (:phab:`T114318`, :phab:`T181913`, :phab:`T352524`)
+* Sort page names before loading pages in :mod:`proofreadpage` module
+* L10N and i18n updates
+* check for valid family and site option after ``-help`` is processed (:phab:`T350756`)
+* Handle canary events in comms.eventstreams (:phab:`T350756`)
+
+
 8.5.1
 -----
 *11. November 2023*
diff --git a/ROADMAP.rst b/ROADMAP.rst
index 23093c8..48a51a0 100644
--- a/ROADMAP.rst
+++ b/ROADMAP.rst
@@ -1,14 +1,7 @@
 Current release
 ---------------
 
-* Lazy load imageinfo metadata (:phab:`T253591`)
-* Fetch URL of page scan via :api:`imageforpage` in :mod:`proofreadpage` module
-  (:phab:`T114318`, :phab:`T181913`, :phab:`T352524`)
-* Sort page names before loading pages in :mod:`proofreadpage` module
-* L10N and i18n updates
-* check for valid family and site option after ``-help`` is processed (:phab:`T350756`)
-* Handle canary events in comms.eventstreams (:phab:`T350756`)
-* **Python 3.6 support will be discontinued** and this is the last version supporting it.
+* **Python 3.6 support is be discontinued**
 
 
 Deprecations
diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py
index 9fac5d4..2bd4393 100644
--- a/pywikibot/__metadata__.py
+++ b/pywikibot/__metadata__.py
@@ -11,7 +11,7 @@
 
 
 __name__ = 'pywikibot'
-__version__ = '8.6.0'
+__version__ = '9.0.0.dev0'
 __description__ = 'Python MediaWiki Bot Framework'
 __maintainer__ = 'The Pywikibot team'
 __maintainer_email__ = 'pywikibot@lists.wikimedia.org'
diff --git a/scripts/__init__.py b/scripts/__init__.py
index 70309c2..b5d5586 100644
--- a/scripts/__init__.py
+++ b/scripts/__init__.py
@@ -29,4 +29,4 @@
 #
 # Distributed under the terms of the MIT license.
 #
-__version__ = '8.6.0'
+__version__ = '9.0.0'

