From 1f054877e2279ba3f6c72452ab5dc5351a59d0ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johnny=20Marie=CC=81thoz?= Date: Mon, 8 Aug 2022 14:01:06 +0200 Subject: [PATCH] tests: fix pytest-invenio>1.4.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The new 1.4.12 version of pytest-invenio is not `poetry` friendly. See: https://github.com/inveniosoftware/pytest-invenio/issues/83 for more details. Co-Authored-by: Johnny MarieĢthoz --- poetry.lock | 53 ++++++++++++++++++++++++++++---------------------- pyproject.toml | 3 +++ 2 files changed, 33 insertions(+), 23 deletions(-) diff --git a/poetry.lock b/poetry.lock index 35a5b0a1f1..421aaabd68 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1128,7 +1128,7 @@ elasticsearch7 = ["invenio-search[elasticsearch7] (>=1.4.1,<1.5.0)"] files = ["invenio-files-rest (>=1.2.0,<1.3.0)", "invenio-iiif (>=1.1.0,<1.2.0)", "invenio-previewer (>=1.3.2,<1.4.0)", "invenio-records-files (>=1.2.1,<1.3.0)"] metadata = ["invenio-indexer (>=1.2.0,<1.3.0)", "invenio-jsonschemas (>=1.1.1,<1.2.0)", "invenio-oaiserver (>=1.2.0,<1.3.0)", "invenio-pidstore (>=1.2.1,<1.3.0)", "invenio-records-rest (>=1.8.0,<1.9.0)", "invenio-records-ui (>=1.2.0,<1.3.0)", "invenio-records (>=1.4.0,<1.6.0)", "invenio-search-ui (>=2.0.0,<2.1.0)"] mysql = ["invenio-db[mysql,versioning] (>=1.0.8,<1.1.0)"] -postgresql = ["invenio-db[versioning,postgresql] (>=1.0.8,<1.1.0)"] +postgresql = ["invenio-db[postgresql,versioning] (>=1.0.8,<1.1.0)"] sqlite = ["invenio-db[versioning] (>=1.0.8,<1.1.0)"] tests = ["pytest-invenio (>=1.4.0,<1.5.0)"] @@ -1150,8 +1150,8 @@ invenio-i18n = ">=1.2.0" all = ["Sphinx (>=3)", "cachelib (>=0.1)", "pytest-invenio (>=1.4.1)", "redis (>=2.10.5)"] docs = ["Sphinx (>=3)"] mysql = ["invenio-db[mysql,versioning] (>=1.0.8)"] -postgresql = ["invenio-db[versioning,postgresql] (>=1.0.8)"] -sqlite = ["invenio-db[versioning,sqlite] (>=1.0.8)"] +postgresql = ["invenio-db[postgresql,versioning] (>=1.0.8)"] +sqlite = ["invenio-db[sqlite,versioning] (>=1.0.8)"] tests = ["cachelib (>=0.1)", "pytest-invenio (>=1.4.1)", "redis (>=2.10.5)"] [[package]] @@ -1189,7 +1189,7 @@ admin = ["invenio-admin (>=1.2.1)"] all = ["invenio-admin (>=1.2.1)", "Sphinx (==4.2.0)", "pytest-invenio (>=1.4.2)"] docs = ["Sphinx (==4.2.0)"] mysql = ["invenio-db[mysql,versioning] (>=1.0.9)"] -postgresql = ["invenio-db[versioning,postgresql] (>=1.0.9)"] +postgresql = ["invenio-db[postgresql,versioning] (>=1.0.9)"] sqlite = ["invenio-db[versioning] (>=1.0.9)"] tests = ["pytest-invenio (>=1.4.2)"] @@ -1335,7 +1335,7 @@ docs = ["Sphinx (>=4.2.0)"] elasticsearch6 = ["invenio-search[elasticsearch6] (>=1.3.1,<1.4.0)"] elasticsearch7 = ["invenio-search[elasticsearch7] (>=1.3.1,<1.4.0)", "elasticsearch (>=7.0.0,<7.14)"] mysql = ["invenio-db[mysql,versioning] (>=1.0.9,<1.1.0)"] -postgresql = ["invenio-db[versioning,postgresql] (>=1.0.9,<1.1.0)"] +postgresql = ["invenio-db[postgresql,versioning] (>=1.0.9,<1.1.0)"] sqlite = ["invenio-db[versioning] (>=1.0.9,<1.1.0)"] tests = ["mock (>=2.0.0)", "pytest-invenio (>=1.4.1,<1.5.0)", "pytest-mock (>=1.6.0)", "celery[pytest] (>=4.4.0,<5.1)", "invenio-app (>=1.3.1)", "invenio-jsonschemas (>=1.0.1)", "Flask (>=1.1.0,<2.0.0)"] @@ -1589,7 +1589,7 @@ admin = ["invenio-admin (>=1.2.1)"] all = ["invenio-admin (>=1.2.1)", "Sphinx (>=4.2.0)", "redis (>=2.10.5)", "pytest-invenio (>=1.4.0)"] docs = ["Sphinx (>=4.2.0)"] mysql = ["invenio-db[mysql,versioning] (>=1.0.9,<2.0.0)"] -postgresql = ["invenio-db[versioning,postgresql] (>=1.0.9,<2.0.0)"] +postgresql = ["invenio-db[postgresql,versioning] (>=1.0.9,<2.0.0)"] redis = ["redis (>=2.10.5)"] sqlite = ["invenio-db[versioning] (>=1.0.9,<2.0.0)"] tests = ["pytest-invenio (>=1.4.0)"] @@ -1673,7 +1673,7 @@ admin = ["invenio-admin (>=1.2.1)"] all = ["Sphinx (==4.2.0)", "invenio-admin (>=1.2.1)", "pytest-invenio (>=1.4.1)"] docs = ["Sphinx (==4.2.0)"] mysql = ["invenio-db[mysql,versioning] (>=1.0.9,<1.1.0)"] -postgresql = ["invenio-db[versioning,postgresql] (>=1.0.9,<1.1.0)"] +postgresql = ["invenio-db[postgresql,versioning] (>=1.0.9,<1.1.0)"] sqlite = ["invenio-db[versioning] (>=1.0.9,<1.1.0)"] tests = ["pytest-invenio (>=1.4.1)"] @@ -1722,9 +1722,9 @@ invenio-pidstore = ">=1.2.0" invenio-records = ">=1.0.0" [package.extras] -all = ["Sphinx (>=1.5.1)", "invenio-access (>=1.0.0)", "invenio-accounts (>=1.3.0)", "invenio-db[mysql,versioning,postgresql] (>=1.0.0)", "pytest-invenio (>=1.4.0)"] +all = ["Sphinx (>=1.5.1)", "invenio-access (>=1.0.0)", "invenio-accounts (>=1.3.0)", "invenio-db[mysql,postgresql,versioning] (>=1.0.0)", "pytest-invenio (>=1.4.0)"] docs = ["Sphinx (>=1.5.1)"] -tests = ["invenio-access (>=1.0.0)", "invenio-accounts (>=1.3.0)", "invenio-db[mysql,versioning,postgresql] (>=1.0.0)", "pytest-invenio (>=1.4.0)"] +tests = ["invenio-access (>=1.0.0)", "invenio-accounts (>=1.3.0)", "invenio-db[mysql,postgresql,versioning] (>=1.0.0)", "pytest-invenio (>=1.4.0)"] [[package]] name = "invenio-rest" @@ -1800,7 +1800,7 @@ docs = ["Sphinx (>=3)"] elasticsearch6 = ["invenio-search[elasticsearch6] (>=1.4.1,<2.0.0)"] elasticsearch7 = ["invenio-search[elasticsearch7] (>=1.4.1,<2.0.0)"] mysql = ["invenio-db[mysql,versioning] (>=1.0.9,<2.0.0)"] -postgresql = ["invenio-db[versioning,postgresql] (>=1.0.9,<2.0.0)"] +postgresql = ["invenio-db[postgresql,versioning] (>=1.0.9,<2.0.0)"] sqlite = ["invenio-db[versioning] (>=1.0.9,<2.0.0)"] tests = ["mock (>=2.0.0)", "pytest-mock (>=1.6.0)", "invenio-app (>=1.2.3)", "invenio-db (>=1.0.9)", "autoflake (>=1.3.1)", "isort (>=5.1.0)", "pydocstyle (>=5.0.0)", "pytest-invenio (>=1.4.0,<1.4.1)"] @@ -2849,7 +2849,7 @@ urllib3 = "*" [[package]] name = "sentry-sdk" -version = "1.8.0" +version = "1.6.0" description = "Python client for Sentry (https://sentry.io)" category = "main" optional = false @@ -2869,7 +2869,6 @@ celery = ["celery (>=3)"] chalice = ["chalice (>=1.16.0)"] django = ["django (>=1.8)"] falcon = ["falcon (>=1.4)"] -fastapi = ["fastapi (>=0.79.0)"] flask = ["flask (>=0.11)", "blinker (>=1.1)"] httpx = ["httpx (>=0.16.0)"] pure_eval = ["pure-eval", "executing", "asttokens"] @@ -2878,7 +2877,6 @@ quart = ["quart (>=0.16.1)", "blinker (>=1.1)"] rq = ["rq (>=0.6)"] sanic = ["sanic (>=0.8)"] sqlalchemy = ["sqlalchemy (>=1.2)"] -starlette = ["starlette (>=0.19.1)"] tornado = ["tornado (>=5)"] [[package]] @@ -3118,7 +3116,7 @@ executing = "*" pure-eval = "*" [package.extras] -tests = ["cython", "littleutils", "pygments", "typeguard", "pytest"] +tests = ["pytest", "typeguard", "pygments", "littleutils", "cython"] [[package]] name = "toml" @@ -3389,7 +3387,7 @@ sip2 = ["invenio-sip2"] [metadata] lock-version = "1.1" python-versions = ">= 3.9, <3.10" -content-hash = "b84e61c593335f3fea71503b413110f81deffe1cb265a606fa4a5de3e519512c" +content-hash = "144db26f7e2a6c998613e94e046e230233eda2595d0da8a764e0c22154ca41da" [metadata.files] alabaster = [ @@ -3470,7 +3468,10 @@ celery = [ {file = "celery-5.1.2-py3-none-any.whl", hash = "sha256:9dab2170b4038f7bf10ef2861dbf486ddf1d20592290a1040f7b7a1259705d42"}, {file = "celery-5.1.2.tar.gz", hash = "sha256:8d9a3de9162965e97f8e8cc584c67aad83b3f7a267584fa47701ed11c3e0d4b0"}, ] -certifi = [] +certifi = [ + {file = "certifi-2022.5.18.1-py3-none-any.whl", hash = "sha256:f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a"}, + {file = "certifi-2022.5.18.1.tar.gz", hash = "sha256:9c5705e395cd70084351dd8ad5c41e65655e08ce46f2ec9cf6c2c08390f71eb7"}, +] cffi = [ {file = "cffi-1.15.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:c2502a1a03b6312837279c8c1bd3ebedf6c12c4228ddbad40912d671ccc8a962"}, {file = "cffi-1.15.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:23cfe892bd5dd8941608f93348c0737e369e51c100d03718f108bf1add7bd6d0"}, @@ -3925,7 +3926,10 @@ invenio-search = [ {file = "invenio_search-1.4.2-py2.py3-none-any.whl", hash = "sha256:50bfbd4f7bc56f05504084305de205e5b93498ccee83741ca0dd4a0fdcc5334a"}, ] invenio-sip2 = [] -invenio-theme = [] +invenio-theme = [ + {file = "invenio-theme-1.3.24.tar.gz", hash = "sha256:3ce004268b274995a80d8239ac3a7a6129eb130fa2e5824235fcffa71d9c4990"}, + {file = "invenio_theme-1.3.24-py2.py3-none-any.whl", hash = "sha256:98dd9ff1cedb8a756edd79590f602968aa70b791fb31d82c621853005c8a0833"}, +] invenio-userprofiles = [] ipython = [ {file = "ipython-8.4.0-py3-none-any.whl", hash = "sha256:7ca74052a38fa25fe9bedf52da0be7d3fdd2fb027c3b778ea78dfe8c212937d1"}, @@ -4502,10 +4506,7 @@ raven = [ {file = "raven-6.10.0-py2.py3-none-any.whl", hash = "sha256:44a13f87670836e153951af9a3c80405d36b43097db869a36e92809673692ce4"}, {file = "raven-6.10.0.tar.gz", hash = "sha256:3fa6de6efa2493a7c827472e984ce9b020797d0da16f1db67197bcc23c8fae54"}, ] -redis = [ - {file = "redis-4.3.1-py3-none-any.whl", hash = "sha256:84316970995a7adb907a56754d2b92d88fc2d252963dc5ac34c88f0f1a22c25d"}, - {file = "redis-4.3.1.tar.gz", hash = "sha256:94b617b4cd296e94991146f66fc5559756fbefe9493604f0312e4d3298ac63e9"}, -] +redis = [] redisbeat = [ {file = "redisbeat-1.2.2.tar.gz", hash = "sha256:59b7e9984cb9cde9eaea21093ca2b953f83995a64b6c240e4c36f1b2e9ed1e38"}, ] @@ -4602,7 +4603,10 @@ selenium = [ {file = "selenium-3.141.0-py2.py3-none-any.whl", hash = "sha256:2d7131d7bc5a5b99a2d9b04aaf2612c411b03b8ca1b1ee8d3de5845a9be2cb3c"}, {file = "selenium-3.141.0.tar.gz", hash = "sha256:deaf32b60ad91a4611b98d8002757f29e6f2c2d5fcaf202e1c9ad06d6772300d"}, ] -sentry-sdk = [] +sentry-sdk = [ + {file = "sentry-sdk-1.6.0.tar.gz", hash = "sha256:b82ad57306d5546713f15d5d70daea0408cf7f998c7566db16e0e6257e51e561"}, + {file = "sentry_sdk-1.6.0-py2.py3-none-any.whl", hash = "sha256:ddbd191b6f4e696b7845b4d87389898ae1207981faf114f968a57363aa6be03c"}, +] sickle = [ {file = "Sickle-0.7.0-py3-none-any.whl", hash = "sha256:6ace7b1d1fc76571fe0dbfefc2c49e5e6c026e2d0dcaae521f4da21e98d4bc85"}, {file = "Sickle-0.7.0.tar.gz", hash = "sha256:8944bcda3db0109a361248ef71fef476dd1f11109cdd1a41135527b7992b958b"}, @@ -4757,7 +4761,10 @@ sqlalchemy-continuum = [ sqlalchemy-utils = [ {file = "SQLAlchemy-Utils-0.35.0.tar.gz", hash = "sha256:01f0f0ebed696386bc7bf9231cd6894087baba374dd60f40eb1b07512d6b1a5e"}, ] -stack-data = [] +stack-data = [ + {file = "stack_data-0.2.0-py3-none-any.whl", hash = "sha256:999762f9c3132308789affa03e9271bbbe947bf78311851f4d485d8402ed858e"}, + {file = "stack_data-0.2.0.tar.gz", hash = "sha256:45692d41bd633a9503a5195552df22b583caf16f0b27c4e58c98d88c8b648e12"}, +] toml = [ {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"}, {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"}, diff --git a/pyproject.toml b/pyproject.toml index 244fd2919e..2137c6a8e5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -92,6 +92,9 @@ markupsafe = "<2.1.0" poethepoet = "^0.12.3" jedi = "<0.18.0" flask-wiki = {git = "https://github.com/rero/flask-wiki.git", rev = "v0.2.1"} +pytest-invenio = ">=1.4.0,<1.4.12" +# to avoid conflict for urllib3 +sentry-sdk = "<1.6.1" [tool.poetry.dev-dependencies] ## Python packages development dependencies (order matters)