tests: drop pytest_namespace

Pytest dropped support for pytest_namespace() in favor of
pytest_configure() as per
pytest-dev/pytest#4421.

We also fixed some import sortings and the setup.py to make sure that
the builds pass and have the same structure as other modules.

Author: jorikvankemenade

docs/conf.py

@@ -26,7 +26,6 @@
 import re
 import sys
 
-
 _html_theme = "sphinx_rtd_theme"
 _html_theme_path = []
 try:

invenio_query_parser/parser.py

@@ -18,7 +18,6 @@
 from . import ast
 from ._compat import string_types
 
-
 # pylint: disable=C0321,R0903
 
 

setup.py

@@ -36,6 +36,26 @@
     'pytest>=2.8.0',
 ]
 
+extras_require = {
+        'docs': [
+            'sphinx_rtd_theme>=0.1.9',
+        ],
+        'elasticsearch': [
+            'elasticsearch-dsl>=2.0.0',
+        ],
+        'tests': tests_require,
+}
+
+extras_require['all'] = []
+for reqs in extras_require.values():
+    extras_require['all'].extend(reqs)
+
+install_requires = [
+    'pypeg2>=2.15.2',
+    'ordereddict>=1.1',
+    'six>=1.10.0',
+]
+
 setup(
     name='invenio-query-parser',
     version=version,
@@ -48,20 +68,8 @@
     long_description=__doc__,
     packages=find_packages(exclude=['tests', 'docs']),
     include_package_data=True,
-    install_requires=[
-        'pypeg2>=2.15.2',
-        'ordereddict>=1.1',
-        'six>=1.10.0',
-    ],
-    extras_require={
-        'docs': [
-            'sphinx_rtd_theme>=0.1.9',
-        ],
-        'elasticsearch': [
-            'elasticsearch-dsl>=2.0.0',
-        ],
-        'tests': tests_require,
-    },
+    install_requires=install_requires,
+    extras_require=extras_require,
     tests_require=tests_require,
     classifiers=[
         'Programming Language :: Python :: 2',

tests/conftest.py

@@ -23,7 +23,5 @@ def fun(cls):
     return fun
 
 
-def pytest_namespace():
-    return dict((
-        ("generate_tests", generate_tests),
-    ))
+def pytest_configure():
+    pytest.generate_tests = generate_tests