Skip to content

Commit

Permalink
framework: update to Invenio 3.2.1
Browse files Browse the repository at this point in the history
* Updates Invenio framework from 3.1 to 3.2.1
* Adapts tests regarding new invenio-search module
* Lists all templates at same place in config.py file
* Fixes init() in CLI (for indexes)
* Fixes test_license() in CLI for files that only have comments (#) lines
* Migrates from DynamicPermission to Permission from invenio-access
* Fixes record_to_index() for documents
* Improves regular expression for schema detection for documents
* Changes document mappings name to document-v0.0.1
* Fixes persons indexation in doc. mappings by using `get_record_by_mef_pid()`

Co-Authored-by: Olivier DOSSMANN <git@dossmann.net>
Co-Authored-by: Peter Weber <peter.weber@rero.ch>
Co-Authored-by: Aly Badr <aly.badr@rero.ch>
  • Loading branch information
3 people committed Mar 18, 2020
1 parent 971a547 commit e31d902
Show file tree
Hide file tree
Showing 14 changed files with 238 additions and 188 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ before_install:

install:
- "./scripts/bootstrap --ci $REQUIREMENTS"
- "pipenv run pip list" # To have details about installed libs (isort, pytest, etc.)

before_script:
# https://docs.travis-ci.com/user/gui-and-headless-browsers/
Expand Down
31 changes: 15 additions & 16 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,19 @@ name = "pypi"
Babel = ">=2.4.0"
Flask-BabelEx = ">=0.9.3"
## Third party invenio modules used by RERO ILS
invenio-oaiharvester = {editable = true,ref = "v1.0.0a4",git = "https://github.com/inveniosoftware/invenio-oaiharvester.git"}
invenio-circulation = {editable = true,git = "https://github.com/inveniosoftware/invenio-circulation.git",ref = "v1.0.0a16"}
## Invenio base modules used by RERO ILS
invenio-oaiharvester = {editable = true, ref = "v1.0.0a4", git = "https://github.com/inveniosoftware/invenio-oaiharvester.git"}
invenio-circulation = {editable = true, ref = "v1.0.0a16", git = "https://github.com/inveniosoftware/invenio-circulation.git"}
## Invenio 3.2.1 base modules used by RERO ILS
# same as invenio metadata extras without invenio-search-ui
invenio-indexer = ">=1.0.1,<1.1.0"
invenio-jsonschemas = ">=1.0.0,<1.1.0"
invenio-oaiserver = ">=1.0.3,<1.1.0"
invenio-pidstore = ">=1.0.0,<1.1.0"
invenio-records-rest = ">=1.4.0,<1.5.0"
invenio-indexer = ">=1.1.1,<1.2.0"
invenio-jsonschemas = ">=1.0.1,<1.1.0"
invenio-oaiserver = ">=1.1.1,<1.2.0"
invenio-pidstore = ">=1.1.0,<1.2.0"
invenio-records-rest = ">=1.6.4,<1.7.0"
invenio-records-ui = ">=1.0.1,<1.1.0"
invenio-records = ">=1.3.0,<1.4.0"
## Default from Invenio
invenio = {version = "~=3.1.0",extras = ["base", "postgresql", "auth", "elasticsearch6"]}
invenio = {version = "==3.2.1", extras = ["base", "postgresql", "auth", "elasticsearch6" ]}
uwsgi = ">=2.0"
uwsgitop = ">=0.11"
uwsgi-tools = ">=1.1.1"
Expand All @@ -57,8 +58,6 @@ uwsgi-tools = ">=1.1.1"
invenio-accounts = "<=1.1.2"
# TODO: remove when DynamicPermission will be solved
invenio-access = "<1.2.0"
# separate tables
invenio-records = ">=1.3.0"
## RERO ILS specific python modules
PyYAML = ">=3.13"
dateparser = ">=0.7.0"
Expand All @@ -85,14 +84,14 @@ lxml = ">=3.5.0,<4.2.6"
Flask-Debugtoolbar = ">=0.10.1"
Sphinx = ">=1.5.1"
check-manifest = ">=0.35"
coverage = ">=4.4.1"
coverage = ">=4.5.3"
isort = ">=4.3"
mock = ">=2.0.0"
marshmallow = ">=2.15.1,<3.0.0"
pydocstyle = ">=2.0.0"
pytest = ">=3.3.1"
pytest-cov = ">=2.5.1"
pytest-invenio = ">=1.0.2,<1.1.0"
pydocstyle = ">=3.0.0"
pytest = ">=4.6.4"
pytest-cov = ">=2.7.1"
pytest-invenio = ">=1.2.1,<1.3.0"
pytest-mock = ">=1.6.0"
pytest-pep8 = ">=1.0.6"
pytest-random-order = ">=0.5.4"
Expand Down

0 comments on commit e31d902

Please sign in to comment.