Merge e36be10 into 285c74b

OnroerendErfgoed · Jan 20, 2023 · ca7bca3 · ca7bca3
2 parents 285c74b + e36be10
commit ca7bca3
Show file tree

Hide file tree

Showing 71 changed files with 63,780 additions and 58,778 deletions.
diff --git a/atramhasis/alembic/env.py b/atramhasis/alembic/env.py
@@ -1,14 +1,14 @@
-try:
-    import configparser
-except ImportError:
-    import ConfigParser as configparser
-from alembic import context
-from sqlalchemy import engine_from_config, pool
+import configparser
 from logging.config import fileConfig
-from atramhasis.data.models import Base
+from os import path
+
+from alembic import context
 from skosprovider_sqlalchemy.models import Base as SkosBase
+from sqlalchemy import engine_from_config
+from sqlalchemy import pool
 from sqlalchemy.schema import MetaData
-from os import path
+
+from atramhasis.data.models import Base
 
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.
@@ -29,18 +29,22 @@
 # my_important_option = config.get_main_option("my_important_option")
 # ... etc.
 
+
 def load_app_ini(ini_file):
     """Load the settings for the application.ini file."""
     ini = configparser.ConfigParser()
-    ini.readfp(open(ini_file))
+    with open(ini_file) as f:
+        ini.read_file(f)
     here = path.abspath(path.dirname(ini_file))
-    ini.set('app:main', 'here', here)
+    ini.set("app:main", "here", here)
     return ini
 
-app_ini = config.get_main_option('ini_location')
+
+app_ini = config.get_main_option("ini_location")
 app_config = load_app_ini(app_ini)
-sa_url = app_config.get('app:main', 'sqlalchemy.url')
-config.set_main_option('sqlalchemy.url', sa_url)
+sa_url = app_config.get("app:main", "sqlalchemy.url")
+config.set_main_option("sqlalchemy.url", sa_url)
+
 
 def run_migrations_offline():
     """Run migrations in 'offline' mode.
@@ -70,8 +74,9 @@ def run_migrations_online():
     """
     engine = engine_from_config(
         config.get_section(config.config_ini_section),
-        prefix='sqlalchemy.',
-        poolclass=pool.NullPool)
+        prefix="sqlalchemy.",
+        poolclass=pool.NullPool,
+    )
 
     metadata = MetaData()
     for md in target_metadata:
@@ -80,9 +85,7 @@ def run_migrations_online():
 
     connection = engine.connect()
     context.configure(
-        connection=connection,
-        target_metadata=metadata,
-        render_as_batch=True
+        connection=connection, target_metadata=metadata, render_as_batch=True
     )
 
     try:
@@ -96,4 +99,3 @@ def run_migrations_online():
     run_migrations_offline()
 else:
     run_migrations_online()
-
diff --git a/atramhasis/alembic/script.py.mako b/atramhasis/alembic/script.py.mako
@@ -6,14 +6,14 @@ Create Date: ${create_date}
 
 """
 
-# revision identifiers, used by Alembic.
-revision = ${repr(up_revision)}
-down_revision = ${repr(down_revision)}
-
 from alembic import op
 import sqlalchemy as sa
 ${imports if imports else ""}
 
+# revision identifiers, used by Alembic.
+revision = ${repr(up_revision)}
+down_revision = ${repr(down_revision)}
+
 def upgrade():
     ${upgrades if upgrades else "pass"}
 

diff --git a/atramhasis/alembic/versions/184f1bbcb916_language_und.py b/atramhasis/alembic/versions/184f1bbcb916_language_und.py
@@ -5,35 +5,27 @@
 Create Date: 2017-07-25 16:38:39.439673
 
 """
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.orm import Session
+from sqlalchemy.sql import column
+from sqlalchemy.sql import table
 
 # revision identifiers, used by Alembic.
-revision = '184f1bbcb916'
-down_revision = '6dfc3e2324aa'
+revision = "184f1bbcb916"
+down_revision = "6dfc3e2324aa"
 
-from alembic import op
-import sqlalchemy as sa
-from sqlalchemy.sql import table, column
-from sqlalchemy.orm import Session
 
-language_table = table('language',
-                       column('id', sa.String),
-                       column('name', sa.String)
-                       )
+language_table = table("language", column("id", sa.String), column("name", sa.String))
 
 
 def upgrade():
 
-    op.bulk_insert(language_table,
-                   [
-                       {'id': 'und', 'name': 'Undetermined'}
-                   ]
-    )
+    op.bulk_insert(language_table, [{"id": "und", "name": "Undetermined"}])
 
 
 def downgrade():
     connection = op.get_bind()
     session = Session(bind=connection)
-    connection.execute(
-        language_table.delete().where(language_table.c.id == 'und')
-    )
+    connection.execute(language_table.delete().where(language_table.c.id == "und"))
     session.flush()
diff --git a/atramhasis/alembic/versions/1a4d62b02630_199_sources.py b/atramhasis/alembic/versions/1a4d62b02630_199_sources.py
@@ -5,42 +5,56 @@
 Create Date: 2015-12-08 12:06:20.303601
 
 """
+import sqlalchemy as sa
+from alembic import op
 
 # revision identifiers, used by Alembic.
-revision = '1a4d62b02630'
-down_revision = '2a38d364113b'
-
-from alembic import op
-import sqlalchemy as sa
+revision = "1a4d62b02630"
+down_revision = "2a38d364113b"
 
 
 def upgrade():
 
-    op.create_table('source',
-        sa.Column('id', sa.Integer(), nullable=False),
-        sa.Column('citation', sa.Text(), nullable=False),
-        sa.PrimaryKeyConstraint('id')
+    op.create_table(
+        "source",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("citation", sa.Text(), nullable=False),
+        sa.PrimaryKeyConstraint("id"),
     )
 
-    op.create_table('conceptscheme_source',
-        sa.Column('conceptscheme_id', sa.Integer(), nullable=False),
-        sa.Column('source_id', sa.Integer(), nullable=False),
-        sa.ForeignKeyConstraint(['conceptscheme_id'], ['conceptscheme.id'], ),
-        sa.ForeignKeyConstraint(['source_id'], ['source.id'], ),
-        sa.PrimaryKeyConstraint('conceptscheme_id', 'source_id')
+    op.create_table(
+        "conceptscheme_source",
+        sa.Column("conceptscheme_id", sa.Integer(), nullable=False),
+        sa.Column("source_id", sa.Integer(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ["conceptscheme_id"],
+            ["conceptscheme.id"],
+        ),
+        sa.ForeignKeyConstraint(
+            ["source_id"],
+            ["source.id"],
+        ),
+        sa.PrimaryKeyConstraint("conceptscheme_id", "source_id"),
     )
 
-    op.create_table('concept_source',
-        sa.Column('concept_id', sa.Integer(), nullable=False),
-        sa.Column('source_id', sa.Integer(), nullable=False),
-        sa.ForeignKeyConstraint(['concept_id'], ['concept.id'], ),
-        sa.ForeignKeyConstraint(['source_id'], ['source.id'], ),
-        sa.PrimaryKeyConstraint('concept_id', 'source_id')
+    op.create_table(
+        "concept_source",
+        sa.Column("concept_id", sa.Integer(), nullable=False),
+        sa.Column("source_id", sa.Integer(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ["concept_id"],
+            ["concept.id"],
+        ),
+        sa.ForeignKeyConstraint(
+            ["source_id"],
+            ["source.id"],
+        ),
+        sa.PrimaryKeyConstraint("concept_id", "source_id"),
     )
 
 
 def downgrade():
 
-    op.drop_table('conceptscheme_source')
-    op.drop_table('concept_source')
-    op.drop_table('source')
+    op.drop_table("conceptscheme_source")
+    op.drop_table("concept_source")
+    op.drop_table("source")
diff --git a/atramhasis/alembic/versions/1ad2b6fbcf22_visit_log.py b/atramhasis/alembic/versions/1ad2b6fbcf22_visit_log.py
@@ -6,30 +6,32 @@
 
 """
 
-# revision identifiers, used by Alembic.
-revision = '1ad2b6fbcf22'
-down_revision = '441c5a16ef8'
-
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "1ad2b6fbcf22"
+down_revision = "441c5a16ef8"
 
 
 def upgrade():
-    op.create_table('conceptscheme_visit_log',
-                    sa.Column('id', sa.Integer(), primary_key=True, autoincrement=True),
-                    sa.Column('conceptscheme_id', sa.String(), nullable=False),
-                    sa.Column('visited_at', sa.DateTime(), nullable=False),
-                    sa.Column('origin', sa.String, nullable=False)
-                    )
-    op.create_table('concept_visit_log',
-                    sa.Column('id', sa.Integer(), primary_key=True, autoincrement=True),
-                    sa.Column('concept_id', sa.Integer(), nullable=False),
-                    sa.Column('conceptscheme_id', sa.String(), nullable=False),
-                    sa.Column('visited_at', sa.DateTime(), nullable=False),
-                    sa.Column('origin', sa.String, nullable=False)
-                    )
+    op.create_table(
+        "conceptscheme_visit_log",
+        sa.Column("id", sa.Integer(), primary_key=True, autoincrement=True),
+        sa.Column("conceptscheme_id", sa.String(), nullable=False),
+        sa.Column("visited_at", sa.DateTime(), nullable=False),
+        sa.Column("origin", sa.String, nullable=False),
+    )
+    op.create_table(
+        "concept_visit_log",
+        sa.Column("id", sa.Integer(), primary_key=True, autoincrement=True),
+        sa.Column("concept_id", sa.Integer(), nullable=False),
+        sa.Column("conceptscheme_id", sa.String(), nullable=False),
+        sa.Column("visited_at", sa.DateTime(), nullable=False),
+        sa.Column("origin", sa.String, nullable=False),
+    )
 
 
 def downgrade():
-    op.drop_table('concept_visit_log')
-    op.drop_table('conceptscheme_visit_log')
+    op.drop_table("concept_visit_log")
+    op.drop_table("conceptscheme_visit_log")
diff --git a/atramhasis/alembic/versions/2a38d364113b_languages_for_conceptschemes.py b/atramhasis/alembic/versions/2a38d364113b_languages_for_conceptschemes.py
@@ -5,26 +5,32 @@
 Create Date: 2015-11-19 15:03:45.587093
 
 """
+import sqlalchemy as sa
+from alembic import op
 
 # revision identifiers, used by Alembic.
-revision = '2a38d364113b'
-down_revision = '3ac8aca026fd'
-
-from alembic import op
-import sqlalchemy as sa
+revision = "2a38d364113b"
+down_revision = "3ac8aca026fd"
 
 
 def upgrade():
 
-    op.create_table('conceptscheme_language',
-        sa.Column('conceptscheme_id', sa.Integer(), nullable=False),
-        sa.Column('language_id', sa.String(length=64), nullable=False),
-        sa.ForeignKeyConstraint(['conceptscheme_id'], ['conceptscheme.id'], ),
-        sa.ForeignKeyConstraint(['language_id'], ['language.id'], ),
-        sa.PrimaryKeyConstraint('conceptscheme_id', 'language_id')
+    op.create_table(
+        "conceptscheme_language",
+        sa.Column("conceptscheme_id", sa.Integer(), nullable=False),
+        sa.Column("language_id", sa.String(length=64), nullable=False),
+        sa.ForeignKeyConstraint(
+            ["conceptscheme_id"],
+            ["conceptscheme.id"],
+        ),
+        sa.ForeignKeyConstraint(
+            ["language_id"],
+            ["language.id"],
+        ),
+        sa.PrimaryKeyConstraint("conceptscheme_id", "language_id"),
     )
 
 
 def downgrade():
 
-    op.drop_table('conceptscheme_language')
+    op.drop_table("conceptscheme_language")