From 9bde637e84cc48d6b832598a5e9ba9a140465c57 Mon Sep 17 00:00:00 2001 From: Alizee Pace Date: Wed, 24 Aug 2016 10:52:27 +0200 Subject: [PATCH 1/3] installation: Flask>=0.11.1 * Removed dependency on Flask-CLI. Signed-off-by: Alizee Pace --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 385634b..5a4b96e 100644 --- a/setup.py +++ b/setup.py @@ -59,6 +59,7 @@ ] install_requires = [ + 'Flask>=0.11.1', 'citeproc-py-styles>=0.1.0', 'invenio-rest>=1.0.0a9', ] From b9f0fab966924ae20bcd7549752259a3661589a7 Mon Sep 17 00:00:00 2001 From: Alizee Pace Date: Wed, 24 Aug 2016 11:14:56 +0200 Subject: [PATCH 2/3] docs: autodoc configuration and HTTPS fix * Replaces HTTP links with HTTPS where possible. Signed-off-by: Alizee Pace --- docs/conf.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 04236cc..632824a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -137,8 +137,8 @@ 'github_banner': True, 'show_powered_by': False, 'extra_nav_links': { - 'invenio-csl-rest@GitHub': 'http://github.com/inveniosoftware/invenio-csl-rest', - 'invenio-csl-rest@PyPI': 'http://pypi.python.org/pypi/invenio-csl-rest/', + 'invenio-csl-rest@GitHub': 'https://github.com/inveniosoftware/invenio-csl-rest', + 'invenio-csl-rest@PyPI': 'https://pypi.python.org/pypi/invenio-csl-rest/', } } @@ -329,3 +329,6 @@ # Example configuration for intersphinx: refer to the Python standard library. intersphinx_mapping = {'https://docs.python.org/': None} + +# Autodoc configuraton. +autoclass_content = 'both' From 0fdc1a2382fd2ddfd9e67bdc04ce78810cce1d6e Mon Sep 17 00:00:00 2001 From: Alizee Pace Date: Wed, 24 Aug 2016 11:53:19 +0200 Subject: [PATCH 3/3] installation: addition of PyPy classifiers Signed-off-by: Alizee Pace --- .travis.yml | 7 +++++-- setup.py | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9b50d47..75538cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,9 +40,12 @@ env: python: - "2.7" - - "3.3" - - "3.4" - "3.5" + - "pypy" + +matrix: + allow_failures: + - python: pypy before_install: - "travis_retry pip install --upgrade pip setuptools py" diff --git a/setup.py b/setup.py index 5a4b96e..377152a 100644 --- a/setup.py +++ b/setup.py @@ -113,9 +113,9 @@ 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', - 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: Implementation :: CPython', + 'Programming Language :: Python :: Implementation :: PyPy', 'Development Status :: 1 - Planning', ], )