jenkins-bot has submitted this change and it was merged.

Change subject: Add all dependencies in setup.py&requirements.txt ......................................................................

Add all dependencies in setup.py&requirements.txt

Add setup.py extra dependencies: - daemonize - pydot - oursql - yahoo - google - irc - mwparserfromhell

Add test dependencies: - pywin32 - pywinauto

Add all dependencies to new file requirements.txt

Change-Id: Ie214e7666eb2d2bb967b3fb6420f733e5d8919e9 --- A requirements.txt M setup.py 2 files changed, 74 insertions(+), 2 deletions(-)

Approvals: John Vandenberg: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified

diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..08d005c --- /dev/null +++ b/requirements.txt @@ -0,0 +1,58 @@ +# This is a PIP requirements file +# +# All dependencies can be installed using: +# $ sudo pip install -r requirements.txt +# +# It is organised so that simple requirements +# are processed first, and more difficult packages +# are last. +# All dependencies other than httplib2 are optional. +# +# It is good practise to install packages using the system +# package manager if it has a packaged version. If you are +# unsure, please use pip as described at the top of the file. +# +# To get a list of potential matches, use +# +# $ awk -F '[#>=]' '{print $1}' requirements.txt | xargs yum search +# or +# $ awk -F '[#>=]' '{print $1}' requirements.txt | xargs apt-cache search + +# mandatory; see README.conversion.txt +httplib2>=0.9.0 + +# core option 'daemonize': +daemonize + +# core interwiki_graph.py: +pydot + +# core pagegenerators +yahoo +google + +# scripts/script_wui.py: +crontab + +# scipts/replicate_wiki.py +argparse + +# scripts/flickrripper.py +Pillow +flickrapi + +# scripts/tests/test_data_ingestion.py +test_utils + +# incomplete core component botirc +irc + +# textlib.py +mwparserfromhell>=0.3.3 + +# The mysql generator in pagegenerators depends on either oursql or MySQLdb +# pywikibot prefers oursql +oursql + +# scripts/script_wui.py depends on Lua, which is not available using pip +# but can be obtained from: https://github.com/bastibe/lunatic-python diff --git a/setup.py b/setup.py index 86102fb..df8abaa 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,16 @@

dependencies = ['httplib2>=0.6.0']

-extra_deps = {} +extra_deps = { + # Core library dependencies + 'daemonize': ['daemonize'], + 'Graphviz': ['pydot'], + 'MySQL': ['oursql'], + 'Yahoo': ['yahoo'], + 'Google': ['google'], + 'IRC': ['irc'], + 'mwparserfromhell': ['mwparserfromhell>=0.3.3'] +}

script_deps = { 'script_wui.py': ['irc', 'lunatic-python', 'crontab'], @@ -53,7 +62,12 @@ if os.name != 'nt': # See bug 66010, Windows users will have issues # when trying to build the C modules. - dependencies.append('mwparserfromhell>=0.3.3') + dependencies += extra_deps['mwparserfromhell'] + +if os.name == 'nt': + # FIXME: tests/ui_tests.py suggests pywinauto 0.4.2 + # which isnt provided on pypi. + test_deps += ['pywin32>=218', 'pywinauto>=0.4.0']

extra_deps.update(script_deps) # Add script dependencies as test dependencies,