From 78e415115d31c5f872dda66c4c32263964635bd6 Mon Sep 17 00:00:00 2001 From: Peter Weber Date: Tue, 28 Feb 2023 16:43:35 +0100 Subject: [PATCH] tests: prevent MEF access * Updates dependencies. * Fixes fixtures with $ref to MEF. * Fixes Babel time string ' AM' to '\u202fAM'. Co-Authored-by: Peter Weber --- poetry.lock | 159 +++++++++--------- pyproject.toml | 2 +- run-tests.sh | 19 +-- tests/data/data.json | 26 --- tests/data/xml/kul/kul_isbn_9782265089419.xml | 1 - .../xml/loc/loc_isbn_all_9781604689808.xml | 2 - tests/data/xml/slsp/slsp_anywhere_123.xml | 25 --- tests/data/xml/slsp/slsp_isbn_3908497272.xml | 4 - .../data/xml/slsp/slsp_isbn_9782296076648.xml | 5 - tests/data/xml/ugent/ugent_anywhere_123.xml | 6 - .../data/xml/ugent/ugent_book_without_26X.xml | 2 - tests/data/xml/ugent/ugent_samuelson.xml | 3 - tests/ui/test_filters.py | 8 +- 13 files changed, 92 insertions(+), 170 deletions(-) diff --git a/poetry.lock b/poetry.lock index 0452cf0871..d883babafc 100644 --- a/poetry.lock +++ b/poetry.lock @@ -8,7 +8,7 @@ python-versions = ">=3.6" [[package]] name = "alembic" -version = "1.9.2" +version = "1.9.4" description = "A database migration tool for SQLAlchemy." category = "main" optional = false @@ -110,14 +110,11 @@ toml = ">=0.10.2" [[package]] name = "babel" -version = "2.11.0" +version = "2.12.1" description = "Internationalization utilities" category = "main" optional = false -python-versions = ">=3.6" - -[package.dependencies] -pytz = ">=2015.7" +python-versions = ">=3.7" [[package]] name = "backcall" @@ -402,7 +399,7 @@ toml = ["toml"] [[package]] name = "cryptography" -version = "38.0.4" +version = "39.0.1" description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." category = "main" optional = false @@ -412,12 +409,14 @@ python-versions = ">=3.6" cffi = ">=1.12" [package.extras] -docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx-rtd-theme"] +docs = ["sphinx (>=5.3.0)", "sphinx-rtd-theme (>=1.1.1)"] docstest = ["pyenchant (>=1.6.11)", "sphinxcontrib-spelling (>=4.0.1)", "twine (>=1.12.0)"] -pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"] +pep8test = ["black", "check-manifest", "mypy", "ruff", "types-pytz", "types-requests"] sdist = ["setuptools-rust (>=0.11.4)"] ssh = ["bcrypt (>=3.1.5)"] -test = ["hypothesis (>=1.11.4,!=3.79.2)", "iso8601", "pretend", "pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-subtests", "pytest-xdist", "pytz"] +test = ["hypothesis (>=1.11.4,!=3.79.2)", "iso8601", "pretend", "pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-shard (>=0.1.2)", "pytest-subtests", "pytest-xdist", "pytz"] +test-randomorder = ["pytest-randomly"] +tox = ["tox"] [[package]] name = "dateparser" @@ -636,7 +635,7 @@ dotenv = ["python-dotenv"] [[package]] name = "flask-admin" -version = "1.6.0" +version = "1.6.1" description = "Simple and extensible admin interface framework for Flask" category = "main" optional = false @@ -1038,7 +1037,7 @@ testing = ["flake8 (<5)", "flufl.flake8", "importlib-resources (>=1.3)", "packag [[package]] name = "importlib-resources" -version = "5.10.2" +version = "5.12.0" description = "Read resources from Python packages" category = "main" optional = false @@ -1817,7 +1816,7 @@ resolved_reference = "41d2b471cde1a93f660ba7bf0037ee3fb80b65fc" [[package]] name = "ipython" -version = "8.9.0" +version = "8.11.0" description = "IPython: Productive Interactive Computing" category = "main" optional = false @@ -1832,13 +1831,13 @@ jedi = ">=0.16" matplotlib-inline = "*" pexpect = {version = ">4.3", markers = "sys_platform != \"win32\""} pickleshare = "*" -prompt-toolkit = ">=3.0.30,<3.1.0" +prompt-toolkit = ">=3.0.30,<3.0.37 || >3.0.37,<3.1.0" pygments = ">=2.4.0" stack-data = "*" traitlets = ">=5" [package.extras] -all = ["black", "curio", "docrepr", "ipykernel", "ipyparallel", "ipywidgets", "matplotlib", "matplotlib (!=3.2.0)", "nbconvert", "nbformat", "notebook", "numpy (>=1.20)", "pandas", "pytest (<7)", "pytest (<7.1)", "pytest-asyncio", "qtconsole", "setuptools (>=18.5)", "sphinx (>=1.3)", "sphinx-rtd-theme", "stack-data", "testpath", "trio", "typing-extensions"] +all = ["black", "curio", "docrepr", "ipykernel", "ipyparallel", "ipywidgets", "matplotlib", "matplotlib (!=3.2.0)", "nbconvert", "nbformat", "notebook", "numpy (>=1.21)", "pandas", "pytest (<7)", "pytest (<7.1)", "pytest-asyncio", "qtconsole", "setuptools (>=18.5)", "sphinx (>=1.3)", "sphinx-rtd-theme", "stack-data", "testpath", "trio", "typing-extensions"] black = ["black"] doc = ["docrepr", "ipykernel", "matplotlib", "pytest (<7)", "pytest (<7.1)", "pytest-asyncio", "setuptools (>=18.5)", "sphinx (>=1.3)", "sphinx-rtd-theme", "stack-data", "testpath", "typing-extensions"] kernel = ["ipykernel"] @@ -1848,11 +1847,11 @@ notebook = ["ipywidgets", "notebook"] parallel = ["ipyparallel"] qtconsole = ["qtconsole"] test = ["pytest (<7.1)", "pytest-asyncio", "testpath"] -test-extra = ["curio", "matplotlib (!=3.2.0)", "nbformat", "numpy (>=1.20)", "pandas", "pytest (<7.1)", "pytest-asyncio", "testpath", "trio"] +test-extra = ["curio", "matplotlib (!=3.2.0)", "nbformat", "numpy (>=1.21)", "pandas", "pytest (<7.1)", "pytest-asyncio", "testpath", "trio"] [[package]] name = "isbnlib" -version = "3.10.12" +version = "3.10.13" description = "Extract, clean, transform, hyphenate and metadata for ISBNs (International Standard Book Number)." category = "main" optional = false @@ -2306,7 +2305,7 @@ python-versions = "*" [[package]] name = "pip" -version = "23.0" +version = "23.0.1" description = "The PyPA recommended tool for installing Python packages." category = "main" optional = false @@ -2340,7 +2339,7 @@ poetry-plugin = ["poetry (>=1.0,<2.0)"] [[package]] name = "polib" -version = "1.1.1" +version = "1.2.0" description = "A library to manipulate gettext files (po and mo files)." category = "main" optional = false @@ -2348,11 +2347,11 @@ python-versions = "*" [[package]] name = "prompt-toolkit" -version = "3.0.36" +version = "3.0.38" description = "Library for building powerful interactive command lines in Python" category = "main" optional = false -python-versions = ">=3.6.2" +python-versions = ">=3.7.0" [package.dependencies] wcwidth = "*" @@ -2643,11 +2642,11 @@ six = ">=1.5" [[package]] name = "python-dotenv" -version = "0.21.1" +version = "1.0.0" description = "Read key-value pairs from a .env file and set them as environment variables" category = "main" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" [package.extras] cli = ["click (>=5.0)"] @@ -2714,7 +2713,7 @@ tests = ["Flask (>=0.8)", "Flask-Login (>=0.2.0)", "ZConfig", "aiohttp", "anyjso [[package]] name = "redis" -version = "4.4.2" +version = "4.5.1" description = "Python client for Redis database and key-value store" category = "main" optional = false @@ -2912,11 +2911,11 @@ python-versions = "*" [[package]] name = "soupsieve" -version = "2.3.2.post1" +version = "2.4" description = "A modern CSS selector implementation for Beautiful Soup." category = "dev" optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" [[package]] name = "speaklater" @@ -3359,7 +3358,7 @@ python-versions = ">=3.4" [[package]] name = "zipp" -version = "3.12.1" +version = "3.15.0" description = "Backport of pathlib-compatible object wrapper for zip files" category = "main" optional = false @@ -3367,7 +3366,7 @@ python-versions = ">=3.7" [package.extras] docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] -testing = ["flake8 (<5)", "func-timeout", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)"] +testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)"] [extras] sip2 = ["invenio-sip2"] @@ -3375,7 +3374,7 @@ sip2 = ["invenio-sip2"] [metadata] lock-version = "1.1" python-versions = ">= 3.9, <3.10" -content-hash = "ab5ab91812114d376d84da4a086cd1be92f195b8282bb89c8b9d17b5b8ae0d8b" +content-hash = "4ce1fbd8cb83672a31c2a4f6de8fe0f002c19e6185bf27837b42734d79dee844" [metadata.files] alabaster = [ @@ -3383,8 +3382,8 @@ alabaster = [ {file = "alabaster-0.7.13.tar.gz", hash = "sha256:a27a4a084d5e690e16e01e03ad2b2e552c61a65469419b907243193de1a84ae2"}, ] alembic = [ - {file = "alembic-1.9.2-py3-none-any.whl", hash = "sha256:e8a6ff9f3b1887e1fed68bfb8fb9a000d8f61c21bdcc85b67bb9f87fcbc4fce3"}, - {file = "alembic-1.9.2.tar.gz", hash = "sha256:6880dec4f28dd7bd999d2ed13fbe7c9d4337700a44d11a524c0ce0c59aaf0dbd"}, + {file = "alembic-1.9.4-py3-none-any.whl", hash = "sha256:6f1c2207369bf4f49f952057a33bb017fbe5c148c2a773b46906b806ea6e825f"}, + {file = "alembic-1.9.4.tar.gz", hash = "sha256:4d3bd32ecdbb7bbfb48a9fe9e6d6fd6a831a1b59d03e26e292210237373e7db5"}, ] amqp = [ {file = "amqp-5.1.1-py3-none-any.whl", hash = "sha256:6f0956d2c23d8fa6e7691934d8c3930eadb44972cbbd1a7ae3a520f735d43359"}, @@ -3418,8 +3417,8 @@ autoflake = [ {file = "autoflake-1.5.3.tar.gz", hash = "sha256:44f7d7eb2c1c49505b513c0e93a5dfd3f7b4218283f50c5ca0af4df6b975d470"}, ] babel = [ - {file = "Babel-2.11.0-py3-none-any.whl", hash = "sha256:1ad3eca1c885218f6dce2ab67291178944f810a10a9b5f3cb8382a5a232b64fe"}, - {file = "Babel-2.11.0.tar.gz", hash = "sha256:5ef4b3226b0180dedded4229651c8b0e1a3a6a2837d45a073272f313e4cf97f6"}, + {file = "Babel-2.12.1-py3-none-any.whl", hash = "sha256:b4246fb7677d3b98f501a39d43396d3cafdc8eadb045f4a31be01863f655c610"}, + {file = "Babel-2.12.1.tar.gz", hash = "sha256:cc2d99999cd01d44420ae725a21c9e3711b3aadc7976d6147f622d8581963455"}, ] backcall = [ {file = "backcall-0.2.0-py2.py3-none-any.whl", hash = "sha256:fbbce6a29f263178a1f7915c1940bde0ec2b2a967566fe1c65c1dfb7422bd255"}, @@ -3747,32 +3746,29 @@ coverage = [ {file = "coverage-5.5.tar.gz", hash = "sha256:ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c"}, ] cryptography = [ - {file = "cryptography-38.0.4-cp36-abi3-macosx_10_10_universal2.whl", hash = "sha256:2fa36a7b2cc0998a3a4d5af26ccb6273f3df133d61da2ba13b3286261e7efb70"}, - {file = "cryptography-38.0.4-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:1f13ddda26a04c06eb57119caf27a524ccae20533729f4b1e4a69b54e07035eb"}, - {file = "cryptography-38.0.4-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:2ec2a8714dd005949d4019195d72abed84198d877112abb5a27740e217e0ea8d"}, - {file = "cryptography-38.0.4-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50a1494ed0c3f5b4d07650a68cd6ca62efe8b596ce743a5c94403e6f11bf06c1"}, - {file = "cryptography-38.0.4-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a10498349d4c8eab7357a8f9aa3463791292845b79597ad1b98a543686fb1ec8"}, - {file = "cryptography-38.0.4-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:10652dd7282de17990b88679cb82f832752c4e8237f0c714be518044269415db"}, - {file = "cryptography-38.0.4-cp36-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:bfe6472507986613dc6cc00b3d492b2f7564b02b3b3682d25ca7f40fa3fd321b"}, - {file = "cryptography-38.0.4-cp36-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:ce127dd0a6a0811c251a6cddd014d292728484e530d80e872ad9806cfb1c5b3c"}, - {file = "cryptography-38.0.4-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:53049f3379ef05182864d13bb9686657659407148f901f3f1eee57a733fb4b00"}, - {file = "cryptography-38.0.4-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:8a4b2bdb68a447fadebfd7d24855758fe2d6fecc7fed0b78d190b1af39a8e3b0"}, - {file = "cryptography-38.0.4-cp36-abi3-win32.whl", hash = "sha256:1d7e632804a248103b60b16fb145e8df0bc60eed790ece0d12efe8cd3f3e7744"}, - {file = "cryptography-38.0.4-cp36-abi3-win_amd64.whl", hash = "sha256:8e45653fb97eb2f20b8c96f9cd2b3a0654d742b47d638cf2897afbd97f80fa6d"}, - {file = "cryptography-38.0.4-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ca57eb3ddaccd1112c18fc80abe41db443cc2e9dcb1917078e02dfa010a4f353"}, - {file = "cryptography-38.0.4-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:c9e0d79ee4c56d841bd4ac6e7697c8ff3c8d6da67379057f29e66acffcd1e9a7"}, - {file = "cryptography-38.0.4-pp37-pypy37_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:0e70da4bdff7601b0ef48e6348339e490ebfb0cbe638e083c9c41fb49f00c8bd"}, - {file = "cryptography-38.0.4-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:998cd19189d8a747b226d24c0207fdaa1e6658a1d3f2494541cb9dfbf7dcb6d2"}, - {file = "cryptography-38.0.4-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:67461b5ebca2e4c2ab991733f8ab637a7265bb582f07c7c88914b5afb88cb95b"}, - {file = "cryptography-38.0.4-pp38-pypy38_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:4eb85075437f0b1fd8cd66c688469a0c4119e0ba855e3fef86691971b887caf6"}, - {file = "cryptography-38.0.4-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:3178d46f363d4549b9a76264f41c6948752183b3f587666aff0555ac50fd7876"}, - {file = "cryptography-38.0.4-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:6391e59ebe7c62d9902c24a4d8bcbc79a68e7c4ab65863536127c8a9cd94043b"}, - {file = "cryptography-38.0.4-pp39-pypy39_pp73-macosx_10_10_x86_64.whl", hash = "sha256:78e47e28ddc4ace41dd38c42e6feecfdadf9c3be2af389abbfeef1ff06822285"}, - {file = "cryptography-38.0.4-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2fb481682873035600b5502f0015b664abc26466153fab5c6bc92c1ea69d478b"}, - {file = "cryptography-38.0.4-pp39-pypy39_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:4367da5705922cf7070462e964f66e4ac24162e22ab0a2e9d31f1b270dd78083"}, - {file = "cryptography-38.0.4-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:b4cad0cea995af760f82820ab4ca54e5471fc782f70a007f31531957f43e9dee"}, - {file = "cryptography-38.0.4-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:80ca53981ceeb3241998443c4964a387771588c4e4a5d92735a493af868294f9"}, - {file = "cryptography-38.0.4.tar.gz", hash = "sha256:175c1a818b87c9ac80bb7377f5520b7f31b3ef2a0004e2420319beadedb67290"}, + {file = "cryptography-39.0.1-cp36-abi3-macosx_10_12_universal2.whl", hash = "sha256:6687ef6d0a6497e2b58e7c5b852b53f62142cfa7cd1555795758934da363a965"}, + {file = "cryptography-39.0.1-cp36-abi3-macosx_10_12_x86_64.whl", hash = "sha256:706843b48f9a3f9b9911979761c91541e3d90db1ca905fd63fee540a217698bc"}, + {file = "cryptography-39.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:5d2d8b87a490bfcd407ed9d49093793d0f75198a35e6eb1a923ce1ee86c62b41"}, + {file = "cryptography-39.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:83e17b26de248c33f3acffb922748151d71827d6021d98c70e6c1a25ddd78505"}, + {file = "cryptography-39.0.1-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e124352fd3db36a9d4a21c1aa27fd5d051e621845cb87fb851c08f4f75ce8be6"}, + {file = "cryptography-39.0.1-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:5aa67414fcdfa22cf052e640cb5ddc461924a045cacf325cd164e65312d99502"}, + {file = "cryptography-39.0.1-cp36-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:35f7c7d015d474f4011e859e93e789c87d21f6f4880ebdc29896a60403328f1f"}, + {file = "cryptography-39.0.1-cp36-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:f24077a3b5298a5a06a8e0536e3ea9ec60e4c7ac486755e5fb6e6ea9b3500106"}, + {file = "cryptography-39.0.1-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:f0c64d1bd842ca2633e74a1a28033d139368ad959872533b1bab8c80e8240a0c"}, + {file = "cryptography-39.0.1-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:0f8da300b5c8af9f98111ffd512910bc792b4c77392a9523624680f7956a99d4"}, + {file = "cryptography-39.0.1-cp36-abi3-win32.whl", hash = "sha256:fe913f20024eb2cb2f323e42a64bdf2911bb9738a15dba7d3cce48151034e3a8"}, + {file = "cryptography-39.0.1-cp36-abi3-win_amd64.whl", hash = "sha256:ced4e447ae29ca194449a3f1ce132ded8fcab06971ef5f618605aacaa612beac"}, + {file = "cryptography-39.0.1-pp38-pypy38_pp73-macosx_10_12_x86_64.whl", hash = "sha256:807ce09d4434881ca3a7594733669bd834f5b2c6d5c7e36f8c00f691887042ad"}, + {file = "cryptography-39.0.1-pp38-pypy38_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:c5caeb8188c24888c90b5108a441c106f7faa4c4c075a2bcae438c6e8ca73cef"}, + {file = "cryptography-39.0.1-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:4789d1e3e257965e960232345002262ede4d094d1a19f4d3b52e48d4d8f3b885"}, + {file = "cryptography-39.0.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:96f1157a7c08b5b189b16b47bc9db2332269d6680a196341bf30046330d15388"}, + {file = "cryptography-39.0.1-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:e422abdec8b5fa8462aa016786680720d78bdce7a30c652b7fadf83a4ba35336"}, + {file = "cryptography-39.0.1-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:b0afd054cd42f3d213bf82c629efb1ee5f22eba35bf0eec88ea9ea7304f511a2"}, + {file = "cryptography-39.0.1-pp39-pypy39_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:6f8ba7f0328b79f08bdacc3e4e66fb4d7aab0c3584e0bd41328dce5262e26b2e"}, + {file = "cryptography-39.0.1-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:ef8b72fa70b348724ff1218267e7f7375b8de4e8194d1636ee60510aae104cd0"}, + {file = "cryptography-39.0.1-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:aec5a6c9864be7df2240c382740fcf3b96928c46604eaa7f3091f58b878c0bb6"}, + {file = "cryptography-39.0.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:fdd188c8a6ef8769f148f88f859884507b954cc64db6b52f66ef199bb9ad660a"}, + {file = "cryptography-39.0.1.tar.gz", hash = "sha256:d1f6198ee6d9148405e49887803907fe8962a23e6c6f83ea7d98f1c0de375695"}, ] dateparser = [ {file = "dateparser-1.1.7-py2.py3-none-any.whl", hash = "sha256:fbed8b738a24c9cd7f47c4f2089527926566fe539e1a06125eddba75917b1eef"}, @@ -3834,7 +3830,8 @@ flask = [ {file = "Flask-1.1.4.tar.gz", hash = "sha256:0fbeb6180d383a9186d0d6ed954e0042ad9f18e0e8de088b2b419d526927d196"}, ] flask-admin = [ - {file = "Flask-Admin-1.6.0.tar.gz", hash = "sha256:424ffc79b7b0dfff051555686ea12e86e48dffacac14beaa319fb4502ac40988"}, + {file = "Flask-Admin-1.6.1.tar.gz", hash = "sha256:24cae2af832b6a611a01d7dc35f42d266c1d6c75a426b869d8cb241b78233369"}, + {file = "Flask_Admin-1.6.1-py3-none-any.whl", hash = "sha256:fd8190f1ec3355913a22739c46ed3623f1d82b8112cde324c60a6fc9b21c9406"}, ] flask-alembic = [ {file = "Flask-Alembic-2.0.1.tar.gz", hash = "sha256:05a1e6f4148dbfcc9280a393373bfbd250af6f9f4f0ca9f744ef8f7376a3deec"}, @@ -3944,8 +3941,8 @@ importlib-metadata = [ {file = "importlib_metadata-4.13.0.tar.gz", hash = "sha256:dd0173e8f150d6815e098fd354f6414b0f079af4644ddfe90c71e2fc6174346d"}, ] importlib-resources = [ - {file = "importlib_resources-5.10.2-py3-none-any.whl", hash = "sha256:7d543798b0beca10b6a01ac7cafda9f822c54db9e8376a6bf57e0cbd74d486b6"}, - {file = "importlib_resources-5.10.2.tar.gz", hash = "sha256:e4a96c8cc0339647ff9a5e0550d9f276fc5a01ffa276012b58ec108cfd7b8484"}, + {file = "importlib_resources-5.12.0-py3-none-any.whl", hash = "sha256:7b1deeebbf351c7578e09bf2f63fa2ce8b5ffec296e0d349139d43cca061a81a"}, + {file = "importlib_resources-5.12.0.tar.gz", hash = "sha256:4be82589bf5c1d7999aedf2a45159d10cb3ca4f19b2271f8792bc8e6da7b22f6"}, ] infinity = [ {file = "infinity-1.5.tar.gz", hash = "sha256:8daa7c15ce2100fdccfde212337e0cd5cf085869f54dc2634b6c30d61461ecda"}, @@ -4074,12 +4071,12 @@ invenio-theme = [ ] invenio-userprofiles = [] ipython = [ - {file = "ipython-8.9.0-py3-none-any.whl", hash = "sha256:9c207b0ef2d276d1bfcfeb9a62804336abbe4b170574ea061500952319b1d78c"}, - {file = "ipython-8.9.0.tar.gz", hash = "sha256:71618e82e6d59487bea059626e7c79fb4a5b760d1510d02fab1160db6fdfa1f7"}, + {file = "ipython-8.11.0-py3-none-any.whl", hash = "sha256:5b54478e459155a326bf5f42ee4f29df76258c0279c36f21d71ddb560f88b156"}, + {file = "ipython-8.11.0.tar.gz", hash = "sha256:735cede4099dbc903ee540307b9171fbfef4aa75cfcacc5a273b2cda2f02be04"}, ] isbnlib = [ - {file = "isbnlib-3.10.12-py2.py3-none-any.whl", hash = "sha256:ad6f2164c3d2e025c099e8f0b457593899ff18ce1b7723a7dfc8abe6304300d8"}, - {file = "isbnlib-3.10.12.tar.gz", hash = "sha256:14e64db192bc3d33c984ad01bc64223ea0abf1abb7af01ec8c4ddd08a586b433"}, + {file = "isbnlib-3.10.13-py2.py3-none-any.whl", hash = "sha256:b6d25850d15d40f6a86a6e138ce06757b3b10f30caf0a6fe5b4bec2f568f9e9b"}, + {file = "isbnlib-3.10.13.tar.gz", hash = "sha256:4679341f56a0df91c635e838a222ce7f10755cb5bcc9548e3f7a8aff5674d3d4"}, ] iso639 = [ {file = "iso639-0.1.4.tar.gz", hash = "sha256:88b70cf6c64ee9c2c2972292818c8beb32db9ea6f4de1f8471a9b081a3d92e98"}, @@ -4415,8 +4412,8 @@ pickleshare = [ {file = "pickleshare-0.7.5.tar.gz", hash = "sha256:87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca"}, ] pip = [ - {file = "pip-23.0-py3-none-any.whl", hash = "sha256:b5f88adff801f5ef052bcdef3daa31b55eb67b0fccd6d0106c206fa248e0463c"}, - {file = "pip-23.0.tar.gz", hash = "sha256:aee438284e82c8def684b0bcc50b1f6ed5e941af97fa940e83e2e8ef1a59da9b"}, + {file = "pip-23.0.1-py3-none-any.whl", hash = "sha256:236bcb61156d76c4b8a05821b988c7b8c35bf0da28a4b614e8d6ab5212c25c6f"}, + {file = "pip-23.0.1.tar.gz", hash = "sha256:cd015ea1bfb0fcef59d8a286c1f8bebcb983f6317719d415dc5351efb7cd7024"}, ] pluggy = [ {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"}, @@ -4427,12 +4424,12 @@ poethepoet = [ {file = "poethepoet-0.12.3.tar.gz", hash = "sha256:34d6396a5c9c9741d6cb72afb71797a9c522df1c37717ee15d84d73a1b353387"}, ] polib = [ - {file = "polib-1.1.1-py2.py3-none-any.whl", hash = "sha256:d3ee85e0c6788f789353416b1612c6c92d75fe6ccfac0029711974d6abd0f86d"}, - {file = "polib-1.1.1.tar.gz", hash = "sha256:e02c355ae5e054912e3b0d16febc56510eff7e49d60bf22aecb463bd2f2a2dfa"}, + {file = "polib-1.2.0-py2.py3-none-any.whl", hash = "sha256:1c77ee1b81feb31df9bca258cbc58db1bbb32d10214b173882452c73af06d62d"}, + {file = "polib-1.2.0.tar.gz", hash = "sha256:f3ef94aefed6e183e342a8a269ae1fc4742ba193186ad76f175938621dbfc26b"}, ] prompt-toolkit = [ - {file = "prompt_toolkit-3.0.36-py3-none-any.whl", hash = "sha256:aa64ad242a462c5ff0363a7b9cfe696c20d55d9fc60c11fd8e632d064804d305"}, - {file = "prompt_toolkit-3.0.36.tar.gz", hash = "sha256:3e163f254bef5a03b146397d7c1963bd3e2812f0964bb9a24e6ec761fd28db63"}, + {file = "prompt_toolkit-3.0.38-py3-none-any.whl", hash = "sha256:45ea77a2f7c60418850331366c81cf6b5b9cf4c7fd34616f733c5427e6abbb1f"}, + {file = "prompt_toolkit-3.0.38.tar.gz", hash = "sha256:23ac5d50538a9a38c8bde05fecb47d0b403ecd0662857a86f886f798563d5b9b"}, ] psutil = [ {file = "psutil-5.9.4-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:c1ca331af862803a42677c120aff8a814a804e09832f166f226bfd22b56feee8"}, @@ -4474,6 +4471,8 @@ psycopg2-binary = [ {file = "psycopg2_binary-2.9.5-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:e67b3c26e9b6d37b370c83aa790bbc121775c57bfb096c2e77eacca25fd0233b"}, {file = "psycopg2_binary-2.9.5-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:5fc447058d083b8c6ac076fc26b446d44f0145308465d745fba93a28c14c9e32"}, {file = "psycopg2_binary-2.9.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:d892bfa1d023c3781a3cab8dd5af76b626c483484d782e8bd047c180db590e4c"}, + {file = "psycopg2_binary-2.9.5-cp311-cp311-win32.whl", hash = "sha256:2abccab84d057723d2ca8f99ff7b619285d40da6814d50366f61f0fc385c3903"}, + {file = "psycopg2_binary-2.9.5-cp311-cp311-win_amd64.whl", hash = "sha256:bef7e3f9dc6f0c13afdd671008534be5744e0e682fb851584c8c3a025ec09720"}, {file = "psycopg2_binary-2.9.5-cp36-cp36m-macosx_10_14_x86_64.macosx_10_9_intel.macosx_10_9_x86_64.macosx_10_10_intel.macosx_10_10_x86_64.whl", hash = "sha256:6e63814ec71db9bdb42905c925639f319c80e7909fb76c3b84edc79dadef8d60"}, {file = "psycopg2_binary-2.9.5-cp36-cp36m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:212757ffcecb3e1a5338d4e6761bf9c04f750e7d027117e74aa3cd8a75bb6fbd"}, {file = "psycopg2_binary-2.9.5-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6f8a9bcab7b6db2e3dbf65b214dfc795b4c6b3bb3af922901b6a67f7cb47d5f8"}, @@ -4628,8 +4627,8 @@ python-dateutil = [ {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, ] python-dotenv = [ - {file = "python-dotenv-0.21.1.tar.gz", hash = "sha256:1c93de8f636cde3ce377292818d0e440b6e45a82f215c3744979151fa8151c49"}, - {file = "python_dotenv-0.21.1-py3-none-any.whl", hash = "sha256:41e12e0318bebc859fcc4d97d4db8d20ad21721a6aa5047dd59f090391cb549a"}, + {file = "python-dotenv-1.0.0.tar.gz", hash = "sha256:a8df96034aae6d2d50a4ebe8216326c61c3eb64836776504fcca410e5937a3ba"}, + {file = "python_dotenv-1.0.0-py3-none-any.whl", hash = "sha256:f5971a9226b701070a4bf2c38c89e5a3f0d64de8debda981d1db98583009122a"}, ] pytz = [ {file = "pytz-2022.7.1-py2.py3-none-any.whl", hash = "sha256:78f4f37d8198e0627c5f1143240bb0206b8691d8d7ac6d78fee88b78733f8c4a"}, @@ -4690,8 +4689,8 @@ raven = [ {file = "raven-6.10.0.tar.gz", hash = "sha256:3fa6de6efa2493a7c827472e984ce9b020797d0da16f1db67197bcc23c8fae54"}, ] redis = [ - {file = "redis-4.4.2-py3-none-any.whl", hash = "sha256:e6206448e2f8a432871d07d432c13ed6c2abcf6b74edb436c99752b1371be387"}, - {file = "redis-4.4.2.tar.gz", hash = "sha256:a010f6cb7378065040a02839c3f75c7e0fb37a87116fb4a95be82a95552776c7"}, + {file = "redis-4.5.1-py3-none-any.whl", hash = "sha256:5deb072d26e67d2be1712603bfb7947ec3431fb0eec9c578994052e33035af6d"}, + {file = "redis-4.5.1.tar.gz", hash = "sha256:1eec3741cda408d3a5f84b78d089c8b8d895f21b3b050988351e925faf202864"}, ] redisbeat = [ {file = "redisbeat-1.2.2.tar.gz", hash = "sha256:59b7e9984cb9cde9eaea21093ca2b953f83995a64b6c240e4c36f1b2e9ed1e38"}, @@ -4907,8 +4906,8 @@ snowballstemmer = [ {file = "snowballstemmer-2.2.0.tar.gz", hash = "sha256:09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1"}, ] soupsieve = [ - {file = "soupsieve-2.3.2.post1-py3-none-any.whl", hash = "sha256:3b2503d3c7084a42b1ebd08116e5f81aadfaea95863628c80a3b774a11b7c759"}, - {file = "soupsieve-2.3.2.post1.tar.gz", hash = "sha256:fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d"}, + {file = "soupsieve-2.4-py3-none-any.whl", hash = "sha256:49e5368c2cda80ee7e84da9dbe3e110b70a4575f196efb74e51b94549d921955"}, + {file = "soupsieve-2.4.tar.gz", hash = "sha256:e28dba9ca6c7c00173e34e4ba57448f0688bb681b7c5e8bf4971daafc093d69a"}, ] speaklater = [ {file = "speaklater-1.3.tar.gz", hash = "sha256:59fea336d0eed38c1f0bf3181ee1222d0ef45f3a9dd34ebe65e6bfffdd6a65a9"}, @@ -5070,6 +5069,6 @@ xmltodict = [ {file = "xmltodict-0.13.0.tar.gz", hash = "sha256:341595a488e3e01a85a9d8911d8912fd922ede5fecc4dce437eb4b6c8d037e56"}, ] zipp = [ - {file = "zipp-3.12.1-py3-none-any.whl", hash = "sha256:6c4fe274b8f85ec73c37a8e4e3fa00df9fb9335da96fb789e3b96b318e5097b3"}, - {file = "zipp-3.12.1.tar.gz", hash = "sha256:a3cac813d40993596b39ea9e93a18e8a2076d5c378b8bc88ec32ab264e04ad02"}, + {file = "zipp-3.15.0-py3-none-any.whl", hash = "sha256:48904fc76a60e542af151aded95726c1a5c34ed43ab4134b597665c86d7ad556"}, + {file = "zipp-3.15.0.tar.gz", hash = "sha256:112929ad649da941c23de50f356a2b5570c954b65150642bccdd66bf194d224b"}, ] diff --git a/pyproject.toml b/pyproject.toml index bdbb6c0bc2..64df20077d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -73,7 +73,7 @@ python-dotenv = ">=0.13.0" invenio-sip2 = ">=0.6.16" flask-cors = ">3.0.8" celery = ">=5.0.0" -cryptography = ">38.0.2,<39.0" +cryptography = ">38.0.2,<40.0" freezegun = "^1.1.0" lazyreader = ">1.0.0" jinja2 = ">2.11.2" diff --git a/run-tests.sh b/run-tests.sh index 9bc8edbd82..19e185a79b 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -67,26 +67,23 @@ if [[ -z "${VIRTUAL_ENV}" ]]; then fi function pretests () { - info_msg "Check vulnerabilities:" # +============================+===========+==========================+==========+ # | package | installed | affected | ID | # +============================+===========+==========================+==========+ - # | click | 7.1.2 | <8.0.0 | 47833 | - # | celery | 5.1.2 | <5.2.0 | 42498 | - # | celery | 5.1.2 | <5.2.2 | 43738 | # | flask-security | 3.0.0 | <3.1.0 | 45183 | # | flask-security | 3.0.0 | >0 | 44501 | + # | sqlalchemy | 1.3.24 | <2.0.0b1 | 51668 | + # | sqlalchemy-utils | 0.35.0 | >=0.27.0 | 42194 | # | wtforms | 2.3.3 | <3.0.0a1 | 42852 | + # | werkzeug | 1.0.1 | <2.2.3 | 53325 | + # | werkzeug | 1.0.1 | <2.2.3 | 53326 | + # | celery | 5.1.2 | <5.2.0 | 42498 | + # | celery | 5.1.2 | <5.2.2 | 43738 | + # | click | 7.1.2 | <8.0.0 | 47833 | # | py | 1.11.0 | <=1.11.0 | 51457 | # | safety | 1.10.3 | <2.2.0 | 51358 | - # | sqlalchemy | 1.3.24 | <2.0.0b1 | 51668 | - # | wheel | 0.37.1 | <0.38.0 | 51499 | - # | sqlalchemy-utils | 0.35.0 | >=0.27.0 | 42194 | - # | certifi | 2022.9.24 | <2022.12.07 | 52365 | - # | setuptools | 65.4.1 | <65.5.1 | 52495 | - # | future | 0.18.2 | <=0.18.2 | 52510 | # +==============================================================================+ - safety check -i 47833 -i 42498 -i 43738 -i 45183 -i 44501 -i 42852 -i 51457 -i 51358 -i 51499 -i 42194 -i 51668 -i 52365 -i 52495 -i 52510 + safety check -i 45183 -i 44501 -i 51668 -i 42194 -i 42852 -i 53325 -i 53326 -i 42498 -i 43738 -i 47833 -i 51457 -i 51358 info_msg "Check json:" invenio reroils utils check_json tests/data rero_ils/modules data info_msg "Check license:" diff --git a/tests/data/data.json b/tests/data/data.json index 46ac0c34fb..194bd59398 100644 --- a/tests/data/data.json +++ b/tests/data/data.json @@ -2830,24 +2830,6 @@ "role": [ "aut" ] - }, - { - "agent": { - "$ref": "https://mef.rero.ch/api/agents/idref/027037061", - "type": "bf:Person" - }, - "role": [ - "cre" - ] - }, - { - "agent": { - "$ref": "https://mef.rero.ch/api/agents/idref/028401743", - "type": "bf:Person" - }, - "role": [ - "ctb" - ] } ], "identifiedBy": [ @@ -3002,14 +2984,6 @@ } ], "subjects": [ - { - "type": "bf:Person", - "$ref": "https://mef.rero.ch/api/agents/gnd/041288890" - }, - { - "type": "bf:Person", - "$ref": "https://mef.rero.ch/api/agents/idref/032106939" - }, { "type": "bf:Person", "preferred_name": "Athenagoras (patriarche oecum\u00e9nique ; 1)", diff --git a/tests/data/xml/kul/kul_isbn_9782265089419.xml b/tests/data/xml/kul/kul_isbn_9782265089419.xml index 9b6a399168..f8d96f218b 100644 --- a/tests/data/xml/kul/kul_isbn_9782265089419.xml +++ b/tests/data/xml/kul/kul_isbn_9782265089419.xml @@ -136,7 +136,6 @@ Morale sociale - (RERO)A021003578 rero diff --git a/tests/data/xml/loc/loc_isbn_all_9781604689808.xml b/tests/data/xml/loc/loc_isbn_all_9781604689808.xml index be25e16c00..7dfca7d5dd 100644 --- a/tests/data/xml/loc/loc_isbn_all_9781604689808.xml +++ b/tests/data/xml/loc/loc_isbn_all_9781604689808.xml @@ -144,7 +144,6 @@ Morale sociale - (RERO)A021003578 rero @@ -155,7 +154,6 @@ Chatelain, Yannick 1965-.... - (IDREF)055771041 cre diff --git a/tests/data/xml/slsp/slsp_anywhere_123.xml b/tests/data/xml/slsp/slsp_anywhere_123.xml index bb447cb526..6eb0231068 100644 --- a/tests/data/xml/slsp/slsp_anywhere_123.xml +++ b/tests/data/xml/slsp/slsp_anywhere_123.xml @@ -32,7 +32,6 @@ Llopis, Jorge 1919-1976 - (IDREF)093591209 cre @@ -189,7 +188,6 @@ Schaeffer, Claude 1898-1982 - (IDREF)033556083 cre @@ -1143,7 +1141,6 @@ Libye - (IDREF)027262545 idref @@ -1383,7 +1380,6 @@ Iran - (IDREF)027234576 idref @@ -1764,7 +1760,6 @@ Novara, Lázaro Juan 19..-.... - (IDREF)148729673 cre @@ -1878,7 +1873,6 @@ Luer, Carlyle A. 1922-2019 - (IDREF)067150047 cre @@ -1921,7 +1915,6 @@ Colombie - (IDREF)027230430 idref @@ -1935,7 +1928,6 @@ Thoerle, Lisa 19..-.... - (IDREF)169999386 Icones Pleurothallidinarum @@ -2182,7 +2174,6 @@ Mejía-Saulés, María Teresa - (IDREF)061333247 cre @@ -2223,7 +2214,6 @@ Veracruz (Mexique ; État) - (IDREF)027356434 idref @@ -2296,7 +2286,6 @@ Di Lella, Luigi - (IDREF)032501684 cre @@ -2424,7 +2413,6 @@ Redonda-Martínez, Rosario - (IDREF)142607177 cre @@ -2707,7 +2695,6 @@ Guyanes - (IDREF)027527514 idref @@ -3241,7 +3228,6 @@ Gentaz, Édouard - (IDREF)053479653 Approche neuropsychologique des apprentissages chez l'enfant @@ -3334,7 +3320,6 @@ Acocella, Mariantonietta - (IDREF)069118191 cre @@ -3556,7 +3541,6 @@ Italie - (IDREF)027235408 idref @@ -5015,7 +4999,6 @@ Bueno Avila, Antonio - (IDREF)154655929 cre @@ -5665,7 +5648,6 @@ Barbieri, Luca 1966-.... - (IDREF)074314742 cre @@ -5748,7 +5730,6 @@ Ovide 0043 av. J.-C.-0017 Heroides - (IDREF)028729587 idref @@ -5971,7 +5952,6 @@ Dufour, Alfred 1938-.... - (IDREF)026841614 cre @@ -6085,7 +6065,6 @@ 100-01 Göllner, Theodor 1929-.... - (IDREF)028777581 cre @@ -6732,25 +6711,21 @@ Schnitzler, Arthur 1862-1931 - (IDREF)027127869 idref Hofmannsthal, Hugo von 1874-1929 - (IDREF)026923483 idref Salten, Felix 1869-1945 - (IDREF)027120600 idref Bahr, Hermann 1863-1934 - (IDREF)028826914 idref diff --git a/tests/data/xml/slsp/slsp_isbn_3908497272.xml b/tests/data/xml/slsp/slsp_isbn_3908497272.xml index 64ade7ee06..64103b0a5b 100644 --- a/tests/data/xml/slsp/slsp_isbn_3908497272.xml +++ b/tests/data/xml/slsp/slsp_isbn_3908497272.xml @@ -34,7 +34,6 @@ Urchs, Ossi - (RERO)A003922810 cre @@ -66,17 +65,14 @@ Téléphonie Internet - (RERO)A021064672 rero [Manuels d'enseignement] - (RERO)A021098695 rero Zapp, Harald - (RERO)A013058709 41SLSP_BCUFR diff --git a/tests/data/xml/slsp/slsp_isbn_9782296076648.xml b/tests/data/xml/slsp/slsp_isbn_9782296076648.xml index 7f78d11231..e41f165b49 100644 --- a/tests/data/xml/slsp/slsp_isbn_9782296076648.xml +++ b/tests/data/xml/slsp/slsp_isbn_9782296076648.xml @@ -59,7 +59,6 @@ Chatelain, Yannick 1965-.... - (IDREF)055771041 cre @@ -132,22 +131,18 @@ Morale sociale - (RERO)A021003578 rero Pirates informatiques - (RERO)A021073688 rero Innovations technologiques - (RERO)A021005087 rero Société numérique - (RERO)A021066932 rero diff --git a/tests/data/xml/ugent/ugent_anywhere_123.xml b/tests/data/xml/ugent/ugent_anywhere_123.xml index d0d19c152b..d814e54d55 100644 --- a/tests/data/xml/ugent/ugent_anywhere_123.xml +++ b/tests/data/xml/ugent/ugent_anywhere_123.xml @@ -13660,7 +13660,6 @@ De Pelsmacker, Patrick - (viaf)15054858 Marketing communications : @@ -13691,11 +13690,9 @@ Geuens, Maggie - (viaf)17507331 Van den Bergh, Joeri - (viaf)47046670 EB @@ -14231,7 +14228,6 @@ De Pelsmacker, Patrick - (viaf)15054858 Marketing communications : @@ -14265,11 +14261,9 @@ Geuens, Maggie - (viaf)17507331 Van den Bergh, Joeri - (viaf)47046670 EB diff --git a/tests/data/xml/ugent/ugent_book_without_26X.xml b/tests/data/xml/ugent/ugent_book_without_26X.xml index 2acc26a9c3..62329ad0e7 100644 --- a/tests/data/xml/ugent/ugent_book_without_26X.xml +++ b/tests/data/xml/ugent/ugent_book_without_26X.xml @@ -92,7 +92,6 @@ Conraux, Aurélien edt - (viaf)172620811 Haquin, Anne-Sophie @@ -101,7 +100,6 @@ Mengin, Christine edt - (viaf)66606986 EA diff --git a/tests/data/xml/ugent/ugent_samuelson.xml b/tests/data/xml/ugent/ugent_samuelson.xml index e128d662aa..ed50b6ca5a 100644 --- a/tests/data/xml/ugent/ugent_samuelson.xml +++ b/tests/data/xml/ugent/ugent_samuelson.xml @@ -856,7 +856,6 @@ Tirosh-Samuelson, Hava - (viaf)98261499 LW @@ -993,12 +992,10 @@ Barnett, William Arnold - (viaf)76372038 Samuelson, Paul Anthony, 1915-2009 - (viaf)98511352 EB diff --git a/tests/ui/test_filters.py b/tests/ui/test_filters.py index fcb60793e2..b4cef0d6c8 100644 --- a/tests/ui/test_filters.py +++ b/tests/ui/test_filters.py @@ -31,7 +31,7 @@ def test_get_record_by_ref(document_data, document): def test_date_filter_format_timestamp_en(app): """Test full english date and tile filter.""" datestring = format_date_filter('2018-06-06T09:29:55.947149+00:00') - assert 'Wednesday, June 6, 2018, 11:29:55 AM' in datestring + assert 'Wednesday, June 6, 2018, 11:29:55 AM' in datestring datestring = format_date_filter( '2018-06-06T09:29:55.947149+00:00', locale='fr') @@ -53,7 +53,7 @@ def test_date_filter_timezone(app): """Test medium english date filter.""" datestring = format_date_filter( '2018-06-06T09:29:55.947149+00:00', timezone='Europe/Helsinki') - assert 'Wednesday, June 6, 2018, 12:29:55 PM' in datestring + assert 'Wednesday, June 6, 2018, 12:29:55 PM' in datestring def test_date_filter_format_medium_date_en(app): @@ -88,7 +88,7 @@ def test_time_filter_format_default(app): """Test default time.""" datestring = format_date_filter( '2018-06-06T09:29:55.947149+00:00', date_format=None) - assert datestring == '11:29:55 AM' + assert datestring == '11:29:55 AM' def test_time_filter_format_fr(app): @@ -102,7 +102,7 @@ def test_time_filter_format_delimiter(app): """Test default time.""" datestring = format_date_filter( '2018-06-06T09:29:55.947149+00:00', delimiter=' - ') - assert datestring == 'Wednesday, June 6, 2018 - 11:29:55 AM' + assert datestring == 'Wednesday, June 6, 2018 - 11:29:55 AM' def test_to_pretty():