Dalba has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/403140 )
Change subject: Drop support for Python 3.3
......................................................................
Drop support for Python 3.3
Bug: T184505
Bug: T184508
Change-Id: I61c94c4324b717e6b6b9ed95278714752e4d6888
---
M .appveyor.yml
M .travis.yml
M docs/index.rst
M pwb.py
M pywikibot/README.rst
M pywikibot/tools/__init__.py
M requests-requirements.txt
M requirements.txt
M setup.py
9 files changed, 9 insertions(+), 49 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/40/403140/1
diff --git a/.appveyor.yml b/.appveyor.yml
index d45d987..0256134 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -30,20 +30,12 @@
PYTHON_VERSION: "2.7.2"
PYTHON_ARCH: "32"
- - PYTHON: "C:\\Python330"
- PYTHON_VERSION: "3.3.0"
- PYTHON_ARCH: "32"
-
- PYTHON: "C:\\Python340"
PYTHON_VERSION: "3.4.0"
PYTHON_ARCH: "32"
- PYTHON: "C:\\Python272-x64"
PYTHON_VERSION: "2.7.2"
- PYTHON_ARCH: "64"
-
- - PYTHON: "C:\\Python330-x64"
- PYTHON_VERSION: "3.3.0"
PYTHON_ARCH: "64"
- PYTHON: "C:\\Python340-x64"
@@ -54,10 +46,6 @@
- PYTHON: "C:\\Python27"
PYTHON_VERSION: "2.7.x"
- PYTHON_ARCH: "32"
-
- - PYTHON: "C:\\Python33"
- PYTHON_VERSION: "3.3.x"
PYTHON_ARCH: "32"
- PYTHON: "C:\\Python34"
@@ -74,10 +62,6 @@
- PYTHON: "C:\\Python27-x64"
PYTHON_VERSION: "2.7.x"
- PYTHON_ARCH: "64"
-
- - PYTHON: "C:\\Python33-x64"
- PYTHON_VERSION: "3.3.x"
PYTHON_ARCH: "64"
- PYTHON: "C:\\Python34-x64"
diff --git a/.travis.yml b/.travis.yml
index 0585bf0..20b2e0a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,6 @@
python:
- '2.6'
- '2.7'
- - '3.3'
- '3.4'
- '3.5'
- '3.6'
@@ -145,14 +144,10 @@
# Disabled due to T173498
#- python: '2.7'
# env: LANGUAGE=en FAMILY=wpbeta SITE_ONLY=1
OAUTH_DOMAIN="en.wikipedia.beta.wmflabs.org"
- #- python: '3.3'
- # env: LANGUAGE=zh FAMILY=wpbeta SITE_ONLY=1
OAUTH_DOMAIN="zh.wikipedia.beta.wmflabs.org"
- python: '3.4'
env: LANGUAGE=en FAMILY=wsbeta SITE_ONLY=1
- python: '2.7'
env: LANGUAGE=wikia FAMILY=wikia PYWIKIBOT2_TEST_NO_RC=1
- - python: '3.3'
- env: LANGUAGE=en FAMILY=musicbrainz SITE_ONLY=1
# Disabled due to T173498
#- python: '3.4'
# env: LANGUAGE=test FAMILY=wikipedia SITE_ONLY=1
OAUTH_DOMAIN="test.wikipedia.org"
diff --git a/docs/index.rst b/docs/index.rst
index 55fff71..7e02c1d 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -12,7 +12,7 @@
Pywikibot is a full-stack framework for editing `MediaWiki
<https://mediawiki.org>`_ wiki's. (more intro)
-Pywikibot supports Python 2.6.5+, 2.7.2+ and 3.3+.
+Pywikibot supports Python 2.6.5+, 2.7.2+ and 3.4+.
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.
diff --git a/pwb.py b/pwb.py
index 2f495ce..e01e655 100755
--- a/pwb.py
+++ b/pwb.py
@@ -37,14 +37,14 @@
Pywikibot not available on:
%s
-Pywikibot is only supported under Python 2.6.5+, 2.7.2+ or 3.3+
+Pywikibot is only supported under Python 2.6.5+, 2.7.2+ or 3.4+
"""
def python_is_supported():
"""Check that Python is supported."""
# Any change to this must be copied to setup.py
- return (PYTHON_VERSION >= (3, 3, 0) or
+ return (PYTHON_VERSION >= (3, 4, 0) or
(PY2 and PYTHON_VERSION >= (2, 7, 2)) or
(PY26 and PYTHON_VERSION >= (2, 6, 5)))
diff --git a/pywikibot/README.rst b/pywikibot/README.rst
index 225eca8..a9dd281 100644
--- a/pywikibot/README.rst
+++ b/pywikibot/README.rst
@@ -32,7 +32,7 @@
You need to have at least python version `2.6.5
<http://www.python.org/download/>`_
or newer installed on your computer to be able to run any of the code in this
-package, but not 3.0-3.2. It works fine with 3.3-3.4 versions of python
installed.
+package, but not 3.0-3.3. It works fine with 3.4+ versions of python installed.
Support for older versions of python is not planned. Some scripts could run
with
older python releases. Please refer the manual at mediawiki for further details
and restrictions.
diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py
index 8acdf51..0dfa12c 100644
--- a/pywikibot/tools/__init__.py
+++ b/pywikibot/tools/__init__.py
@@ -109,7 +109,7 @@
except ImportError:
warn("""
pywikibot support of Python 2.6 relies on package future for many features.
-Please upgrade to Python 2.7+ or Python 3.3+, or run:
+Please upgrade to Python 2.7+ or Python 3.4+, or run:
"pip install future>=0.15.0"
""", RuntimeWarning)
try:
@@ -1222,8 +1222,6 @@
Safely return function Signature object (PEP 362).
inspect.signature was introduced in 3.3, however backports are available.
- In Python 3.3, it does not support all types of callables, and should
- not be relied upon. Python 3.4 works correctly.
Any exception calling inspect.signature is ignored and None is returned.
diff --git a/requests-requirements.txt b/requests-requirements.txt
index 94cf204..65edabb 100644
--- a/requests-requirements.txt
+++ b/requests-requirements.txt
@@ -3,9 +3,7 @@
# requests security extra
# Bug T105767 on Python 2.7 release 9+
pyOpenSSL>=0.14,!=17.2.0 ; python_full_version < '2.7.9' or python_version >
'3.3'
-pyOpenSSL<17.5.0 ; python_version == '3.3'
cryptography>=1.3.4 ; python_full_version < '2.7.9' or python_version > '3.3'
-cryptography>=1.3.4,<2.0 ; python_version == '3.3'
idna>=2.0.0 ; python_full_version < '2.7.9' or python_version >= '3'
# https://github.com/eliben/pycparser/issues/147
pycparser != 2.14
diff --git a/requirements.txt b/requirements.txt
index 7d1d29d..15bca2c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -23,9 +23,7 @@
# requests security extra
pyOpenSSL>=0.14,!=17.2.0 ; python_full_version < '2.7.9'
-PyOpenSSL<17.5.0 ; python_version == '3.3'
cryptography>=1.3.4 ; python_full_version < '2.7.9'
-cryptography>=1.3.4,<2.0 ; python_version == '3.3'
idna>=2.0.0 ; python_full_version < '2.7.9'
# https://github.com/eliben/pycparser/issues/147
pycparser != 2.14
@@ -73,8 +71,7 @@
# If you see that on Python 2, change this to flickrapi==1.4.5
# On Python 3, force pip to install requests 2.2.1, or remove flickrapi below.
flickrapi>=1.4.5,<2 ; python_version < '2.7'
-flickrapi<2.3.1 ; python_version == '3.3'
-flickrapi ; python_version >= '2.7' and python_version != '3.3'
+flickrapi ; python_version >= '2.7'
# incomplete core component botirc
irc ; python_version > '2.6'
diff --git a/setup.py b/setup.py
index 00972fc..f97583a 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@
Pywikibot not available on:
%s
-Pywikibot is only supported under Python 2.6.5+, 2.7.2+ or 3.3+
+Pywikibot is only supported under Python 2.6.5+, 2.7.2+ or 3.4+
"""
@@ -73,13 +73,6 @@
'MySQL': ['oursql'],
'unicode7': ['unicodedata2>=7.0.0-2'],
})
-elif PYTHON_VERSION[:2] == (3, 3):
- # requests[security] requires cryptography, but cryptography 2.0+ does not
- # support Python 3.3; T178241
- extra_deps['security'].append('cryptography<2.0')
- # PyOpenSSL is required by requests[security] but has dropped support for
- # Python 3.3 since version 17.5.0 (2017-11-30); T181912
- extra_deps['security'].append('PyOpenSSL<17.5.0')
script_deps = {
'flickrripper.py': ['Pillow<3.5.0' if PY26 else 'Pillow'],
@@ -95,12 +88,8 @@
# and will be first packaged for Fedora Core 21.
# flickrapi 1.4.x does not run on Python 3, and setuptools can only
# select flickrapi 2.x for Python 3 installs.
-# flickrapi 2.3.1 dropped support for Python 3.3.
-if PYTHON_VERSION[:2] == (3, 3):
- script_deps['flickrripper.py'].append('flickrapi<2.3.1')
-else:
- script_deps['flickrripper.py'].append(
- 'flickrapi>=1.4.5,<2' if PY26 else 'flickrapi')
+script_deps['flickrripper.py'].append(
+ 'flickrapi>=1.4.5,<2' if PY26 else 'flickrapi')
# lunatic-python is only available for Linux
if sys.platform.startswith('linux'):
@@ -266,7 +255,6 @@
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
- 'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
--
To view, visit https://gerrit.wikimedia.org/r/403140
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I61c94c4324b717e6b6b9ed95278714752e4d6888
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
