1
0
mirror of https://github.com/spl0k/supysonic.git synced 2024-11-09 19:52:16 +00:00

Rewritten dependencies and don't use pip as a library

Closes #97, #98
This commit is contained in:
spl0k 2018-04-29 14:51:30 +02:00
parent 366e350cd4
commit af50e8bf91
5 changed files with 30 additions and 16 deletions

View File

@ -4,7 +4,6 @@ python:
- 3.5 - 3.5
- 3.6 - 3.6
install: install:
- pip install -r requirements.txt - pip install -r travis-requirements.txt
- pip install lxml coverage codecov
script: coverage run setup.py test script: coverage run setup.py test
after_script: codecov after_script: codecov

View File

@ -55,11 +55,12 @@ You'll need these to run _Supysonic_:
* [Python Imaging Library](https://github.com/python-pillow/Pillow) * [Python Imaging Library](https://github.com/python-pillow/Pillow)
* [requests](http://docs.python-requests.org/) * [requests](http://docs.python-requests.org/)
* [mutagen](https://mutagen.readthedocs.io/en/latest/) * [mutagen](https://mutagen.readthedocs.io/en/latest/)
* [watchdog](https://github.com/gorakhargosh/watchdog) * [watchdog](https://github.com/gorakhargosh/watchdog) (if you want to use the
[watcher](#watching-library-changes))
You can install all of them using `pip`: You can install all of them using `pip`:
$ pip install -r requirements.txt $ pip install .
You may also need a database specific package: You may also need a database specific package:
@ -218,6 +219,11 @@ print anything to the console. If you want to keep it running in background,
either use the old `nohup` or `screen` methods, or start it as a simple either use the old `nohup` or `screen` methods, or start it as a simple
_systemd_ unit (unit file not included). _systemd_ unit (unit file not included).
It needs some additional dependencies which can be installed with the following
command:
$ pip install -e .[watcher]
## Upgrading ## Upgrading
Some commits might introduce changes in the database schema. When that's the Some commits might introduce changes in the database schema. When that's the

View File

@ -1,6 +0,0 @@
flask>=0.11
pony>=0.7.2
Pillow
requests>=1.0.0
mutagen>=1.33
watchdog>=0.8.0

View File

@ -14,10 +14,19 @@ import supysonic as project
from setuptools import setup from setuptools import setup
from setuptools import find_packages from setuptools import find_packages
from pip.req import parse_requirements
from pip.download import PipSession
reqs = [
'flask>=0.11',
'pony>=0.7.2',
'Pillow',
'requests>=1.0.0',
'mutagen>=1.33'
]
extras = {
'watcher': [ 'watchdog>=0.8.0' ]
}
setup( setup(
name=project.NAME, name=project.NAME,
version=project.VERSION, version=project.VERSION,
@ -29,13 +38,13 @@ setup(
url=project.URL, url=project.URL,
license=project.LICENSE, license=project.LICENSE,
packages=find_packages(), packages=find_packages(),
install_requires=[str(x.req) for x in install_requires = reqs,
parse_requirements('requirements.txt', session=PipSession())], extras_require = extras,
scripts=['bin/supysonic-cli', 'bin/supysonic-watcher'], scripts=['bin/supysonic-cli', 'bin/supysonic-watcher'],
zip_safe=False, zip_safe=False,
include_package_data=True, include_package_data=True,
test_suite="tests.suite", test_suite='tests.suite',
tests_require = [ 'lxml' ], tests_require = [ 'lxml' ] + [ r for er in extras.values() for r in er ],
classifiers=[ classifiers=[
'Development Status :: 3 - Alpha', 'Development Status :: 3 - Alpha',
'Environment :: Console', 'Environment :: Console',

6
travis-requirements.txt Normal file
View File

@ -0,0 +1,6 @@
-e .[watcher]
lxml
coverage
codecov