Merging mopidy-local-sqlite and mopidy-local-images into mopidy-local

.circleci/config.yml

@@ -0,0 +1,51 @@
+version: 2.1
+
+orbs:
+  codecov: codecov/codecov@1.0.5
+
+workflows:
+  version: 2
+  test:
+    jobs:
+      - py38
+      - py37
+      - black
+      - check-manifest
+      - flake8
+
+jobs:
+  py38: &test-template
+    docker:
+      - image: mopidy/ci-python:3.8
+    steps:
+      - checkout
+      - restore_cache:
+          name: Restoring tox cache
+          key: tox-v1-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.cfg" }}
+      - run:
+          name: Run tests
+          command: |
+            tox -e $CIRCLE_JOB -- \
+              --junit-xml=test-results/pytest/results.xml \
+              --cov-report=xml
+      - save_cache:
+          name: Saving tox cache
+          key: tox-v1-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.cfg" }}
+          paths:
+            - ./.tox
+            - ~/.cache/pip
+      - codecov/upload:
+          file: coverage.xml
+      - store_test_results:
+          path: test-results
+
+  py37:
+    <<: *test-template
+    docker:
+      - image: mopidy/ci-python:3.7
+
+  black: *test-template
+
+  check-manifest: *test-template
+
+  flake8: *test-template

.gitignore

@@ -1,8 +1,10 @@
-*.egg-info
 *.pyc
-.coverage
-.pytest_cache/
-.tox/
-MANIFEST
-build/
-dist/
+/*.egg-info
+/.coverage
+/.mypy_cache/
+/.pytest_cache/
+/.tox/
+/MANIFEST
+/build/
+/dist/
+/docs/_build/

CHANGELOG.rst

@@ -2,6 +2,14 @@
 Changelog
 *********
 
+v3.0.0a2 (UNRELEASED)
+=====================
+
+- Require Python >= 3.7.
+- Require Mopidy >= 3.0.0a5.
+- Require Pykka >= 2.0.1.
+- Update project setup.
+
 
 v3.0.0a1 (2019-08-04)
 =====================

MANIFEST.in

@@ -1,10 +1,17 @@
-include .travis.yml
-include CHANGELOG.rst
+include *.py
+include *.rst
+include .mailmap
 include LICENSE
 include MANIFEST.in
-include README.rst
-include mopidy_local/ext.conf
+include pyproject.toml
 include tox.ini
 
+recursive-include .circleci *
+recursive-include .github *
+
+include mopidy_*/ext.conf
+
 recursive-include tests *.py
 recursive-include tests/data *
+recursive-include mopidy_local/www *.html
+recursive-include mopidy_local/sql *.sql

README.rst

@@ -2,17 +2,17 @@
 Mopidy-Local
 ************
 
-.. image:: https://img.shields.io/pypi/v/Mopidy-Local.svg?style=flat
+.. image:: https://img.shields.io/pypi/v/Mopidy-Local
     :target: https://pypi.org/project/Mopidy-Local/
     :alt: Latest PyPI version
 
-.. image:: https://img.shields.io/travis/mopidy/mopidy-local/master.svg?style=flat
-    :target: https://travis-ci.org/mopidy/mopidy-local
-    :alt: Travis CI build status
+.. image:: https://img.shields.io/circleci/build/gh/tkem/mopidy-local
+    :target: https://circleci.com/gh/tkem/mopidy-local
+    :alt: CircleCI build status
 
-.. image:: https://img.shields.io/coveralls/mopidy/mopidy-local/master.svg?style=flat
-   :target: https://coveralls.io/r/mopidy/mopidy-local
-   :alt: Test coverage
+.. image:: https://img.shields.io/codecov/c/gh/tkem/mopidy-local
+    :target: https://codecov.io/gh/tkem/mopidy-local
+    :alt: Test coverage
 
 `Mopidy`_ extension for playing music from your local music archive.
 
@@ -108,9 +108,6 @@ The following configuration values are available:
 - ``local/enabled``: If the local extension should be enabled or not.
   Defaults to ``true``.
 
-- ``local/library``: Local library provider to use, change this if you want to
-  use a third party library for local files.
-
 - ``local/media_dir``: Path to directory with local media files.
 
 - ``local/scan_timeout``: Number of milliseconds before giving up scanning a
@@ -126,6 +123,20 @@ The following configuration values are available:
 - ``local/excluded_file_extensions``: File extensions to exclude when scanning
   the media directory. Values should be separated by either comma or newline.
 
+- ``local/directories``: List of top-level directory names and URIs
+  for browsing.
+
+- ``local/timeout``: Database connection timeout in seconds.
+
+- ``local/use_artist_sortname``: Whether to use the sortname field for
+  ordering artist browse results. Disabled by default, since this may
+  give confusing results if not all artists in the library have proper
+  sortnames.
+
+- ``album_art_files``: List of file names to check for when searching
+  for external album art. These may contain UNIX shell patterns,
+  i.e. ``*``, ``?``, etc.
+
 
 Usage
 =====
@@ -160,14 +171,6 @@ Mopidy's index of your local library, you need to rescan::
 
     mopidy local scan
 
-Note that if you are using the default local library storage, ``json``, you
-need to restart Mopidy after the scan completes for the updated index to be
-used.
-
-If you want index updates to come into effect immediately, you can try out
-`Mopidy-Local-SQLite <https://github.com/mopidy/mopidy-local-sqlite>`_, which
-will probably become the default backend in the near future.
-
 
 Project resources
 =================