Reorganize package structure. Use coverage in tox.ini

Author: rnixx

.gitignore

@@ -3,19 +3,20 @@
 # Packages
 *.egg
 *.egg-info
-/dist
-/build
-/eggs
-/parts
-/bin
-/var
-/sdist
-/develop-eggs
+/.eggs/
+/dist/
+/build/
+/eggs/
+/parts/
+/bin/
+/var/
+/sdist/
+/develop-eggs/
+/lib/
+/lib64/
+/include/
+/local/
 /.installed.cfg
-/lib
-/lib64
-/include
-/local
 
 # Installer logs
 /pip-selfcheck.json
@@ -25,6 +26,7 @@
 /.coverage
 /.tox
 /nosetests.xml
+/coverage_html/
 
 # Sphinx docs
 /doc/_build

.travis.yml

@@ -9,4 +9,4 @@ python:
   - "3.5"
   - "pypy"
 
-script: python mpd_test.py
+script: python -m unittest mpd.tests

mpd/__init__.py

@@ -0,0 +1,29 @@
+# python-mpd2: Python MPD client library
+#
+# Copyright (C) 2008-2010  J. Alexander Treuman <[email protected]>
+# Copyright (C) 2012  J. Thalheim <[email protected]>
+# Copyright (C) 2016  Robert Niederreiter <[email protected]>
+#
+# python-mpd2 is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# python-mpd2 is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with python-mpd2.  If not, see <http://www.gnu.org/licenses/>.
+
+from mpd.base import CommandError
+from mpd.base import CommandListError
+from mpd.base import ConnectionError
+from mpd.base import IteratingError
+from mpd.base import MPDClient
+from mpd.base import MPDError
+from mpd.base import PendingCommandError
+from mpd.base import ProtocolError
+from mpd.base import VERSION
+

mpd.py mpd/base.py

@@ -1,6 +1,8 @@
 # python-mpd2: Python MPD client library
+#
 # Copyright (C) 2008-2010  J. Alexander Treuman <[email protected]>
 # Copyright (C) 2012  J. Thalheim <[email protected]>
+# Copyright (C) 2016  Robert Niederreiter <[email protected]>
 #
 # python-mpd2 is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by

mpd_test.py mpd/tests.py

@@ -39,7 +39,7 @@ class TestMPDClient(unittest.TestCase):
     longMessage = True
 
     def setUp(self):
-        self.socket_patch = mock.patch("mpd.socket")
+        self.socket_patch = mock.patch("mpd.base.socket")
         self.socket_mock = self.socket_patch.start()
         self.socket_mock.getaddrinfo.return_value = [range(5)]
 

setup.cfg

@@ -1,5 +1,5 @@
 [sdist]
-formats=bztar,gztar,zip
+formats = bztar,gztar,zip
 
 [build_sphinx]
 source-dir = doc/
@@ -8,3 +8,6 @@ all_files = 1
 
 [upload_sphinx]
 upload-dir = doc/_build/html
+
+[easy_install]
+

setup.py

@@ -1,14 +1,20 @@
 #! /usr/bin/env python
 
-from distutils.core import setup
 from setuptools import Extension
+from setuptools import find_packages
+from setuptools import setup
 from setuptools.command.test import test as TestCommand
-import sys,os
 import mpd
+import os
+import sys
+
 
 if sys.version_info[0] == 2:
     from io import open
 
+
+VERSION = ".".join(map(str, mpd.VERSION))
+
 CLASSIFIERS = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
@@ -23,6 +29,7 @@
 LICENSE = """\
 Copyright (C) 2008-2010  J. Alexander Treuman <[email protected]>
 Copyright (C) 2012  J. Thalheim <[email protected]>
+Copyright (C) 2016  Robert Niederreiter <[email protected]>
 
 python-mpd2 is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -36,37 +43,43 @@
 along with python-mpd2.  If not, see <http://www.gnu.org/licenses/>.\
 """
 
+
 class Tox(TestCommand):
+
     def finalize_options(self):
         TestCommand.finalize_options(self)
         self.test_args = []
         self.test_suite = True
+
     def run_tests(self):
         #import here, cause outside the eggs aren't loaded
         import tox
         errno = tox.cmdline(self.test_args)
         sys.exit(errno)
 
+
 def read(fname):
-    return open(os.path.join(os.path.dirname(__file__),  fname),  encoding="utf8").read()
+    with open(os.path.join(os.path.dirname(__file__),  fname),
+              encoding="utf8") as fd:
+        return fd.read()
 
-VERSION = ".".join(map(str, mpd.VERSION))
 
 setup(
     name="python-mpd2",
     version=VERSION,
     description="A Python MPD client library",
     long_description=read('README.rst'),
+    classifiers=CLASSIFIERS,
     author="J. Thalheim",
     author_email="[email protected]",
+    license="GNU Lesser General Public License v3 (LGPLv3)",
     url="https://github.com/Mic92/python-mpd2",
-    download_url="https://github.com/Mic92/python-mpd2/archive/v%s.zip" % VERSION,
-    py_modules=["mpd", "mpd_test"],
-    classifiers=CLASSIFIERS,
-    #license=LICENSE,
+    packages=find_packages(),
+    zip_safe=True,
     keywords=["mpd"],
+    test_suite="mpd.tests",
     tests_require=['tox'],
-    cmdclass = {'test': Tox},
+    cmdclass={'test': Tox}
 )
 
 # vim: set expandtab shiftwidth=4 softtabstop=4 textwidth=79:

tox.ini

@@ -3,9 +3,17 @@ envlist = py26,py27,py32,py33,py34,py35,pypy
 
 [testenv]
 deps = mock
-commands = python mpd_test.py
+       coverage
+commands = coverage erase
+           coverage run mpd/tests.py
+           coverage report
+           coverage html -d coverage_html/{envname}
 
 [testenv:py26]
 deps = mock
        unittest2
-commands = python mpd_test.py
+       coverage
+commands = coverage erase
+           coverage run mpd/tests.py
+           coverage report
+           coverage html -d coverage_html/{envname}