Cleanup packaging.

- Single requirements file
- Requirements in setup.py
- Improved Makefile

.flake8

@@ -0,0 +1,7 @@
+[flake8]
+ignore =
+    # Ignore "and" at start of line.
+    W503
+    # Ignore "do not assign a lambda expression, use a def".
+    E731
+max-line-length = 120

MANIFEST.in

@@ -1,8 +1,20 @@
-include LICENSE
-include README.rst
-include ChangeLog
-include initd/*
+# Doc
+include ChangeLog LICENSE README.rst
 include man/*
-include mpdlcd.conf
-include requirements.txt
-recursive-include tests *.py
+
+# Packaging
+include initd/* mpdlcd.conf
+
+# Build/test
+include Makefile .flake8
+include requirements_dev.txt
+
+# Package
+graft mpdlcd
+graft tests
+
+# Remove temporary files
+global-exclude *.py[cod] __pycache__ *.so .*.sw[op]
+
+# Remove files useless in a sdist
+exclude .travis.yml

Makefile

@@ -1,24 +1,46 @@
-all: default
+PACKAGE = mpdlcd
+TESTS_DIR = tests
 
+FLAKE8 = flake8
 
-PACKAGE=mpdlcd
 
+# Default targets
+# ===============
 
+all: default
 default:
 
+.PHONY: all default
+
+
+# Packaging
+# =========
 
 clean:
 	find . -type f -name '*.pyc' -delete
+	find . -type f -path '*/__pycache__/*' -delete
+	find . -type d -empty -delete
+
+update:
+	pip install --upgrade pip setuptools
+	pip install --upgrade -r requirements_dev.txt
+	pip freeze
+
+release:
+	fullrelease
+
+.PHONY: clean update release
+
 
+# Tests and quality
+# =================
 
 test:
 	python -W default setup.py test
 
-coverage:
-	coverage erase
-	coverage run "--include=$(PACKAGE)/*.py,tests/*.py" --branch setup.py test
-	coverage report "--include=$(PACKAGE)/*.py,tests/*.py"
-	coverage html "--include=$(PACKAGE)/*.py,tests/*.py"
+lint:
+	$(FLAKE8) --config .flake8 $(PACKAGE)
+	check-manifest
 
 
-.PHONY: all default clean coverage doc test
+.PHONY: test lint

requirements_dev.txt

@@ -0,0 +1,6 @@
+-e .
+
+check-manifest
+coverage
+flake8
+zest.releaser[recommended]

setup.py

@@ -1,5 +1,4 @@
 #!/usr/bin/python
-# -*- coding: utf-8 -*-
 # Copyright (c) 2011-2015 Raphaël Barrois
 
 import codecs
@@ -24,21 +23,7 @@ def get_version(package_name):
     return '0.1.0'
 
 
-def parse_requirements(requirements_file):
-    with codecs.open(requirements_file, 'r', 'utf-8') as f:
-        return [line for line in f if line.strip() and not line.startswith('#')]
-
-
-if sys.version_info[0:2] < (2, 7):
-    extra_tests_require = ['unittest2', 'mock']
-elif sys.version_info[0] < 3:
-    extra_tests_require = ['mock']
-else:
-    extra_tests_require = []
-
-
 PACKAGE = 'mpdlcd'
-REQUIREMENTS_PATH = 'requirements.txt'
 
 
 setup(
@@ -56,14 +41,17 @@ def parse_requirements(requirements_file):
     setup_requires=[
         'setuptools>=0.8',
     ],
-    install_requires=parse_requirements(REQUIREMENTS_PATH),
-    tests_require=[] + extra_tests_require,
+    install_requires=[
+        'lcdproc',
+        'python_mpd2',
+    ],
+    tests_require=[],
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: No Input/Output (Daemon)',
         'Intended Audience :: End Users/Desktop',
         'Operating System :: OS Independent',
-        'Programming Language :: Python',
+        'Programming Language :: Python :: 3 :: Only',
         'Topic :: Multimedia :: Sound/Audio',
     ],
     test_suite='tests',