From 50494549cb6495da97e65786e81e3829801a4723 Mon Sep 17 00:00:00 2001 From: Alizee Pace Date: Wed, 24 Aug 2016 10:36:03 +0200 Subject: [PATCH 1/4] tests: integration of pytest-runner Signed-off-by: Alizee Pace --- setup.cfg | 3 +++ setup.py | 35 +++-------------------------------- 2 files changed, 6 insertions(+), 32 deletions(-) diff --git a/setup.cfg b/setup.cfg index 5200090..2840644 100644 --- a/setup.cfg +++ b/setup.cfg @@ -22,6 +22,9 @@ # waive the privileges and immunities granted to it by virtue of its status # as an Intergovernmental Organization or submit itself to any jurisdiction. +[aliases] +test=pytest + [wheel] universal=1 diff --git a/setup.py b/setup.py index 59867a6..2cf03b1 100644 --- a/setup.py +++ b/setup.py @@ -54,37 +54,9 @@ 'invenio-testing>=0.1.0', ] - -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) - 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) +setup_requires = [ + 'pytest-runner>=2.6.2', +] # Get the version string. Cannot be done with import! g = {} @@ -133,5 +105,4 @@ def run_tests(self): 'Development Status :: 1 - Planning', ], tests_require=test_requirements, - cmdclass={'test': PyTest}, ) From 062046a6f3e9faba841202437a84aef737f14d76 Mon Sep 17 00:00:00 2001 From: Alizee Pace Date: Wed, 24 Aug 2016 10:54:10 +0200 Subject: [PATCH 2/4] installation: Flask>=0.11.1 * Removed dependency on Flask-CLI. Signed-off-by: Alizee Pace --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2cf03b1..914e211 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ history = open('CHANGES.rst').read() requirements = [ - 'Flask>=0.10.1', + 'Flask>=0.11.1', 'six>=1.7.2', 'workflow>=1.2.0,<2.0.0', 'invenio-base>=0.3.0', From 35835567a14a5614ffd22c3dd86856c0822c885d Mon Sep 17 00:00:00 2001 From: Alizee Pace Date: Wed, 24 Aug 2016 11:16:37 +0200 Subject: [PATCH 3/4] docs: autodoc configuration and HTTPS fix * Replaces HTTP links with HTTPS where possible. Signed-off-by: Alizee Pace --- docs/conf.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/conf.py b/docs/conf.py index e650f2b..40a0b9a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -321,3 +321,6 @@ # Example configuration for intersphinx: refer to the Python standard library. intersphinx_mapping = {'https://docs.python.org/': None} + +# Autodoc configuraton. +autoclass_content = 'both' From 54b02eb0c227cab301c496c7eeadf862d46ca5cc Mon Sep 17 00:00:00 2001 From: Alizee Pace Date: Wed, 24 Aug 2016 11:53:19 +0200 Subject: [PATCH 4/4] installation: addition of PyPy classifiers Signed-off-by: Alizee Pace --- setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 914e211..f905aa7 100644 --- a/setup.py +++ b/setup.py @@ -99,9 +99,10 @@ 'Programming Language :: Python :: 2', # 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: Implementation :: CPython', + 'Programming Language :: Python :: Implementation :: PyPy', # 'Programming Language :: Python :: 3', - # 'Programming Language :: Python :: 3.3', - # 'Programming Language :: Python :: 3.4', 'Development Status :: 1 - Planning', ], tests_require=test_requirements,