From a3d3c66c74afcd18581d6413abf114f1a1478be3 Mon Sep 17 00:00:00 2001
From: spl0k <alban.feron@gmail.com>
Date: Sat, 13 Apr 2019 16:19:02 +0200
Subject: [PATCH] watchdog is now required

Even if the watcher is unused, due to imports
---
 README.md               | 10 ++--------
 setup.py                |  9 ++-------
 travis-requirements.txt |  3 +--
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 3f424a0..d0ebab1 100644
--- a/README.md
+++ b/README.md
@@ -64,10 +64,9 @@ You'll need these to run _Supysonic_:
 * [Python Imaging Library](https://github.com/python-pillow/Pillow)
 * [requests](http://docs.python-requests.org/)
 * [mutagen](https://mutagen.readthedocs.io/en/latest/)
-* [watchdog](https://github.com/gorakhargosh/watchdog) (if you want to use the
-  [watcher](#watching-library-changes))
+* [watchdog](https://github.com/gorakhargosh/watchdog)
 
-All the dependencies (except _watchdog_) will automatically be installed by the
+All the dependencies will automatically be installed by the
 installation command above.
 
 You may also need a database specific package if you don't want to use SQLite
@@ -233,11 +232,6 @@ The watcher is `supysonic-watcher`, it is a non-exiting process. If you want to
 keep it running in background, either use the old `nohup` or `screen` methods,
 or start it as a simple _systemd_ unit (unit file not included).
 
-It needs some additional dependencies which can be installed with the following
-command:
-
-    $ pip install -e .[watcher]
-
 ## Upgrading
 
 To upgrade your _Supysonic_ installation, simply re-run the command you used to
diff --git a/setup.py b/setup.py
index 79416a8..d7baf49 100755
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 # This file is part of Supysonic.
 # Supysonic is a Python implementation of the Subsonic server API.
 #
-# Copyright (C) 2013-2018 Alban 'spl0k' Féron
+# Copyright (C) 2013-2019 Alban 'spl0k' Féron
 #                    2017 Óscar García Amor
 #
 # Distributed under terms of the GNU AGPLv3 license.
@@ -15,7 +15,6 @@ import supysonic as project
 from setuptools import setup
 from setuptools import find_packages
 
-
 reqs = [
     'flask>=0.11',
     'pony>=0.7.6',
@@ -23,11 +22,9 @@ reqs = [
     'requests>=1.0.0',
     'mutagen>=1.33',
     'scandir<2.0.0',
+    'watchdog>=0.8.0'
     'zipstream'
 ]
-extras = {
-    'watcher': [ 'watchdog>=0.8.0' ]
-}
 
 setup(
         name=project.NAME,
@@ -41,7 +38,6 @@ setup(
         license=project.LICENSE,
         packages=find_packages(exclude=['tests*']),
         install_requires = reqs,
-        extras_require = extras,
         scripts=['bin/supysonic-cli', 'bin/supysonic-watcher'],
         zip_safe=False,
         include_package_data=True,
@@ -63,4 +59,3 @@ setup(
             'Topic :: Multimedia :: Sound/Audio'
         ]
      )
-
diff --git a/travis-requirements.txt b/travis-requirements.txt
index f8a0e25..e8a0d74 100644
--- a/travis-requirements.txt
+++ b/travis-requirements.txt
@@ -1,6 +1,5 @@
--e .[watcher]
+-e .
 
 lxml
 coverage
 codecov
-