Prepare v1.3.0.

.coveragerc

@@ -1,8 +1,2 @@
-[report]
-omit =
-    */pyshared/*
-    */python?.?/*
-    */site-packages/nose/*
-    */mopidy/*
-    */cachetools/*
-    */uritools/*
+[run]
+source = mopidy_internetarchive

.travis.yml

@@ -1,14 +1,26 @@
+sudo: false
+
 language: python
+
 python:
-- "2.7_with_system_site_packages"
+  - "2.7_with_system_site_packages"
+
+addons:
+  apt:
+    sources:
+      - mopidy-stable
+    packages:
+      - mopidy
+
+env:
+  - TOX_ENV=py27
+  - TOX_ENV=flake8
+
 install:
-- wget -O - http://apt.mopidy.com/mopidy.gpg | sudo apt-key add -
-- sudo wget -O /etc/apt/sources.list.d/mopidy.list http://apt.mopidy.com/mopidy.list
-- sudo apt-get update || true
-- sudo apt-get install mopidy
-- pip install .
-- pip install coverage coveralls
+  - "pip install tox"
+
 script:
-- nosetests --with-coverage --cover-package=mopidy_internetarchive
+  - "tox -e $TOX_ENV"
+
 after_success:
-- coveralls
+  - "if [ $TOX_ENV == 'py27' ]; then pip install --pre coveralls; coveralls; fi"

CHANGES.rst

@@ -1,21 +1,35 @@
-1.2.1 2015-03-25
-----------------
+v1.3.0 (2015-09-11)
+-------------------
+
+- Require Mopidy >= 1.1.
+
+- Use Mopidy proxy settings and HTTP User-Agent.
+
+- Fix track bitrates represented in Kbit/s.
+
+- Drop exact search support.
+
+- Only cache items.
+
+
+v1.2.1 (2015-03-25)
+-------------------
 
 - Remove search query normalization.
 
 - Prepare for Mopidy v1.0 exact search API.
 
 
-1.2.0 2015-03-19
-----------------
+v1.2.0 (2015-03-19)
+-------------------
 
 - Remove playlists provider.
 
 - Add bookmarks to root directory for browsing.
 
 
-1.1.0 2014-11-19
-----------------
+v1.1.0 (2014-11-19)
+-------------------
 
 - Load bookmarks as individual playlists.
 
@@ -26,16 +40,16 @@
 - Add HTTP connection retries.
 
 
-1.0.3 2014-11-14
-----------------
+v1.0.3 (2014-11-14)
+-------------------
 
 - Fix handling of re-derived VBR MP3 files.
 
 - Remove Ogg Vorbis from default audio formats.
 
 
-1.0.2 2014-11-07
-----------------
+v1.0.2 (2014-11-07)
+-------------------
 
 - Update dependencies.
 
@@ -48,21 +62,21 @@
 - Temporarily disable VBR MP3 and track comments.
 
 
-1.0.1 2014-09-29
-----------------
+v1.0.1 (2014-09-29)
+-------------------
 
 - Add item descriptions as track comments.
 
 - Filter search results for exact queries.
 
 
-1.0.0 2014-09-26
-----------------
+v1.0.0 (2014-09-26)
+-------------------
 
 - Major rewrite for version 1.0.0.
 
 
-0.5.0 2014-02-28
+v0.5.0 (2014-02-28)
 ----------------
 
 - Update `README` with link to documentation.
@@ -72,8 +86,8 @@
 - Allow empty queries for searching.
 
 
-0.4.0 2014-02-25
-----------------
+v0.4.0 (2014-02-25)
+-------------------
 
 - Various performance and stability improvements.
 
@@ -82,14 +96,14 @@
 - Add image URLs to albums.
 
 
-0.3.1 2014-02-21
-----------------
+v0.3.1 (2014-02-21)
+-------------------
 
 - Fix default configuration.
 
 
-0.3.0 2014-02-21
-----------------
+v0.3.0 (2014-02-21)
+-------------------
 
 - Add bookmark browsing support.
 
@@ -98,8 +112,8 @@
 - Stability and performance improvements.
 
 
-0.2.0 2014-01-31
-----------------
+v0.2.0 (2014-01-31)
+-------------------
 
 - Add library browsing support.
 
@@ -108,7 +122,7 @@
 - Properly quote/encode query terms.
 
 
-0.1.0 2014-01-24
-----------------
+v0.1.0 (2014-01-24)
+-------------------
 
 - Initial release.

LICENSE

@@ -175,28 +175,3 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2014, 2015 Thomas Kemmer <tkemmer@computer.org>
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

README.rst

@@ -1,8 +1,8 @@
 Mopidy-InternetArchive
 ========================================================================
 
-Mopidy-InternetArchive is a Mopidy_ extension for playing music and
-audio from the `Internet Archive`_.
+Mopidy-InternetArchive is a Mopidy_ extension for playing music from
+the `Internet Archive`_.
 
 
 Installation

docs/config.rst

@@ -86,7 +86,7 @@ Configuration Values
 
 .. confval:: internetarchive/cache_size
 
-   The number of items and search results to cache.
+   The number of Internet Archive items to cache in memory.
 
 .. confval:: internetarchive/cache_ttl
 

docs/index.rst

@@ -1,8 +1,8 @@
 Mopidy-InternetArchive
 ========================================================================
 
-Mopidy-InternetArchive is a Mopidy_ extension for playing music and
-audio from the `Internet Archive`_.
+Mopidy-InternetArchive is a Mopidy_ extension for playing music from
+the `Internet Archive`_.
 
 This extension lets you search for and stream recordings ranging from
 `alternative news programming`_, to `Grateful Dead concerts`_, to `Old

docs/intro.rst

@@ -59,7 +59,7 @@ within these.
 
 For practical and performance reasons, the number of audio items that
 will be shown within a collection is limited, e.g. you will not see
-all 132,887 items of the Live Music Archive [#footnote2]_.  The
+all 144,957 items of the Live Music Archive [#footnote2]_.  The
 :ref:`default configuration <defconf>` sets this limit to 100, but
 this can be changed with :confval:`internetarchive/browse_limit`.
 Items are selected based on popularity by default, i.e. the 100 most
@@ -122,4 +122,4 @@ Bookmarks*.
 
 .. [#footnote1] If you *really* don't like the Grateful Dead, for example.
 
-.. [#footnote2] As of 2014-09-26.
+.. [#footnote2] As of 2015-09-11.

docs/license.rst

@@ -1,7 +1,7 @@
 License
 ========================================================================
 
-Mopidy-InternetArchive is Copyright (c) 2014 Thomas Kemmer.
+Mopidy-InternetArchive is Copyright (c) 2014, 2015 Thomas Kemmer.
 
 Licensed under the Apache License, Version 2.0 (the "License"); you
 may not use this software except in compliance with the License.  You

mopidy_internetarchive/__init__.py

@@ -4,7 +4,7 @@
 
 from mopidy import config, ext
 
-__version__ = '1.2.1'
+__version__ = '1.3.0'
 
 SORT_FIELDS = ['%s %s' % (f, o) for o in ('asc', 'desc') for f in (
     'addeddate',

setup.cfg

@@ -1,5 +1,9 @@
 [flake8]
-exclude = .git,docs
+application-import-names = mopidy_local_sqlite,tests
+exclude = .git,.tox,docs
+
+[wheel]
+universal = 1
 
 [build_sphinx]
 source-dir = docs/

setup.py

@@ -8,7 +8,7 @@
 def get_version(filename):
     with open(filename) as fh:
         metadata = dict(re.findall("__([a-z]+)__ = '([^']+)'", fh.read()))
-        return metadata['version']
+    return metadata['version']
 
 setup(
     name='Mopidy-InternetArchive',
@@ -17,7 +17,9 @@ def get_version(filename):
     license='Apache License, Version 2.0',
     author='Thomas Kemmer',
     author_email='tkemmer@computer.org',
-    description='Mopidy extension for playing music and audio from the Internet Archive',  # noqa
+    description=(
+        'Mopidy extension for playing music from the Internet Archive'
+    ),
     long_description=open('README.rst').read(),
     packages=find_packages(exclude=['tests', 'tests.*']),
     zip_safe=False,
@@ -30,11 +32,6 @@ def get_version(filename):
         'cachetools >= 1.0',
         'uritools >= 1.0'
     ],
-    test_suite='nose.collector',
-    tests_require=[
-        'nose',
-        'mock >= 1.0',
-    ],
     entry_points={
         'mopidy.ext': [
             'internetarchive = mopidy_internetarchive:Extension',

tox.ini

@@ -0,0 +1,21 @@
+[tox]
+envlist = py27, flake8
+
+[testenv]
+sitepackages = true
+deps =
+    mock
+    mopidy==dev
+    pytest
+    pytest-cov
+    pytest-xdist
+install_command = pip install --allow-unverified=mopidy --pre {opts} {packages}
+commands =
+    py.test --basetemp={envtmpdir} --cov --cov-report=term-missing {posargs}
+
+[testenv:flake8]
+deps =
+    flake8
+    flake8-import-order
+skip_install = true
+commands = flake8