Skip to content
This repository has been archived by the owner on Dec 7, 2020. It is now read-only.

Commit

Permalink
Merge 9aa6d43 into 01379d9
Browse files Browse the repository at this point in the history
  • Loading branch information
lnielsen committed Mar 21, 2018
2 parents 01379d9 + 9aa6d43 commit f6bcbc9
Show file tree
Hide file tree
Showing 17 changed files with 111 additions and 33 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ after_success:

deploy:
provider: pypi
user: jirikuncar
user: inveniosoftware
password:
secure: norMPnfucZ8meNzb0iB0z50KBoPdyfy2ySXnRM+p11iJttcBwYi49AXVUfACf7tbwBOg3egcHd5ophq58d0bZsalnUH8g0/P9f8AfobtdVe3C8ojbWcyPavaAEKDE1tJ+/DUVKibnbvtPGhXAqu4rx5XtdY2icOwoPkajeBwrULOueS5PnnzBjZlzEqMHoepo4in//cWQReLQ1JvTvCiVw/CKgPX5LUxUTg1ZDzVbQFZOGpV1pfy9NgFthGT03DOFKZcqtOowjjC7olLnqzn6J+tX/SYEdXkheTpZt22Cv7kD3xrDXYFJjZzginNNDwsAYmoV4tOduk/99dl1zBr5QtNI3IiHopM3wXA59UjSGUxJBxqaTA2zxI1jPPfk3wuYKmMy0PLnUq/Gl1TZQz3Ka7EvpNIxR2XqOe0aFE0yHjDBH/DKNG8tiBLxpq12RV/0CdhF7eyU0fA/1aZBZiakKdWVxPXRispeIqcH1HwCJmKZcBqM58rewRIP8G/W/QEyyNxNb2q1+gZWRBSz5KIbIVcf+UvFeVpv1fTmZhz7ZTaB65mJaVpaF7dz8lZM/Eu2RTMUqKcOSdXDYhM8GIo/bT6BLvzutGtryDrpYwp6sgjXwVoYm4r722mK/I5f1gGMmeyhAeUMFjf+rXuzhskSFQHZ+nCHoL6RsNgT0fQQn8=
secure: "rBB4WpQDeWqt9xyqXENI/VodBLgOnuPuXIURSBvT+CItWe7dvjGqbWJAbMTZgemaDA9RxQfyIFnFTUkE62AnttxHW39n6UiG+lZgNNdZot8SxYzV6Lza9CdBGMEXwJ9FSf8mer9GIgfO993muKNztt4eFx3aob19Eia2Ob5sgq88Vu7ROxL2+XqM4HT36uh/Q84zcMobYbd5ToM14QNfg65/gtT26hh42KHhCSbS2JZjrudQcM7LCcZWXDs48+dTk4KuAUCUhsbIXlGc1mrxttswocPyk9V0Yhp34JHPqZVAyBI3mtnjKJ6zQB3LpCKuI4hmpv/i8kbay96f7Y49pT7FVXbV+byglyXXrFLHa+/VxkSBpSTyaQjXmctAdvajQjwYN2nKCQXngTAd8O4dgg6xq6e8z5WNFVJAsR5CQ/nYquSQgNamaB6dTEr2sZRrP6KnftzI/uYY9h762qOhkcomNmz9hvw2/yQSTc2xItsdtROsbR4zf5+N2J3vbh3Fr1K/PDkQRdHBTxBs/J3irqps7s2Fl7Sd1O093Y1CZK2Qhyge3poL3JRdDwKjTKqNW2BK+UuUJBzPgwI9t82vIPqTLOkm1bRcmESuh3UMb+sRiZGyNsINKin6htsDIFZDKMs5poeIQq4vm2kKM4GD1zni+cTrGs72/CpTL1zBQuo="
on:
tags: true
distributions: compile_catalog sdist bdist_wheel
Expand Down
28 changes: 19 additions & 9 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
Authors
=======
..
This file is part of Invenio.
Copyright (C) 2016-2018 CERN.
Invenio module with nice defaults for MARC21 overlay.
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.

- Javier Delgado <javier.delgado.fernandez@cern.ch>
- Jiri Kuncar <jiri.kuncar@cern.ch>
- Krzysztof Nowak <k.nowak@cern.ch>
- Lars Holm Nielsen <lars.holm.nielsen@cern.ch>
- Leonardo Rossi <leonardo.r@cern.ch>
- Sebastian Witowski <witowski.sebastian@gmail.com>
Contributors
============

- Alexander Ioannidis
- Alizee Pace
- Dinos Kousidis
- Javier Delgado
- Javier Martin Montull
- Jiri Kuncar
- Krzysztof Nowak
- Lars Holm Nielsen
- Leonardo Rossi
- 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) 2016-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) 2016-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,2 +1,9 @@
..
This file is part of Invenio.
Copyright (C) 2016-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
============
1 change: 0 additions & 1 deletion 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 @@ -13,9 +13,7 @@ include *.txt
include .dockerignore
include .editorconfig
include .tx/config
include .lgtm
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) 2016-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-MARC21
================
Expand All @@ -8,14 +15,8 @@
.. image:: https://img.shields.io/coveralls/inveniosoftware/invenio-marc21.svg
:target: https://coveralls.io/r/inveniosoftware/invenio-marc21

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

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

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


Invenio module with nice defaults for MARC21 overlay.
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) 2016-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) 2016-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) 2016-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/contributing.rst
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
..
This file is part of Invenio.
Copyright (C) 2016-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/index.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
..
This file is part of Invenio.
Copyright (C) 2016-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) 2016-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/usage.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
..
This file is part of Invenio.
Copyright (C) 2016-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_marc21/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.0a7"
__version__ = '1.0.0a8'
20 changes: 10 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
tests_require = [
'check-manifest>=0.25',
'coverage>=4.0',
'invenio-db>=1.0.0a9',
'invenio-i18n>=1.0.0b4',
'invenio-indexer>=1.0.0a1',
'invenio-pidstore>=1.0.0a7',
'invenio-records>=1.0.0a12',
'invenio-db>=1.0.0',
'invenio-i18n>=1.0.0',
'invenio-indexer>=1.0.0',
'invenio-pidstore>=1.0.0',
'invenio-records>=1.0.0',
'isort>=4.2.2',
'mock>=1.3.0',
'pydocstyle>=1.0.0',
Expand All @@ -32,7 +32,7 @@
'pytest>=2.8.0',
]

invenio_search_version = '1.0.0b3'
invenio_search_version = '1.0.0'

extras_require = {
'docs': [
Expand Down Expand Up @@ -67,9 +67,9 @@
'Flask>=0.11.1',
'Flask-BabelEx>=0.9.3',
'dojson>=1.3.0',
'invenio-jsonschemas>=1.0.0a7',
'invenio-records-rest>=1.0.0b4',
'invenio-records-ui>=1.0.0b1',
'invenio-jsonschemas>=1.0.0',
'invenio-records-rest>=1.0.0',
'invenio-records-ui>=1.0.0',
]

packages = find_packages()
Expand Down Expand Up @@ -126,6 +126,6 @@
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: Implementation :: CPython',
'Development Status :: 1 - Planning',
'Development Status :: 5 - Production/Stable',
],
)

0 comments on commit f6bcbc9

Please sign in to comment.