Skip to content

Commit 59c34d8

Browse files
pcrespovpcrespov
authored
Maintenance/ lgtm+CodeQL fixes (ITISFoundation#3363)
1 parent ddecdef commit 59c34d8

File tree

55 files changed

+514
-405
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+514
-405
lines changed

‎packages/postgres-database/src/simcore_postgres_database/__init__.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@
77

88
__version__: str = pkg_resources.get_distribution("simcore-postgres-database").version
99

10-
__all__: Tuple[str, ...] = ("metadata", "webserver_models", "storage_models")
10+
__all__: tuple[str, ...] = ("metadata", "webserver_models", "storage_models")
11+
12+
# nopycln: file

‎packages/postgres-database/src/simcore_postgres_database/errors.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
"""
1919
# NOTE: psycopg2.errors are created dynamically
2020
# pylint: disable=no-name-in-module
21-
22-
from typing import Tuple
23-
2421
from psycopg2 import DatabaseError, DataError
2522
from psycopg2 import Error as DBAPIError
2623
from psycopg2 import (
@@ -46,7 +43,7 @@
4643
# assert isinstance(e.orig, UniqueViolation)
4744

4845

49-
__all__: Tuple[str, ...] = (
46+
__all__: tuple[str, ...] = (
5047
"DatabaseError",
5148
"DataError",
5249
"DBAPIError",
@@ -59,3 +56,4 @@
5956
"OperationalError",
6057
"ProgrammingError",
6158
)
59+
# nopycln: file

‎packages/postgres-database/src/simcore_postgres_database/migration/versions/009c81406676_add_project_running_state.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
Create Date: 2020-10-12 08:38:40.807576+00:00
66
77
"""
8-
from alembic import op
98
import sqlalchemy as sa
9+
from alembic import op
1010
from sqlalchemy.dialects import postgresql
1111

1212
# revision identifiers, used by Alembic.

‎packages/postgres-database/src/simcore_postgres_database/migration/versions/01073b43fc74_new_group_classifiers_table.py‎

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,44 @@
55
Create Date: 2020-08-19 20:40:02.610105+00:00
66
77
"""
8-
from alembic import op
98
import sqlalchemy as sa
9+
from alembic import op
1010
from sqlalchemy.dialects import postgresql
1111

1212
# revision identifiers, used by Alembic.
13-
revision = '01073b43fc74'
14-
down_revision = 'f4fda75c0df0'
13+
revision = "01073b43fc74"
14+
down_revision = "f4fda75c0df0"
1515
branch_labels = None
1616
depends_on = None
1717

1818

1919
def upgrade():
2020
# ### commands auto generated by Alembic - please adjust! ###
21-
op.create_table('group_classifiers',
22-
sa.Column('id', sa.BigInteger(), nullable=False),
23-
sa.Column('bundle', postgresql.JSONB(astext_type=sa.Text()), nullable=False),
24-
sa.Column('created', sa.DateTime(), server_default=sa.text('now()'), nullable=False),
25-
sa.Column('modified', sa.DateTime(), server_default=sa.text('now()'), nullable=False),
26-
sa.Column('gid', sa.BigInteger(), nullable=True),
27-
sa.ForeignKeyConstraint(['gid'], ['groups.gid'], name='fk_group_classifiers_gid_to_groups_gid', onupdate='CASCADE', ondelete='CASCADE'),
28-
sa.PrimaryKeyConstraint('id', name='group_classifiers_pkey'),
29-
sa.UniqueConstraint('gid')
21+
op.create_table(
22+
"group_classifiers",
23+
sa.Column("id", sa.BigInteger(), nullable=False),
24+
sa.Column("bundle", postgresql.JSONB(astext_type=sa.Text()), nullable=False),
25+
sa.Column(
26+
"created", sa.DateTime(), server_default=sa.text("now()"), nullable=False
27+
),
28+
sa.Column(
29+
"modified", sa.DateTime(), server_default=sa.text("now()"), nullable=False
30+
),
31+
sa.Column("gid", sa.BigInteger(), nullable=True),
32+
sa.ForeignKeyConstraint(
33+
["gid"],
34+
["groups.gid"],
35+
name="fk_group_classifiers_gid_to_groups_gid",
36+
onupdate="CASCADE",
37+
ondelete="CASCADE",
38+
),
39+
sa.PrimaryKeyConstraint("id", name="group_classifiers_pkey"),
40+
sa.UniqueConstraint("gid"),
3041
)
3142
# ### end Alembic commands ###
3243

3344

3445
def downgrade():
3546
# ### commands auto generated by Alembic - please adjust! ###
36-
op.drop_table('group_classifiers')
47+
op.drop_table("group_classifiers")
3748
# ### end Alembic commands ###

‎packages/postgres-database/src/simcore_postgres_database/migration/versions/16a9454764cb_add_task_event_procedures.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
Create Date: 2020-07-28 06:36:47.491622+00:00
66
77
"""
8-
from alembic import op
98
import sqlalchemy as sa
10-
9+
from alembic import op
1110

1211
# revision identifiers, used by Alembic.
1312
revision = "16a9454764cb"

‎packages/postgres-database/src/simcore_postgres_database/migration/versions/16ee7d73b9cc_adds_api_keys_table.py‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,35 @@
55
Create Date: 2020-04-28 08:11:42.785688+00:00
66
77
"""
8-
from alembic import op
98
import sqlalchemy as sa
10-
9+
from alembic import op
1110

1211
# revision identifiers, used by Alembic.
13-
revision = '16ee7d73b9cc'
14-
down_revision = 'f3555bb4bc34'
12+
revision = "16ee7d73b9cc"
13+
down_revision = "f3555bb4bc34"
1514
branch_labels = None
1615
depends_on = None
1716

1817

1918
def upgrade():
2019
# ### commands auto generated by Alembic - please adjust! ###
21-
op.create_table('api_keys',
22-
sa.Column('id', sa.BigInteger(), nullable=False),
23-
sa.Column('display_name', sa.String(), nullable=False),
24-
sa.Column('user_id', sa.BigInteger(), nullable=False),
25-
sa.Column('api_key', sa.String(), nullable=False),
26-
sa.Column('api_secret', sa.String(), nullable=False),
27-
sa.ForeignKeyConstraint(['user_id'], ['users.id'], ondelete='CASCADE'),
28-
sa.PrimaryKeyConstraint('id'),
29-
sa.UniqueConstraint('display_name', 'user_id', name='display_name_userid_uniqueness')
20+
op.create_table(
21+
"api_keys",
22+
sa.Column("id", sa.BigInteger(), nullable=False),
23+
sa.Column("display_name", sa.String(), nullable=False),
24+
sa.Column("user_id", sa.BigInteger(), nullable=False),
25+
sa.Column("api_key", sa.String(), nullable=False),
26+
sa.Column("api_secret", sa.String(), nullable=False),
27+
sa.ForeignKeyConstraint(["user_id"], ["users.id"], ondelete="CASCADE"),
28+
sa.PrimaryKeyConstraint("id"),
29+
sa.UniqueConstraint(
30+
"display_name", "user_id", name="display_name_userid_uniqueness"
31+
),
3032
)
3133
# ### end Alembic commands ###
3234

3335

3436
def downgrade():
3537
# ### commands auto generated by Alembic - please adjust! ###
36-
op.drop_table('api_keys')
38+
op.drop_table("api_keys")
3739
# ### end Alembic commands ###

‎packages/postgres-database/src/simcore_postgres_database/migration/versions/1ca14c33e65c_add_groups_accessrights.py‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,32 @@
55
Create Date: 2020-05-29 13:28:10.425714+00:00
66
77
"""
8-
from alembic import op
98
import sqlalchemy as sa
9+
from alembic import op
1010
from sqlalchemy.dialects import postgresql
1111

1212
# revision identifiers, used by Alembic.
13-
revision = '1ca14c33e65c'
14-
down_revision = '53e095260441'
13+
revision = "1ca14c33e65c"
14+
down_revision = "53e095260441"
1515
branch_labels = None
1616
depends_on = None
1717

1818

1919
def upgrade():
2020
# ### commands auto generated by Alembic - please adjust! ###
21-
op.add_column('groups', sa.Column('access_rights', postgresql.JSONB(astext_type=sa.Text()), server_default=sa.text("'{}'::jsonb"), nullable=False))
21+
op.add_column(
22+
"groups",
23+
sa.Column(
24+
"access_rights",
25+
postgresql.JSONB(astext_type=sa.Text()),
26+
server_default=sa.text("'{}'::jsonb"),
27+
nullable=False,
28+
),
29+
)
2230
# ### end Alembic commands ###
2331

2432

2533
def downgrade():
2634
# ### commands auto generated by Alembic - please adjust! ###
27-
op.drop_column('groups', 'access_rights')
35+
op.drop_column("groups", "access_rights")
2836
# ### end Alembic commands ###

‎packages/postgres-database/src/simcore_postgres_database/migration/versions/27c6a30d7c24_add_ui_in_projects_table.py‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,32 @@
55
Create Date: 2020-10-09 09:46:27.364227+00:00
66
77
"""
8-
from alembic import op
98
import sqlalchemy as sa
9+
from alembic import op
1010
from sqlalchemy.dialects import postgresql
1111

1212
# revision identifiers, used by Alembic.
13-
revision = '27c6a30d7c24'
14-
down_revision = '009c81406676'
13+
revision = "27c6a30d7c24"
14+
down_revision = "009c81406676"
1515
branch_labels = None
1616
depends_on = None
1717

1818

1919
def upgrade():
2020
# ### commands auto generated by Alembic - please adjust! ###
21-
op.add_column('projects', sa.Column('ui', postgresql.JSONB(astext_type=sa.Text()), server_default=sa.text("'{}'::jsonb"), nullable=False))
21+
op.add_column(
22+
"projects",
23+
sa.Column(
24+
"ui",
25+
postgresql.JSONB(astext_type=sa.Text()),
26+
server_default=sa.text("'{}'::jsonb"),
27+
nullable=False,
28+
),
29+
)
2230
# ### end Alembic commands ###
2331

2432

2533
def downgrade():
2634
# ### commands auto generated by Alembic - please adjust! ###
27-
op.drop_column('projects', 'ui')
35+
op.drop_column("projects", "ui")
2836
# ### end Alembic commands ###

‎packages/postgres-database/src/simcore_postgres_database/migration/versions/31728148ab63_added_tags.py‎

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,40 +5,47 @@
55
Create Date: 2020-01-20 15:11:56.273986+00:00
66
77
"""
8-
from alembic import op
98
import sqlalchemy as sa
10-
9+
from alembic import op
1110

1211
# revision identifiers, used by Alembic.
13-
revision = '31728148ab63'
14-
down_revision = 'add5f60f0f67'
12+
revision = "31728148ab63"
13+
down_revision = "add5f60f0f67"
1514
branch_labels = None
1615
depends_on = None
1716

1817

1918
def upgrade():
2019
# ### commands auto generated by Alembic - please adjust! ###
21-
op.create_table('tags',
22-
sa.Column('id', sa.BigInteger(), nullable=False),
23-
sa.Column('user_id', sa.BigInteger(), nullable=False),
24-
sa.Column('name', sa.String(), nullable=False),
25-
sa.Column('description', sa.String(), nullable=True),
26-
sa.Column('color', sa.String(), nullable=False),
27-
sa.ForeignKeyConstraint(['user_id'], ['users.id'], onupdate='CASCADE', ondelete='CASCADE'),
28-
sa.PrimaryKeyConstraint('id')
20+
op.create_table(
21+
"tags",
22+
sa.Column("id", sa.BigInteger(), nullable=False),
23+
sa.Column("user_id", sa.BigInteger(), nullable=False),
24+
sa.Column("name", sa.String(), nullable=False),
25+
sa.Column("description", sa.String(), nullable=True),
26+
sa.Column("color", sa.String(), nullable=False),
27+
sa.ForeignKeyConstraint(
28+
["user_id"], ["users.id"], onupdate="CASCADE", ondelete="CASCADE"
29+
),
30+
sa.PrimaryKeyConstraint("id"),
2931
)
30-
op.create_table('study_tags',
31-
sa.Column('study_id', sa.BigInteger(), nullable=False),
32-
sa.Column('tag_id', sa.BigInteger(), nullable=False),
33-
sa.ForeignKeyConstraint(['study_id'], ['projects.id'], onupdate='CASCADE', ondelete='CASCADE'),
34-
sa.ForeignKeyConstraint(['tag_id'], ['tags.id'], onupdate='CASCADE', ondelete='CASCADE'),
35-
sa.UniqueConstraint('study_id', 'tag_id')
32+
op.create_table(
33+
"study_tags",
34+
sa.Column("study_id", sa.BigInteger(), nullable=False),
35+
sa.Column("tag_id", sa.BigInteger(), nullable=False),
36+
sa.ForeignKeyConstraint(
37+
["study_id"], ["projects.id"], onupdate="CASCADE", ondelete="CASCADE"
38+
),
39+
sa.ForeignKeyConstraint(
40+
["tag_id"], ["tags.id"], onupdate="CASCADE", ondelete="CASCADE"
41+
),
42+
sa.UniqueConstraint("study_id", "tag_id"),
3643
)
3744
# ### end Alembic commands ###
3845

3946

4047
def downgrade():
4148
# ### commands auto generated by Alembic - please adjust! ###
42-
op.drop_table('study_tags')
43-
op.drop_table('tags')
49+
op.drop_table("study_tags")
50+
op.drop_table("tags")
4451
# ### end Alembic commands ###

‎packages/postgres-database/src/simcore_postgres_database/migration/versions/31f0ab4a338b_dev_column_added.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
Create Date: 2020-07-27 09:27:10.787990+00:00
66
77
"""
8-
from alembic import op
98
import sqlalchemy as sa
9+
from alembic import op
1010
from sqlalchemy.dialects import postgresql
1111

1212
# revision identifiers, used by Alembic.

0 commit comments

Comments
 (0)