Skip to content

Commit

Permalink
Merge 683b07a into 010e0a1
Browse files Browse the repository at this point in the history
  • Loading branch information
lnielsen committed Mar 21, 2018
2 parents 010e0a1 + 683b07a commit 46af5ab
Show file tree
Hide file tree
Showing 20 changed files with 138 additions and 40 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ after_success:

deploy:
provider: pypi
user: jirikuncar
user: inveniosoftware
password:
secure: xSD/XcMnmhBYRqcJbLOPsIFDhMCV48EaeLwNkGW0sQPlTsgm1PtIm6eyedogq2gaKJsOoan20mc1VH4L0P2AGiLuAvuxXUpjr/Zj/QePJ8iCeLoy5Tg1I8VfkUQsBtO9lIRtqg5qUI5u8w6PhfAOXB9JqoBOv5WHpE/zir5fvMKwSG/K8nlk3JD+C3Hi3gWgcdIsr/BPpeB+lqqh4dLVQSDz+42aH553IMCCgZpiXEmQ9w9/IdeUZCHMZgFNyz4HQbxQIXx8SLjKmcA/jwbcWCX4WzawJxgnoGH7HcETh9GjNmcRBDbyRLQiG8Um4hyfMoZ87P5om08FfRSvGKce7Wg8bEcZVGrXy/S1H+Ofh2zYG9pQJ7OHF4qqCaw3vhZ2Vo7f5xqv4e7vl3JyukAzpykTYPacad+87Ob8u74dLiO0fszUnhDOyD8MXlbQo8UlOHRL4sdqHTuNGXE0OXMhlvH1+vCzCKEZYu++2BwnYuzll9bt0JCWynyjuD+INAQrns/8YCjVSzgKJ+KjgpNkdoNznUMoBrah/McuAfww5j17FOUNUZVvjcVM24y1zW905poxoiKqJfI+StPYyZ5uv+o9alkAozeCXDrae9awXGKE4JY2jiua+bZQW0WmH9IJ05/ekY9LeB/C4ga05w7bGaxeNhRoJfkcsjANBlRo9zA=
secure: "UowdMzkUcsd6JBguR6nO71yA+BldcCYNbp/16rnGzprvYnju1WA6UCNZ2VjN7uQLlDXKml61n75otjf9Mo6QsxGbWq1f+d8bgiYF8ffekUiLrBPIQfg6f7uTQYGE0HTRTi6rsLoBW/03MELXk6DvHc9yKvxDET//VaMPaewXj+5ENT3TZnv8b/MSaoHGFOD4ozUPAYtXbtSu7rl+Y/rdOAmwTgMXDeXdjNN2m6DhTLVBYRIGr6UnoE/8hHQd+GimFJpdYb2BUZywmoZAO6lmY8PEy5ArQIMtFZNxYriRysmceE6msZECw17gjYGPhiP4s93pToiQY6bHe8SHlhbz9hLBZT0F9jabLiH1gwAyRF6HDY/BSo1szZvIrFryhXl36xpDfBs59ZSJGKvhP4OkjC4UJ2KLnLIdoonKTZQuBSlbt+P3eQX5V3GwU59o6I0PeFbhw88TemM8/cskjgU+mhDjgTjHAJ7PWwy4+51FlLhzpIqH+U9otYQCn+Y7xOTdNJCyA2x6cZWz+vRS9HdCJqu7qxF+vtI+lHVPYNSC+jYyaty2z4jbfl8yigynjtWspzjG2qgJhbwAmtTR4T3oMfwBwcJl0+kC9Mkjx4KUZDZii3Oyt80i4uZqATj0He0u92dejyCxw2p3Zs6EpTwYpL+8GLa2MuxTd9EtmefqYEs="
distributions: "compile_catalog sdist bdist_wheel"
on:
tags: true
Expand Down
42 changes: 26 additions & 16 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
@@ -1,18 +1,28 @@
Authors
=======
..
This file is part of Invenio.
Copyright (C) 2015-2018 CERN.
Invenio module that implements OAuth 2 server.
Invenio is free software; you can redistribute it and/or modify it
under the terms of the MIT License; see LICENSE file for more details.

- Charlotte Cattaneo <ciris.cattaneo@gmail.com>
- Eirini Psallida <eirini.psallida@cern.ch>
- Esteban J. G. Gabancho <esteban.gabancho@gmail.com>
- Ivan Masár <helix84@centrum.sk>
- Jiri Kuncar <jiri.kuncar@cern.ch>
- Konstantinos Kostis <konstantinos.kostis@cern.ch>
- Lars Holm Nielsen <lars.holm.nielsen@cern.ch>
- Leonardo Rossi <leonardo.r@cern.ch>
- Marco Neumann <marco@crepererum.net>
- Roman Chyla <roman.chyla@gmail.com>
- Sami Hiltunen <sami.mikael.hiltunen@cern.ch>
- Tibor Simko <tibor.simko@cern.ch>
- Alexander Ioannidis <a.ioannidis@cern.ch>
Contributors
============

- Alexander Ioannidis
- Alizee Pace
- David Caro
- Diego Rodriguez
- Dinos Kousidis
- Harri Hirvonsalo
- Harris Tzovanakis
- Jacopo Notarstefano
- Jiri Kuncar
- Krzysztof Nowak
- Lars Holm Nielsen
- Leonardo Rossi
- Miltiadis Alexis
- Nicolas Harraudeau
- Paulina Lach
- Sami Hiltunen
- Sebastian Witowski
- Tibor Simko
7 changes: 7 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
..
This file is part of Invenio.
Copyright (C) 2015-2018 CERN.
Invenio is free software; you can redistribute it and/or modify it
under the terms of the MIT License; see LICENSE file for more details.

Changes
=======

Expand Down
7 changes: 7 additions & 0 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
..
This file is part of Invenio.
Copyright (C) 2015-2018 CERN.
Invenio is free software; you can redistribute it and/or modify it
under the terms of the MIT License; see LICENSE file for more details.

Contributing
============

Expand Down
7 changes: 7 additions & 0 deletions INSTALL.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
..
This file is part of Invenio.
Copyright (C) 2015-2018 CERN.
Invenio is free software; you can redistribute it and/or modify it
under the terms of the MIT License; see LICENSE file for more details.

Installation
============

Expand Down
2 changes: 0 additions & 2 deletions MAINTAINERS

This file was deleted.

2 changes: 0 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ include *.sh
include *.txt
include .dockerignore
include .editorconfig
include .lgtm
include .tx/config
include LICENSE
include MAINTAINERS
include babel.ini
include docs/requirements.txt
include pytest.ini
Expand Down
17 changes: 9 additions & 8 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
..
This file is part of Invenio.
Copyright (C) 2015-2018 CERN.
Invenio is free software; you can redistribute it and/or modify it
under the terms of the MIT License; see LICENSE file for more details.

======================
Invenio-OAuth2Server
======================
Expand All @@ -8,14 +15,8 @@
.. image:: https://img.shields.io/coveralls/inveniosoftware/invenio-oauth2server.svg
:target: https://coveralls.io/r/inveniosoftware/invenio-oauth2server

.. image:: https://img.shields.io/github/tag/inveniosoftware/invenio-oauth2server.svg
:target: https://github.com/inveniosoftware/invenio-oauth2server/releases

.. image:: https://img.shields.io/pypi/dm/invenio-oauth2server.svg
:target: https://pypi.python.org/pypi/invenio-oauth2server

.. image:: https://img.shields.io/github/license/inveniosoftware/invenio-oauth2server.svg
:target: https://github.com/inveniosoftware/invenio-oauth2server/blob/master/LICENSE
.. image:: https://img.shields.io/pypi/v/invenio-oauth2server.svg
:target: https://pypi.org/pypi/invenio-oauth2server


Invenio module that implements OAuth 2 server.
Expand Down
7 changes: 7 additions & 0 deletions docs/api.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
..
This file is part of Invenio.
Copyright (C) 2015-2018 CERN.
Invenio is free software; you can redistribute it and/or modify it
under the terms of the MIT License; see LICENSE file for more details.

API Docs
========

Expand Down
7 changes: 7 additions & 0 deletions docs/authors.rst
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
..
This file is part of Invenio.
Copyright (C) 2015-2018 CERN.
Invenio is free software; you can redistribute it and/or modify it
under the terms of the MIT License; see LICENSE file for more details.

.. include:: ../AUTHORS.rst
7 changes: 7 additions & 0 deletions docs/changes.rst
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
..
This file is part of Invenio.
Copyright (C) 2015-2018 CERN.
Invenio is free software; you can redistribute it and/or modify it
under the terms of the MIT License; see LICENSE file for more details.

.. include:: ../CHANGES.rst
7 changes: 7 additions & 0 deletions docs/configuration.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
..
This file is part of Invenio.
Copyright (C) 2015-2018 CERN.
Invenio is free software; you can redistribute it and/or modify it
under the terms of the MIT License; see LICENSE file for more details.

Configuration
=============

Expand Down
7 changes: 7 additions & 0 deletions docs/contributing.rst
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
..
This file is part of Invenio.
Copyright (C) 2015-2018 CERN.
Invenio is free software; you can redistribute it and/or modify it
under the terms of the MIT License; see LICENSE file for more details.

.. include:: ../CONTRIBUTING.rst
7 changes: 7 additions & 0 deletions docs/examplesapp.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
..
This file is part of Invenio.
Copyright (C) 2015-2018 CERN.
Invenio is free software; you can redistribute it and/or modify it
under the terms of the MIT License; see LICENSE file for more details.

Example applications
====================

Expand Down
7 changes: 7 additions & 0 deletions docs/index.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
..
This file is part of Invenio.
Copyright (C) 2015-2018 CERN.
Invenio is free software; you can redistribute it and/or modify it
under the terms of the MIT License; see LICENSE file for more details.

.. include:: ../README.rst

User's Guide
Expand Down
7 changes: 7 additions & 0 deletions docs/installation.rst
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
..
This file is part of Invenio.
Copyright (C) 2015-2018 CERN.
Invenio is free software; you can redistribute it and/or modify it
under the terms of the MIT License; see LICENSE file for more details.

.. include:: ../INSTALL.rst
7 changes: 7 additions & 0 deletions docs/overview.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
..
This file is part of Invenio.
Copyright (C) 2018 CERN.
Invenio is free software; you can redistribute it and/or modify it
under the terms of the MIT License; see LICENSE file for more details.

Overview
========
Understanding API Authentication in Invenio
Expand Down
7 changes: 7 additions & 0 deletions docs/usage.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
..
This file is part of Invenio.
Copyright (C) 2015-2018 CERN.
Invenio is free software; you can redistribute it and/or modify it
under the terms of the MIT License; see LICENSE file for more details.

Usage
=====

Expand Down
2 changes: 1 addition & 1 deletion invenio_oauth2server/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@

from __future__ import absolute_import, print_function

__version__ = "1.0.0b4"
__version__ = '1.0.0'
18 changes: 9 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
'SQLAlchemy-Continuum>=1.2.1',
'check-manifest>=0.25',
'coverage>=4.0',
'invenio-assets>=1.0.0b6',
'invenio-i18n>=1.0.0b4',
'invenio-theme>=1.0.0b4',
'invenio-assets>=1.0.0',
'invenio-i18n>=1.0.0',
'invenio-theme>=1.0.0',
'isort>=4.2.2',
'mock>=1.3.0',
'pydocstyle>=1.0.0',
Expand All @@ -32,7 +32,7 @@

extras_require = {
'admin': [
'invenio-admin>=1.0.0b3'
'invenio-admin>=1.0.0'
],
'docs': [
'Sphinx>=1.5.1',
Expand All @@ -41,13 +41,13 @@
'redis>=2.10.5',
],
'mysql': [
'invenio-db[mysql]>=1.0.0b8',
'invenio-db[mysql]>=1.0.0',
],
'postgresql': [
'invenio-db[postgresql]>=1.0.0b8',
'invenio-db[postgresql]>=1.0.0',
],
'sqlite': [
'invenio-db>=1.0.0b8',
'invenio-db>=1.0.0',
],
'tests': tests_require,
}
Expand All @@ -71,7 +71,7 @@
'Flask-WTF>=0.13.1',
'Flask>=0.11.1',
'future>=0.16.0',
'invenio-accounts>=1.0.0b7',
'invenio-accounts>=1.0.0',
'oauthlib>=1.1.2,!=2.0.0,!=2.0.3,!=2.0.4,!=2.0.5',
'pyjwt>=1.5.0',
'six>=1.10.0',
Expand Down Expand Up @@ -156,6 +156,6 @@
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: Implementation :: CPython',
'Development Status :: 4 - Beta',
'Development Status :: 5 - Production/Stable',
],
)

0 comments on commit 46af5ab

Please sign in to comment.