jenkins-bot merged this change.

View Change

Approvals: Huji: Looks good to me, approved jenkins-bot: Verified
[Python3] require enum34 for Python 2.7

Bug: T213287
Change-Id: I25916860cc19ae4a9b52b432a021798adf3149df
---
M HISTORY.rst
M requirements.txt
M setup.py
3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 02893b9..27968bc 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,6 +4,7 @@
Current release
---------------

+* enum34 package is mandatory for Python 2.7
* Implement deletedrevisions api call (T75370)
* assert_valid_iter_params may raise AssertionError instead of pywikibot.Error (T233582)
* Upcast getRedirectTarget result and return the appropriate page subclass (T233392)
diff --git a/requirements.txt b/requirements.txt
index 5f56895..c666b1e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -20,7 +20,7 @@

# mandatory; see README.conversion.txt
requests>=2.20.0
-
+enum34
# requests security extra
requests[security] ; python_full_version > '2.7.6' and python_full_version < '2.7.9'

diff --git a/setup.py b/setup.py
index 9c4b393..de86399 100644
--- a/setup.py
+++ b/setup.py
@@ -94,7 +94,7 @@
extra_deps.update(script_deps)

# ------- setup install_requires ------- #
-dependencies = ['requests>=2.20.0']
+dependencies = ['requests>=2.20.0', 'enum34>=1.1.6; python_version < "3"']
# tools.ip does not have a hard dependency on an IP address module,
# as it falls back to using regexes if one is not available.
# The functional backport of py3 ipaddress is acceptable:

To view, visit change 538244. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I25916860cc19ae4a9b52b432a021798adf3149df
Gerrit-Change-Number: 538244
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info@gno.de>
Gerrit-Reviewer: Dvorapa <dvorapa@seznam.cz>
Gerrit-Reviewer: Huji <huji.huji@gmail.com>
Gerrit-Reviewer: jenkins-bot (75)