global: renaming core to ext and pytest-runner

* Updates package structure with pytest-runner and renames core to ext.

Signed-off-by: Jiri Kuncar <[email protected]>

Author: jirikuncar

.gitignore

@@ -55,3 +55,6 @@ docs/_build/
 
 # PyBuilder
 target/
+
+# Tests
+tests/test.db

docs/api.rst

@@ -25,7 +25,7 @@
 API Docs
 ========
 
-.. automodule:: invenio_db.core
+.. automodule:: invenio_db.ext
    :members:
    :undoc-members:
 

invenio_db/__init__.py

@@ -88,7 +88,7 @@ class User(db.Model):
 
 from __future__ import absolute_import, print_function
 
-from .core import InvenioDB
+from .ext import InvenioDB
 from .shared import db
 from .version import __version__
 

invenio_db/core.py renamed to invenio_db/ext.py

@@ -26,5 +26,5 @@ pydocstyle invenio_db && \
 isort -rc -c -df **/*.py && \
 check-manifest --ignore ".travis-*" && \
 sphinx-build -qnNW docs docs/_build/html && \
-python setup.py test -a'-vv' && \
+python setup.py test && \
 sphinx-build -qnNW -b doctest docs docs/_build/doctest

run-tests.sh

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of Invenio.
-# Copyright (C) 2015 CERN.
+# Copyright (C) 2015, 2016 CERN.
 #
 # Invenio is free software; you can redistribute it
 # and/or modify it under the terms of the GNU General Public License as
@@ -23,6 +23,9 @@
 # as an Intergovernmental Organization or submit itself to any jurisdiction.
 
 
+[aliases]
+test = pytest
+
 [build_sphinx]
 source-dir = docs/
 build-dir = docs/_build

setup.cfg

@@ -28,15 +28,14 @@
 import sys
 
 from setuptools import find_packages, setup
-from setuptools.command.test import test as TestCommand
 
 readme = open('README.rst').read()
 history = open('CHANGES.rst').read()
 
 tests_require = [
     'check-manifest>=0.25',
     'coverage>=4.0',
-    'isort>=4.0.0',
+    'isort>=4.2.2',
     'mock>=1.3.0',
     'pydocstyle>=1.0.0',
     'pytest-cache>=1.0',
@@ -67,6 +66,7 @@
 
 setup_requires = [
     'Babel>=1.3',
+    'pytest-runner>=2.6.2',
 ]
 
 install_requires = [
@@ -79,39 +79,6 @@
 packages = find_packages()
 
 
-class PyTest(TestCommand):
-    """PyTest Test."""
-
-    user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")]
-
-    def initialize_options(self):
-        """Init pytest."""
-        TestCommand.initialize_options(self)
-        self.pytest_args = []
-        try:
-            from ConfigParser import ConfigParser
-        except ImportError:
-            from configparser import ConfigParser
-        config = ConfigParser()
-        config.read('pytest.ini')
-        self.pytest_args = config.get('pytest', 'addopts').split(' ')
-
-    def finalize_options(self):
-        """Finalize pytest."""
-        TestCommand.finalize_options(self)
-        if hasattr(self, '_test_args'):
-            self.test_suite = ''
-        else:
-            self.test_args = []
-            self.test_suite = True
-
-    def run_tests(self):
-        """Run tests."""
-        # import here, cause outside the eggs aren't loaded
-        import pytest
-        errno = pytest.main(self.pytest_args)
-        sys.exit(errno)
-
 # Get the version string. Cannot be done with import!
 g = {}
 with open(os.path.join('invenio_db', 'version.py'), 'rt') as fp:
@@ -123,7 +90,7 @@ def run_tests(self):
     version=version,
     description=__doc__,
     long_description=readme + '\n\n' + history,
-    keywords='invenio',
+    keywords='invenio database',
     license='GPLv2',
     author='Invenio Collaboration',
     author_email='[email protected]',
@@ -160,5 +127,4 @@ def run_tests(self):
         'Programming Language :: Python :: 3.5',
         'Development Status :: 1 - Planning',
     ],
-    cmdclass={'test': PyTest},
 )