jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/508116 )
Change subject: [cleanup] Cleanup dependency_links in setup.py
......................................................................
[cleanup] Cleanup dependency_links in setup.py
- pywinauto and pywin32 are available via pypi
- dependency_links wheren't processed since pip 1.4 due to a missing
--process-dependency-links option and is droppend since pip 19.0
Change-Id: I5580cc31204a1ee21dc79302b6aee0fbbef1bb44
---
M setup.py
1 file changed, 7 insertions(+), 15 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/setup.py b/setup.py
index c9f205d..766d5b9 100644
--- a/setup.py
+++ b/setup.py
@@ -93,18 +93,6 @@
if sys.platform.startswith('linux'):
script_deps['script_wui.py'] = ['irc', 'lunatic-python',
'crontab']
-# The main pywin32 repository contains a Python 2 only setup.py with a small
-# wrapper setup3.py for Python 3.
-#
http://pywin32.hg.sourceforge.net:8000/hgroot/pywin32/pywin32
-# The main pywinauto repository doesn't support Python 3.
-# The repositories used below have a Python 3 compliant setup.py
-dependency_links = [
- 'git+https://github.com/AlereDevices/lunatic-python.git#egg='
- 'lunatic-python',
- 'hg+https://bitbucket.org/TJG/pywin32#egg=pywin32',
- 'git+https://github.com/vasily-v-ryabov/pywinauto-64#egg=pywinauto',
-]
-
if PY2:
# 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.
@@ -150,8 +138,13 @@
# Microsoft makes available a compiler for Python 2.7
#
http://www.microsoft.com/en-au/download/details.aspx?id=44266
if os.name == 'nt' and os.environ.get('PYSETUP_TEST_NO_UI', '0')
!= '1':
- # which isn't provided on pypi.
- test_deps += ['pywin32', 'pywinauto>=0.4.0']
+ if PYTHON_VERSION >= (3, 5, 0) or PY2:
+ pywinauto = 'pywinauto>0.6.4'
+ pywin32 = 'pywin32>220'
+ else: # Python 3.4
+ pywinauto = 'pywinauto<=0.6.4'
+ pywin32 = 'pywin32<=220'
+ test_deps += [pywin32, pywinauto]
extra_deps.update(script_deps)
@@ -227,7 +220,6 @@
if package.startswith('pywikibot.')],
python_requires='>=2.7.4, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
install_requires=dependencies,
- dependency_links=dependency_links,
extras_require=extra_deps,
url='https://www.mediawiki.org/wiki/Manual:Pywikibot'bot',
download_url='https://tools.wmflabs.org/pywikibot/'ot/',
--
To view, visit
https://gerrit.wikimedia.org/r/508116
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: I5580cc31204a1ee21dc79302b6aee0fbbef1bb44
Gerrit-Change-Number: 508116
Gerrit-PatchSet: 7
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot (75)