Skip to content

Commit

Permalink
Merge b0e51a3 into 2dddc21
Browse files Browse the repository at this point in the history
  • Loading branch information
Sébastien Délèze committed Jun 25, 2019
2 parents 2dddc21 + b0e51a3 commit b180be7
Show file tree
Hide file tree
Showing 39 changed files with 1,650 additions and 959 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ htmlcov/
nosetests.xml
coverage.xml
*,cover
.pytest_cache

# end-to-end testing
.e2e_screenshots
Expand Down
5 changes: 3 additions & 2 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ name = "pypi"
[packages]
Babel = ">=2.4.0"
Flask-BabelEx = ">=0.9.3"
invenio = { version = "==3.1.0", extras = ["base", "metadata", "postgresql", "auth", "elasticsearch6" ]}
invenio = {version = "==3.1.0",extras = ["base", "metadata", "postgresql", "auth", "elasticsearch6" ]}
# TODO: remove this contraint once it is solved in invenio
raven = { version=">=6.0", extras=["flask"] }
raven = {version = ">=6.0",extras = ["flask"]}
uwsgi = ">=2.0"
uwsgitop = ">=0.11"
uwsgi-tools = ">=1.1.1"
lxml = ">=3.5.0,<4.2.6"
pycountry = "*"

[dev-packages]
Flask-Debugtoolbar = ">=0.10.1"
Expand Down
229 changes: 117 additions & 112 deletions Pipfile.lock

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion pytest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
# more details.

[pytest]
pep8ignore = docs/conf.py ALL
pep8ignore =
*.py W503
docs/conf.py ALL
addopts = --pep8 --doctest-glob="*.rst" --doctest-modules --cov=sonar --cov-report=term-missing --ignore=setup.py
testpaths = docs tests sonar
2 changes: 1 addition & 1 deletion run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# released.
pipenv check --ignore 36759 --ignore 36810 && \
pipenv run pydocstyle sonar tests docs && \
pipenv run isort -rc -c -df && \
pipenv run isort -rc -c -df --multi-line=3 --trailing-comma --force-grid-wrap=0 --use-parentheses --line-width=79 && \
pipenv run check-manifest --ignore ".travis-*,docs/_build*" && \
pipenv run sphinx-build -qnNW docs docs/_build/html && \
pipenv run test
Loading

0 comments on commit b180be7

Please sign in to comment.