remove flask upper pin 2

invenio_vocabularies/datastreams/writers.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2021-2024 CERN.
+# Copyright (C) 2024 Graz University of Technology.
 #
 # Invenio-Vocabularies is free software; you can redistribute it and/or
 # modify it under the terms of the MIT License; see LICENSE file for more
@@ -96,12 +97,13 @@ def write(self, stream_entry, *args, **kwargs):
 
         try:
             if self._insert:
-                try:
-                    return StreamEntry(self._service.create(self._identity, entry))
-                except PIDAlreadyExists:
-                    if not self._update:
-                        raise WriterError([f"Vocabulary entry already exists: {entry}"])
-                    return self._do_update(entry)
+                ret = StreamEntry(self._service.create(self._identity, entry))
+
+                # with that state management it is avoidable to check if pid
+                # exists and run into possible rollback problems
+                if self._update:
+                    self._insert = False
+                return ret
             elif self._update:
                 try:
                     return self._do_update(entry)
@@ -112,6 +114,8 @@ def write(self, stream_entry, *args, **kwargs):
                     ["Writer wrongly configured to not insert and to not update"]
                 )
 
+        except PIDAlreadyExists:
+            raise WriterError([f"Vocabulary entry already exists: {entry}"])
         except ValidationError as err:
             raise WriterError([{"ValidationError": err.messages}])
         except InvalidRelationValue as err:

tests/conftest.py

@@ -3,6 +3,7 @@
 # Copyright (C) 2020-2024 CERN.
 # Copyright (C) 2021 TU Wien.
 # Copyright (C) 2024 California Institute of Technology.
+# Copyright (C) 2024 Graz University of Technology.
 #
 # Invenio-Vocabularies is free software; you can redistribute it and/or
 # modify it under the terms of the MIT License; see LICENSE file for more
@@ -81,7 +82,7 @@ def extra_entry_points():
 @pytest.fixture(scope="module")
 def app_config(app_config):
     """Mimic an instance's configuration."""
-    app_config["JSONSCHEMAS_HOST"] = "localhost"
+    app_config["JSONSCHEMAS_HOST"] = "not-used"
     app_config["BABEL_DEFAULT_LOCALE"] = "en"
     app_config["I18N_LANGUAGES"] = [("da", "Danish")]
     app_config["RECORDS_REFRESOLVER_CLS"] = (

tests/test_alembic.py

@@ -3,6 +3,7 @@
 # This file is part of Invenio.
 # Copyright (C) 2021 TU Wien.
 # Copyright (C) 2021 Northwestern University.
+# Copyright (C) 2024 Graz University of Technology.
 #
 # Invenio is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
@@ -46,7 +47,12 @@ def test_alembic(app, database):
         raise pytest.skip("Upgrades are not supported on SQLite.")
 
     # Check that this package's SQLAlchemy models have been properly registered
-    tables = [x.name for x in db.get_tables_for_bind()]
+    try:
+        # flask-sqlalchemy < 3.1.0
+        tables = [x.name for x in db.get_tables_for_bind()]
+    except AttributeError:
+        # flask-sqlalchemy >= 3.1.0
+        tables = [x for x in db.metadata.tables]
     assert "vocabularies_metadata" in tables
     assert "vocabularies_types" in tables
     assert "vocabularies_schemes" in tables