Update skosprovider_sqlalchemy

OnroerendErfgoed · May 2, 2023 · 1aceda4 · 1aceda4
1 parent ce8d02a
commit 1aceda4
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 20 deletions.
diff --git a/atramhasis/scripts/import_file.py b/atramhasis/scripts/import_file.py
@@ -226,7 +226,7 @@ def provider_to_db(provider, conceptscheme, session):
     import provider data into the database
     """
     session.add(conceptscheme)
-    import_provider(provider, conceptscheme, session)
+    import_provider(provider, session, conceptscheme)
     session.commit()
 
 

diff --git a/atramhasis/scripts/initializedb.py b/atramhasis/scripts/initializedb.py
@@ -37,6 +37,7 @@ def main(argv=sys.argv):
     db_session = sessionmaker(bind=engine)()
     import_provider(
         trees,
+        db_session,
         ConceptScheme(
             id=1,
             uri='urn:x-skosprovider:trees',
@@ -45,10 +46,10 @@ def main(argv=sys.argv):
                 Label('Different types of trees', 'prefLabel', 'en')
             ]
         ),
-        db_session
     )
     import_provider(
         geo,
+        db_session,
         ConceptScheme(
             id=2,
             uri='urn:x-skosprovider:geo',
@@ -57,10 +58,10 @@ def main(argv=sys.argv):
                 Label('Geography', 'prefLabel', 'en')
             ]
         ),
-        db_session
     )
     import_provider(
         styles_and_cultures,
+        db_session,
         ConceptScheme(
             id=3,
             uri='https://id.erfgoed.net/thesauri/stijlen_en_culturen',
@@ -69,10 +70,10 @@ def main(argv=sys.argv):
                 Label('Styles and Cultures', 'prefLabel', 'en')
             ]
         ),
-        db_session
     )
     import_provider(
         materials,
+        db_session,
         ConceptScheme(
             id=4,
             uri='https://id.erfgoed.net/thesauri/materialen',
@@ -81,10 +82,10 @@ def main(argv=sys.argv):
                 Label('Materials', 'prefLabel', 'en')
             ]
         ),
-        db_session
     )
     import_provider(
         eventtypes,
+        db_session,
         ConceptScheme(
             id=5,
             uri='https://id.erfgoed.net/thesauri/gebeurtenistypes',
@@ -93,10 +94,10 @@ def main(argv=sys.argv):
                 Label('Event types', 'prefLabel', 'en')
             ]
         ),
-        db_session
     )
     import_provider(
         heritagetypes,
+        db_session,
         ConceptScheme(
             id=6,
             uri='https://id.erfgoed.net/thesauri/erfgoedtypes',
@@ -105,10 +106,10 @@ def main(argv=sys.argv):
                 Label('Heritage types', 'prefLabel', 'en')
             ]
         ),
-        db_session
     )
     import_provider(
         periods,
+        db_session,
         ConceptScheme(
             id=7,
             uri='https://id.erfgoed.net/thesauri/dateringen',
@@ -117,10 +118,10 @@ def main(argv=sys.argv):
                 Label('Periods', 'prefLabel', 'en')
             ]
         ),
-        db_session
     )
     import_provider(
         species,
+        db_session,
         ConceptScheme(
             id=8,
             uri='https://id.erfgoed.net/thesauri/soorten',
@@ -129,10 +130,10 @@ def main(argv=sys.argv):
                 Label('Species', 'prefLabel', 'en')
             ]
         ),
-        db_session
     )
     import_provider(
         bluebirds,
+        db_session,
         ConceptScheme(
             id=9,
             uri='https://id.bluebirds.org',
@@ -141,7 +142,6 @@ def main(argv=sys.argv):
                 Label('Blue birds', 'prefLabel', 'en')
             ]
         ),
-        db_session
     )
     db_session.commit()
     db_session.close()

diff --git a/requirements.txt b/requirements.txt
@@ -7,7 +7,7 @@ openapi-spec-validator==0.4.0  # https://github.com/p1c2u/openapi-core/issues/44
 
 # skosprovider
 skosprovider==1.2.0
-skosprovider_sqlalchemy==2.0.1
+skosprovider_sqlalchemy==2.1.1
 pyramid_skosprovider==1.2.0
 skosprovider_rdf==1.3.0
 skosprovider_getty==1.1.0

diff --git a/tests/__init__.py b/tests/__init__.py
@@ -78,14 +78,14 @@ def fill_db():
         from skosprovider_sqlalchemy.models import ConceptScheme
         with db_session() as session:
             import_provider(trees,
-                            ConceptScheme(id=1, uri='urn:x-skosprovider:trees'),
-                            session)
+                            session,
+                            ConceptScheme(id=1, uri='urn:x-skosprovider:trees'))
             import_provider(material_data.materials,
-                            ConceptScheme(id=4, uri='urn:x-vioe:materials'),
-                            session)
+                            session,
+                            ConceptScheme(id=4, uri='urn:x-vioe:materials'))
             import_provider(data.geo,
-                            ConceptScheme(id=2, uri='urn:x-vioe:geography'),
-                            session)
+                            session,
+                            ConceptScheme(id=2, uri='urn:x-vioe:geography'))
             import_provider(
                 DictionaryProvider(
                     {'id': 'MISSING_LABEL', 'default_language': 'nl'},
@@ -98,8 +98,9 @@ def fill_db():
                          ],
                      }]
                 ),
-                ConceptScheme(id=9, uri='urn:x-vioe:test'),
-                session)
+                session,
+                ConceptScheme(id=9, uri='urn:x-vioe:test')
+            )
             import_provider(
                 DictionaryProvider(
                     {'id': 'manual-ids', 'default_language': 'nl'},
@@ -119,8 +120,8 @@ def fill_db():
                          ],
                      }]
                 ),
-                ConceptScheme(id=10, uri='urn:x-vioe:manual'),
                 session,
+                ConceptScheme(id=10, uri='urn:x-vioe:manual'),
             )
             session.add(ConceptScheme(id=3, uri='urn:x-vioe:styles'))
             for scheme_id in (5, 6, 7, 8):