jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/572201 )
Change subject: [dependency] Combine mandatory dependencies
......................................................................
[dependency] Combine mandatory dependencies
Change-Id: Iecb55ba7c6722215cae63f1e0fbdcfd551f080c3
---
M setup.py
1 file changed, 4 insertions(+), 5 deletions(-)
Approvals:
Dvorapa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/setup.py b/setup.py
index d3b462c..8217c99 100644
--- a/setup.py
+++ b/setup.py
@@ -98,14 +98,13 @@
# ------- setup install_requires ------- #
# packages which are mandatory
+# version.package_version() uses pathlib which is a python 3 library.
+# pathlib2 is required for python 2.7
dependencies = ['requests>=2.20.1,<2.22.0; python_version ==
"3.4"',
'requests>=2.20.1; python_version != "3.4"',
'enum34>=1.1.6; python_version < "3"',
- 'ipaddress>=1.0.23; python_version < "3"']
-
-# version.package_version() uses pathlib which is a python 3 library.
-# pathlib2 is required for python 2.7
-dependencies.append('pathlib2;python_version<"3"')
+ 'ipaddress>=1.0.23; python_version < "3"',
+ 'pathlib2;python_version<"3"']
# Python versions before 2.7.9 will cause urllib3 to trigger
# InsecurePlatformWarning warnings for all HTTPS requests. By
--
To view, visit
https://gerrit.wikimedia.org/r/572201
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Iecb55ba7c6722215cae63f1e0fbdcfd551f080c3
Gerrit-Change-Number: 572201
Gerrit-PatchSet: 3
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot (75)