From ebafb3a65cd2466a7e2ffd6c8df7422d828e6d85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 11:22:58 +0000 Subject: [PATCH 1/4] build(deps): bump invenio-accounts from 5.0.1 to 5.1.0 Bumps [invenio-accounts](https://github.com/inveniosoftware/invenio-accounts) from 5.0.1 to 5.1.0. - [Release notes](https://github.com/inveniosoftware/invenio-accounts/releases) - [Changelog](https://github.com/inveniosoftware/invenio-accounts/blob/master/CHANGES.rst) - [Commits](https://github.com/inveniosoftware/invenio-accounts/compare/v5.0.1...v5.1.0) --- updated-dependencies: - dependency-name: invenio-accounts dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 845345af..bca6aa2e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ gunicorn==22.0.0 hepdata-converter-ws-client==0.2.2 hepdata-validator==0.3.5 invenio-access==2.0.0 # Indirect (needed by invenio-admin) -invenio-accounts==5.0.1 +invenio-accounts==5.1.0 invenio-admin==1.5.0 invenio-app==1.5.0 invenio-assets==3.0.3 From b90c7d5deee96f3d4a875c8b87195f04a8f1dbc9 Mon Sep 17 00:00:00 2001 From: Graeme Watt Date: Thu, 1 Aug 2024 17:10:18 +0100 Subject: [PATCH 2/4] setup: pin pytest<8.0.0 when installing pytest * pytest>=8 installs pluggy>=1 incompatible with jsonresolver. --- .github/dependabot.yml | 1 + setup.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a8046c29..d26945eb 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -19,4 +19,5 @@ updates: schedule: interval: "monthly" ignore: + - dependency-name: "pytest" # see https://github.com/HEPData/hepdata/issues/815 - dependency-name: "pytest-cov" # see https://github.com/HEPData/hepdata/issues/580 diff --git a/setup.py b/setup.py index 9317ca69..93995a73 100644 --- a/setup.py +++ b/setup.py @@ -32,8 +32,8 @@ history = open('CHANGES.rst').read() tests_require = [ - 'pytest>=6.0.2', - 'pytest-cov>=2.9.0,<4.0.0', + 'pytest>=6.0.2,<8.0.0', # see https://github.com/HEPData/hepdata/issues/815 + 'pytest-cov>=2.9.0,<4.0.0', # see https://github.com/HEPData/hepdata/issues/580 'pytest-flask>=1.0.0', 'pytest-mock>=3.1.0', 'pytest-timeout>=1.4.2', From 78cb3e373b40b368afb910ea05edab61f6fd74a8 Mon Sep 17 00:00:00 2001 From: Graeme Watt Date: Thu, 1 Aug 2024 17:13:05 +0100 Subject: [PATCH 3/4] requirements: invenio-admin installs invenio-app --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index bca6aa2e..6158544a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,6 @@ hepdata-validator==0.3.5 invenio-access==2.0.0 # Indirect (needed by invenio-admin) invenio-accounts==5.1.0 invenio-admin==1.5.0 -invenio-app==1.5.0 invenio-assets==3.0.3 invenio-config==1.0.4 invenio-db[postgresql]==1.1.5 From 4d5e4dfa81059804e1f8ccbb35e5eb43f65c387c Mon Sep 17 00:00:00 2001 From: Graeme Watt Date: Thu, 1 Aug 2024 18:11:20 +0100 Subject: [PATCH 4/4] requirements: pin invenio-accounts==5.0.1 (#816) --- .github/dependabot.yml | 1 + requirements.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index d26945eb..7047e78a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -19,5 +19,6 @@ updates: schedule: interval: "monthly" ignore: + - dependency-name: "invenio-accounts" # see https://github.com/HEPData/hepdata/issues/816 - dependency-name: "pytest" # see https://github.com/HEPData/hepdata/issues/815 - dependency-name: "pytest-cov" # see https://github.com/HEPData/hepdata/issues/580 diff --git a/requirements.txt b/requirements.txt index 6158544a..83c4abab 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ gunicorn==22.0.0 hepdata-converter-ws-client==0.2.2 hepdata-validator==0.3.5 invenio-access==2.0.0 # Indirect (needed by invenio-admin) -invenio-accounts==5.1.0 +invenio-accounts==5.0.1 # https://github.com/HEPData/hepdata/issues/816 invenio-admin==1.5.0 invenio-assets==3.0.3 invenio-config==1.0.4