Skip to content

Commit

Permalink
Merge 7addcae into 08023f7
Browse files Browse the repository at this point in the history
  • Loading branch information
jma committed Apr 23, 2020
2 parents 08023f7 + 7addcae commit 0ca7029
Show file tree
Hide file tree
Showing 40 changed files with 942 additions and 576 deletions.
1 change: 1 addition & 0 deletions .travis.yml
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
33 changes: 15 additions & 18 deletions Pipfile
Expand Up @@ -37,28 +37,25 @@ name = "pypi"
Babel = ">=2.4.0"
Flask-BabelEx = ">=0.9.3"
## Third party invenio modules used by RERO ILS
invenio-oaiharvester = {editable = true, git = "https://github.com/inveniosoftware/invenio-oaiharvester.git", ref = "v1.0.0a4"}
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"
## Additionnal constraints on invenio base modules
# TODO: remove when https://github.com/inveniosoftware/invenio-accounts/issues/306 will be solved
invenio-accounts = "<=1.1.2"
# TODO: remove when DynamicPermission will be solved
invenio-access = "<1.2.0"
# separate tables
invenio-records = ">=1.3.0"
# TODO: remove when sqlalchemy.exc.NoInspectionAvailable problem will be solved
SQLAlchemy = "<=1.3.15"
# TODO: remove when email_validator Exception disappears
Expand Down Expand Up @@ -96,14 +93,14 @@ Flask-Debugtoolbar = ">=0.10.1"
# https://github.com/mozilla-services/python-dockerflow/issues/42
Sphinx = "<3.0.2"
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 0ca7029

Please sign in to comment.