Skip to content
This repository was archived by the owner on Jul 24, 2025. It is now read-only.

Commit 619144e

Browse files
committed
dependencies: fix security issues
* Bumps dependencies. Co-Authored-by: Peter Weber <[email protected]>
1 parent ba7d577 commit 619144e

File tree

7 files changed

+1044
-1020
lines changed

7 files changed

+1044
-1020
lines changed

.github/workflows/continuous-integration-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup node
1919
uses: actions/setup-node@v3
2020
with:
21-
node-version: '12'
21+
node-version: '14'
2222

2323
- name: Docker compose up
2424
run: docker-compose up -d
@@ -51,7 +51,7 @@ jobs:
5151
poetry run ./scripts/bootstrap --ci --deploy E2E=yes
5252
5353
- name: Run Test
54-
run: poetry run ./run-tests.sh
54+
run: poetry run ./scripts/test
5555

5656
# - name: Upload Coverage ${{ matrix.tests }}
5757
# if: ${{ matrix.dependencies == 'locked' }}

CONTRIBUTING.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Ready to contribute? Here's how to set up `rero-ebooks` for local development.
101101

102102
.. code-block:: console
103103
104-
$ ./run-tests.sh
104+
$ ./scripts/test
105105
106106
The tests will provide you with test coverage and also check PEP8
107107
(code style), PEP257 (documentation), flake8 as well as build the Sphinx

INSTALL.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,14 @@ Run the test suite via the provided script:
9797

9898
.. code-block:: console
9999
100-
$ ./run-tests.sh
100+
$ ./scripts/test
101101
102102
By default, end-to-end tests are skipped. You can include the E2E tests like
103103
this:
104104

105105
.. code-block:: console
106106
107-
$ env E2E=yes ./run-tests.sh
107+
$ env E2E=yes ./scripts/test
108108
109109
For more information about end-to-end testing see `pytest-invenio
110110
<https://pytest-invenio.readthedocs.io/en/latest/usage.html#running-e2e-tests>`_

poetry.lock

Lines changed: 1015 additions & 997 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ uwsgitop = ">=0.11"
2929

3030
## Third party invenio modules used by RERO EBOOKS
3131
# TODO: needed for `parameter from` fix.
32-
invenio-oaiserver = { git = "https://github.com/rerowep/invenio-oaiserver.git", branch = "wep-fix-from" }
3332
invenio-oaiharvester = { git = "https://github.com/inveniosoftware/invenio-oaiharvester.git", tag = "v1.0.0a4" }
3433
invenio-search = {version = ">=2.1.0,<3.0.0", extras = ["elasticsearch7"]}
3534

@@ -43,22 +42,23 @@ invenio-i18n = ">=2.0.0,<3.0.0"
4342
invenio-db = {version = ">=1.0.14,<1.1.0", extras = ["postgresql"]}
4443
# Invenio base bundle
4544
invenio-admin = ">=1.4.0,<1.5.0"
46-
invenio-assets = ">=2.0.0,<3.0.0"
47-
invenio-formatter = ">=1.2.0,<1.3.0"
48-
invenio-logging = {version = ">=1.3.2,<1.4.0", extras = ["sentry-sdk"]}
49-
invenio-mail = ">=1.0.2,<1.1.0"
50-
invenio-rest = ">=1.2.8,<1.3.0"
45+
# invenio-assets = ">=3.0.0,<4.0.0" # error patch-package 6.5.1 semantic-ui-less
46+
invenio-assets = ">=1.0.0,<3.0.0"
47+
invenio-formatter = ">=2.0.0,<3.0.0"
48+
invenio-logging = {version = ">=2.0.0,<3.0.0"}
49+
invenio-mail = ">=2.0.0,<3.0.0"
50+
invenio-rest = ">=1.3.0,<1.4.0"
5151
invenio-theme = ">=2.0.0,<3.0.0"
5252
# Invenio auth bundle
53-
invenio-access = ">=1.4.4,<1.5.0"
54-
invenio-accounts = ">=2.1.0,<2.2.0"
55-
invenio-oauth2server = ">=2.0.0,<2.1.0"
56-
invenio-oauthclient = ">=2.2.0,<3.0.0"
57-
invenio-userprofiles = ">=2.2.0,<2.3.0"
53+
invenio-access = ">=2.0.0,<3.0.0"
54+
invenio-accounts = ">=3.0.0,<4.0.0"
55+
invenio-oauth2server = ">=2.0.0,<3.0.0"
56+
invenio-oauthclient = ">=3.0.0,<4.0.0"
57+
invenio-userprofiles = ">=2.2.0,<3.0.0"
5858
# Invenio metadata bundle
59-
invenio-indexer = ">=2.1.0,<2.2.0"
59+
invenio-indexer = ">=2.2.0,<3.0.0"
6060
invenio-jsonschemas = ">=1.1.4,<1.2.0"
61-
# invenio-oaiserver = ">=2.2.0,<2.3.0"
61+
invenio-oaiserver = ">=2.2.0,<2.3.0"
6262
invenio-pidstore = ">=1.3.0,<1.4.0"
6363
invenio-records-rest = ">=2.2.0,<2.3.0"
6464
invenio-records-ui = ">=1.2.0,<1.3.0"
@@ -68,7 +68,8 @@ invenio-records = "2.1.0,<2.2.0"
6868
Flask = ">=2.2.0,<2.3.0"
6969
dojson = ">=1.4.0"
7070
# TODO: dojson problem = AttributeError: 'Group' object has no attribute 'resultcallback'
71-
click = "<8.1.0"
71+
# click = "<8.1.0"
72+
sentry-sdk = ">=1.0.0" # normaly in invenio-logging = {version = ">=2.0.0,<3.0.0", extras = ["sentry_sdk"]}
7273

7374
## RERO ILS specific python modules
7475
PyYAML = ">=5.3.1"
@@ -165,7 +166,7 @@ apiharvester = "rero_ebooks.apiharvester.tasks"
165166
[tool.poe.tasks]
166167
bootstrap = {cmd = "./scripts/bootstrap", help = "Runs bootstrap"}
167168
console = {cmd = "./scripts/console", help = "Opens invenio shell"}
168-
run_tests = {cmd = "./run-tests.sh", help = "Runs all tests"}
169+
run_tests = {cmd = "./scripts/tests", help = "Runs all tests"}
169170
tests = {cmd = "pytest", help = "pytest"}
170171
tests_debug = {cmd = "./scripts/pytest -s --v --no-cov", help = "pytest -s --v --no-cov"}
171172
server = {cmd = "./scripts/server", help = "Starts the server "}

rero_ebooks/config.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ def _(x):
3333
return x
3434

3535

36+
APP_THEME = ['bootstrap3']
37+
3638
# Rate limiting
3739
# =============
3840
RATELIMIT_STORAGE_URL = 'redis://localhost:6379/3'

run-tests.sh renamed to scripts/test

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,20 +59,23 @@ msg "PROGRAM: ${PROGRAM}"
5959

6060
# Poetry is a mandatory condition to launch this program!
6161
if [[ -z "${VIRTUAL_ENV}" ]]; then
62-
error_msg+exit "Error - Launch this script via poetry command:\n\tpoetry run run-tests"
62+
error_msg+exit "Error - Launch this script via poetry command:\n\tpoetry run ./scripts/test"
6363
fi
6464

6565
set -e
6666
# TODO: find out why we have following error:
67-
# -> Vulnerability found in sqlalchemy version 1.4.48
67+
# -> Vulnerability found in flask-caching version 2.0.1
68+
# Vulnerability ID: 40459
69+
# -> Vulnerability found in sqlalchemy version 1.4.50
6870
# Vulnerability ID: 51668
6971
# -> Vulnerability found in sqlalchemy-utils version 0.38.3
7072
# Vulnerability ID: 42194
7173
# -> Vulnerability found in wtforms version 2.3.3
7274
# Vulnerability ID: 42852
7375
# -> Vulnerability found in py version 1.11.0
7476
# Vulnerability ID: 51457
75-
safety check -o bare -i 51668 -i 42194 -i 42852 -i 51457
77+
info_msg "Test safety:"
78+
safety check -o bare -i 40459 -i 51668 -i 42194 -i 42852 -i 51457
7679
info_msg "Test pydocstyle:"
7780
pydocstyle rero_ebooks tests docs
7881
info_msg "Test isort:"

0 commit comments

Comments
 (0)