hakanardo · monopolis · Sep 6, 2019 · Aug 22, 2019 · Aug 26, 2019
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,11 @@
+[run]
+branch = True
+source = vi3o
+
+[paths]
+source =
+    src/vi3o
+    .tox/*/lib/python*/site-packages/vi3o
+
+[report]
+show_missing = True
diff --git a/.python-version b/.python-version
@@ -0,0 +1,2 @@
+system
+3.7.3
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,10 @@
-include build_*.py src/*.h
-include LICENSE README.rst requirements.txt
+include LICENSE 
+include README.rst 
+include requirements.txt
+
+recursive-include src/_cffi_src *.py *.c *.h
+recursive-include tests *.py
+
+prune docs/_build
+recursive-exclude scripts *
+exclude .coveragerc tox.ini requirements.txt
diff --git a/docs/conf.py b/docs/conf.py
@@ -33,7 +33,7 @@
 extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.coverage',
-    'sphinx.ext.pngmath',
+    'sphinx.ext.imgmath',
     'sphinx.ext.viewcode',
 ]
 

diff --git a/init_env.sh b/init_env.sh
@@ -0,0 +1,3 @@
+python3 -m venv venv/
+venv/bin/pip install tox
+source venv/bin/activate
diff --git a/docker_unittests.py → scripts/docker_unittests.py b/docker_unittests.py → scripts/docker_unittests.py
diff --git a/release.sh → scripts/release.sh b/release.sh → scripts/release.sh
diff --git a/setup.py b/setup.py
@@ -1,53 +1,85 @@
-from setuptools import setup
+from setuptools import setup, find_packages
 from setuptools.command.test import test as TestCommand
 import sys
 import os
 
-# Read the version but avoid importing the __init__.py since
-# we might not have all dependencies installed
-with open(os.path.join(os.path.dirname(__file__), "vi3o", "version.py")) as fp:
-    exec(fp.read())
+is_PY2 = sys.version_info <= (3, 0, 0)
+
+KEYWORDS = [
+    "video", "mkv", "mjpg"
+]
+
+CLASSIFIERS = [
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT",
+    "Natural Language :: English",
+    "Operating System :: Linux",
+    "Programming Language :: Python :: 2.7",
+    "Programming Language :: Python :: 3.5",
+    "Programming Language :: Python :: 3.6",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python",
+    "Topic :: Software Development :: Libraries :: Python Modules"
+]
 
-requirements=["cffi>=1.0.0", "numpy>=1.7.1,<1.17"]
-if sys.version_info <= (3, 3, 0):
-    requirements.append("pathlib2")
+INSTALL_REQUIRES = ["cffi>=1.0.0", "numpy>=1.7.1,<1.17"]
+if is_PY2:
+    INSTALL_REQUIRES.append("pathlib2")
 
-class PyTestCommand(TestCommand):
-    user_options = []
+SETUP_REQUIRES = [
+    'cffi>=1.0.0'
+]
 
-    def finalize_options(self):
-        pass
+EXTRAS_REQUIRE = {
+    "dev": [
+        "coverage",
+        "pytest <= 4.6, != 4.6.0",
+        "pillow < 7",
+        "sphinx < 1.8",
+    ],
+    "full": [
+        "pillow < 7",
+        "pyglet < 1.5"
+    ]
+}
 
-    def run_tests(self):
-        import pytest
-        errno = pytest.main()
-        sys.exit(errno)
+if is_PY2:
+    EXTRAS_REQUIRE['dev'].append('mock')
+
+
+PACKAGES = find_packages(where="src")
+
+CFFI_MODULES = [
+    "src/_cffi_src/build_mjpg.py:ffi", 
+    "src/_cffi_src/build_mkv.py:ffi"
+]
+
+# Read the version but avoid importing the __init__.py since
+# we might not have all dependencies installed
+with open(os.path.join(os.path.dirname(__file__), "src", "vi3o", "version.py")) as fp:
+    exec(fp.read())
 
 setup(
     name='vi3o',
     description='VIdeo and Image IO',
+    license='MIT',
+    url='http://vi3o.readthedocs.org',
+    author='Hakan Ardo',
+    author_email='hakan@debian.org',
     long_description='''
 Utility for loading/saving/displaying video and images. It gives random
 access to mjpg (in http multipart format) and H264 (in .mkv format) video
 frames. For recordings origination from Axis cameras the camera system
 time at the time of capture is provided as timestamp for each frame.
     ''',
     version=__version__,
-    packages=['vi3o'],
+    keywords=KEYWORDS,
+    classifiers=CLASSIFIERS,
+    packages=PACKAGES,
+    package_dir={"": "src"},
+    setup_requires=SETUP_REQUIRES,
+    cffi_modules=CFFI_MODULES,
+    install_requires=INSTALL_REQUIRES,
+    extras_require=EXTRAS_REQUIRE,
     zip_safe=False,
-    url='http://vi3o.readthedocs.org',
-    author='Hakan Ardo',
-    author_email='hakan@debian.org',
-    license='MIT',
-    setup_requires=["cffi>=1.0.0"],
-    cffi_modules=["build_mjpg.py:ffi", "build_mkv.py:ffi"],
-    install_requires=requirements,
-    extras_require={
-        "full": [
-            "pillow < 7",
-            "pyglet < 1.5"
-        ]
-    },
-    cmdclass={'test': PyTestCommand},
-    tests_require=['pytest <= 4.6, !=4.6.0', 'pillow < 7', "mock"],
 )
diff --git a/build_mjpg.py → src/_cffi_src/build_mjpg.py b/build_mjpg.py → src/_cffi_src/build_mjpg.py
@@ -30,9 +30,9 @@
         int mjpg_seek (struct mjpg *m, long offset);
 
          """)
-ffi.set_source("vi3o._mjpg", '#include "src/mjpg.h"',
+ffi.set_source("vi3o._mjpg", '#include "mjpg.h"',
                include_dirs=[mydir],
-               sources=["src/mjpg.c"],
+               sources=[os.path.join(mydir, "mjpg.c")],
                libraries=["jpeg"], )
 
 if __name__ == '__main__':

diff --git a/build_mkv.py → src/_cffi_src/build_mkv.py b/build_mkv.py → src/_cffi_src/build_mkv.py
@@ -34,9 +34,9 @@
         int64_t mkv_estimate_systime_offset(struct mkv *s);
 
          """)
-ffi.set_source("vi3o._mkv", '#include "src/decode.h"',
+ffi.set_source("vi3o._mkv", '#include "decode.h"',
                include_dirs=[mydir],
-               sources=["src/mkv.c", "src/decode.c"],
+               sources=[os.path.join(mydir, "mkv.c"), os.path.join(mydir,"decode.c")],
                # cflags=["-g"],
                libraries=["avcodec", "swscale"])
 

diff --git a/src/decode.c → src/_cffi_src/decode.c b/src/decode.c → src/_cffi_src/decode.c
diff --git a/src/decode.h → src/_cffi_src/decode.h b/src/decode.h → src/_cffi_src/decode.h
diff --git a/src/mjpg.c → src/_cffi_src/mjpg.c b/src/mjpg.c → src/_cffi_src/mjpg.c
diff --git a/src/mjpg.h → src/_cffi_src/mjpg.h b/src/mjpg.h → src/_cffi_src/mjpg.h
diff --git a/src/mkv.c → src/_cffi_src/mkv.c b/src/mkv.c → src/_cffi_src/mkv.c
diff --git a/src/mkv.h → src/_cffi_src/mkv.h b/src/mkv.h → src/_cffi_src/mkv.h
diff --git a/vi3o/__init__.py → src/vi3o/__init__.py b/vi3o/__init__.py → src/vi3o/__init__.py
diff --git a/vi3o/cat.py → src/vi3o/cat.py b/vi3o/cat.py → src/vi3o/cat.py
diff --git a/vi3o/compat.py → src/vi3o/compat.py b/vi3o/compat.py → src/vi3o/compat.py
diff --git a/vi3o/cvview.py → src/vi3o/cvview.py b/vi3o/cvview.py → src/vi3o/cvview.py
diff --git a/vi3o/debugview.py → src/vi3o/debugview.py b/vi3o/debugview.py → src/vi3o/debugview.py
diff --git a/vi3o/image.py → src/vi3o/image.py b/vi3o/image.py → src/vi3o/image.py
diff --git a/vi3o/imageio.py → src/vi3o/imageio.py b/vi3o/imageio.py → src/vi3o/imageio.py
diff --git a/vi3o/mjpg.py → src/vi3o/mjpg.py b/vi3o/mjpg.py → src/vi3o/mjpg.py
diff --git a/vi3o/mkv.py → src/vi3o/mkv.py b/vi3o/mkv.py → src/vi3o/mkv.py
diff --git a/vi3o/netcam.py → src/vi3o/netcam.py b/vi3o/netcam.py → src/vi3o/netcam.py
diff --git a/vi3o/opencv.py → src/vi3o/opencv.py b/vi3o/opencv.py → src/vi3o/opencv.py
diff --git a/vi3o/recording.py → src/vi3o/recording.py b/vi3o/recording.py → src/vi3o/recording.py
diff --git a/vi3o/sync.py → src/vi3o/sync.py b/vi3o/sync.py → src/vi3o/sync.py
diff --git a/vi3o/utils.py → src/vi3o/utils.py b/vi3o/utils.py → src/vi3o/utils.py
diff --git a/vi3o/version.py → src/vi3o/version.py b/vi3o/version.py → src/vi3o/version.py
diff --git a/test/00000000.jpg → tests/00000000.jpg b/test/00000000.jpg → tests/00000000.jpg
diff --git a/test/__init__.py → tests/__init__.py b/test/__init__.py → tests/__init__.py
diff --git a/test/a.mkv → tests/a.mkv b/test/a.mkv → tests/a.mkv
diff --git a/test/b.mkv → tests/b.mkv b/test/b.mkv → tests/b.mkv
diff --git a/test/c.mkv → tests/c.mkv b/test/c.mkv → tests/c.mkv
diff --git a/test/img00012680.jpg → tests/img00012680.jpg b/test/img00012680.jpg → tests/img00012680.jpg
diff --git a/test/systime.mkv → tests/systime.mkv b/test/systime.mkv → tests/systime.mkv
diff --git a/test/t.mjpg → tests/t.mjpg b/test/t.mjpg → tests/t.mjpg
diff --git a/test/t.mkv → tests/t.mkv b/test/t.mkv → tests/t.mkv
diff --git a/test/test_api.py → tests/test_api.py b/test/test_api.py → tests/test_api.py
diff --git a/test/test_cat.py → tests/test_cat.py b/test/test_cat.py → tests/test_cat.py
@@ -7,7 +7,7 @@
 import pytest
 import vi3o
 from vi3o import cat
-from test.util import _FakeVideo, itertools, mock
+from tests.util import _FakeVideo, itertools, mock
 
 
 

diff --git a/test/test_image.py → tests/test_image.py b/test/test_image.py → tests/test_image.py
@@ -1,5 +1,5 @@
 from vi3o.image import *
-from test.util import TempDir
+from tests.util import TempDir
 import numpy as np
 from py.test import raises
 from vi3o.compat import pathlib

diff --git a/test/test_mjpg.py → tests/test_mjpg.py b/test/test_mjpg.py → tests/test_mjpg.py
diff --git a/test/test_mjpg_codec.mkv → tests/test_mjpg_codec.mkv b/test/test_mjpg_codec.mkv → tests/test_mjpg_codec.mkv
diff --git a/test/test_mkv.py → tests/test_mkv.py b/test/test_mkv.py → tests/test_mkv.py
diff --git a/test/test_recording.py → tests/test_recording.py b/test/test_recording.py → tests/test_recording.py
@@ -8,7 +8,7 @@
 import vi3o.compat as compat
 from vi3o import recording
 
-from test.util import _FakeVideo, itertools, mock
+from tests.util import _FakeVideo, itertools, mock
 
 # pylint: disable=missing-docstring
 # pylint: disable=redefined-outer-name

diff --git a/test/test_sync.py → tests/test_sync.py b/test/test_sync.py → tests/test_sync.py
diff --git a/test/tst.jpg → tests/tst.jpg b/test/tst.jpg → tests/tst.jpg
diff --git a/test/util.py → tests/util.py b/test/util.py → tests/util.py
diff --git a/tox.ini b/tox.ini
@@ -0,0 +1,42 @@
+[tox]
+envlist = py27, py34, py35, py36, py37, docs, format, lint, coverage-report
+skip_missing_interpreters = true
+minversion = 3.4.0
+
+[testenv]
+description = Run test and measure coverage
+extras = dev
+commands = 
+    coverage run --parallel -m pytest {posargs}
+
+[testenv:lint]
+description = Check linting
+deps = pylint
+# Do not fail builds due to linting yet, we need to fix the current
+# issues first
+commands = 
+    pylint src/ {posargs} --exit-zero
+
+[testenv:format]
+description = Check formatting
+basepython = python3.6
+deps = black
+commands = 
+    black --check src/ tests/ {posargs}
+
+[testenv:docs]
+description = Build docs
+basepython = python3.6
+extras = dev
+commands =
+    sphinx-build -b html -d docs/_build/doctrees docs/ docs/_build/html
+
+
+[testenv:coverage-report]
+depends = py{27,35,37}
+deps = coverage
+skip_install = true
+parallel_show_output = true
+commands = 
+    coverage combine
+    coverage report