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

Change subject: Use hg repository for flickrapi on py3 ......................................................................

Use hg repository for flickrapi on py3

The packaged flickrapi does not support py3 and forcibly exits setup.py. The hg repository for flickrapi does include py3 support.

Also print setuptools version in travis builds.

Change-Id: I4649765068cb7879dbf83b546d518b4fd58b6ce8 --- M .travis.yml M setup.py 2 files changed, 10 insertions(+), 5 deletions(-)

Approvals: XZise: Looks good to me, approved jenkins-bot: Verified

diff --git a/.travis.yml b/.travis.yml index a4f914d..918f5f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,7 @@ - cd ../..

- if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then export PY3=1; fi + - python -c "import setuptools; print(setuptools.__version__)"

script: - if [[ "$USE_NOSE" == "1" ]]; then nosetests -v -a '!site,!net' tests; else python setup.py test; fi diff --git a/setup.py b/setup.py index df8abaa..3c75371 100644 --- a/setup.py +++ b/setup.py @@ -37,6 +37,12 @@ # however it is available with setuptools. }

+dependency_links=[ + 'https://git.wikimedia.org/zip/?r=pywikibot/externals/httplib2.git&format...', + 'git+https://github.com/AlereDevices/lunatic-python.git#egg=lunatic-python', + 'git+https://github.com/jayvdb/parse-crontab.git#egg=crontab', +] + if sys.version_info[0] == 2: if sys.version_info < (2, 6, 5): raise RuntimeError("ERROR: Pywikibot only runs under Python 2.6.5 or higher") @@ -58,6 +64,8 @@ if sys.version_info[1] < 3: print("ERROR: Python 3.3 or higher is required!") sys.exit(1) + + dependency_links.append('hg+https://bitbucket.org/sybren/flickrapi#egg=flickrapi')

if os.name != 'nt': # See bug 66010, Windows users will have issues @@ -112,12 +120,8 @@ for package in find_packages() if package.startswith('pywikibot.')], install_requires=dependencies, + dependency_links=dependency_links, extras_require=extra_deps, - dependency_links=[ - 'https://git.wikimedia.org/zip/?r=pywikibot/externals/httplib2.git&format...', - 'git+https://github.com/AlereDevices/lunatic-python.git#egg=lunatic-python', - 'git+https://github.com/jayvdb/parse-crontab.git#egg=crontab', - ], url='https://www.mediawiki.org/wiki/Pywikibot', download_url='https://github.com/wikimedia/pywikibot-core/archive/master.zip#egg=pywikibot...', test_suite="tests.collector",