Compatibility fixes for Flask 2.0 and SQLAlchemy 1.4 (#71)

Author: jace

.gitignore

@@ -23,6 +23,7 @@ baseframe-packed.js
 packed.css
 packed.js
 error.log
+error.log.*
 *.sql
 *.gz
 *.bz2

.pre-commit-config.yaml

@@ -14,17 +14,17 @@ repos:
             '--remove-duplicate-keys',
           ]
   - repo: https://github.com/pre-commit/mirrors-isort
-    rev: v4.3.21
+    rev: v5.8.0
     hooks:
       - id: isort
         additional_dependencies:
           - toml
   - repo: https://github.com/ambv/black
-    rev: 19.10b0
+    rev: 21.5b2
     hooks:
       - id: black
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.1.0
+    rev: v4.0.1
     hooks:
       - id: check-added-large-files
       - id: check-ast
@@ -51,7 +51,7 @@ repos:
       - id: requirements-txt-fixer
       - id: trailing-whitespace
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.2
+    rev: 3.9.2
     hooks:
       - id: flake8
         additional_dependencies:
@@ -66,13 +66,13 @@ repos:
           - flake8-print
           - pep8-naming
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.6.2
+    rev: 1.7.0
     hooks:
       - id: bandit
         language_version: python3
         exclude: (^tests|funnel/loginproviders/flask_oauth.py)
-  - repo: https://github.com/prettier/prettier
-    rev: 2.0.5
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v2.3.1
     hooks:
       - id: prettier
         args: ['--single-quote', '--trailing-comma', 'es5']

instance/testing.py

@@ -13,7 +13,7 @@
 #: Asset server
 ASSET_SERVER = 'https://static.hasgeek.co.in/'
 #: Secret key
-SECRET_KEY = 'make this something random'
+SECRET_KEY = 'make this something random'  # nosec
 #: Cache type
 CACHE_TYPE = 'redis'
 #: Timezone
@@ -23,7 +23,7 @@
 #: Lastuser client id
 LASTUSER_CLIENT_ID = ''
 #: Lastuser client secret
-LASTUSER_CLIENT_SECRET = ''
+LASTUSER_CLIENT_SECRET = ''  # nosec
 #: Mail settings
 #: MAIL_FAIL_SILENTLY : default True
 #: MAIL_SERVER : default 'localhost'

manage.py

@@ -32,8 +32,8 @@ def upgrade():
         sa.Column('updated_at', sa.DateTime(), nullable=False),
         sa.Column('link_id', sa.Integer(), nullable=False),
         sa.Column('recipient_id', sa.Integer(), nullable=False),
-        sa.ForeignKeyConstraint(['link_id'], ['email_link.id'],),
-        sa.ForeignKeyConstraint(['recipient_id'], ['email_recipient.id'],),
+        sa.ForeignKeyConstraint(['link_id'], ['email_link.id']),
+        sa.ForeignKeyConstraint(['recipient_id'], ['email_recipient.id']),
         sa.PrimaryKeyConstraint('link_id', 'recipient_id'),
     )
 

migrations/script.py.mako

@@ -48,7 +48,7 @@ def upgrade():
         sa.Column('trackclicks', sa.Boolean(), nullable=False),
         sa.Column('name', sa.Unicode(length=250), nullable=False),
         sa.Column('title', sa.Unicode(length=250), nullable=False),
-        sa.ForeignKeyConstraint(['user_id'], ['user.id'],),
+        sa.ForeignKeyConstraint(['user_id'], ['user.id']),
         sa.PrimaryKeyConstraint('id'),
         sa.UniqueConstraint('name'),
     )
@@ -62,7 +62,7 @@ def upgrade():
         sa.Column('template_text', sa.UnicodeText(), nullable=False),
         sa.Column('template_html', sa.UnicodeText(), nullable=False),
         sa.Column('url_id', sa.Integer(), nullable=False),
-        sa.ForeignKeyConstraint(['campaign_id'], ['email_campaign.id'],),
+        sa.ForeignKeyConstraint(['campaign_id'], ['email_campaign.id']),
         sa.PrimaryKeyConstraint('id'),
         sa.UniqueConstraint('campaign_id', 'url_id'),
     )
@@ -90,8 +90,8 @@ def upgrade():
         sa.Column('draft_id', sa.Integer(), nullable=True),
         sa.Column('linkgroup', sa.Integer(), nullable=True),
         sa.Column('url_id', sa.Integer(), nullable=False),
-        sa.ForeignKeyConstraint(['campaign_id'], ['email_campaign.id'],),
-        sa.ForeignKeyConstraint(['draft_id'], ['email_draft.id'],),
+        sa.ForeignKeyConstraint(['campaign_id'], ['email_campaign.id']),
+        sa.ForeignKeyConstraint(['draft_id'], ['email_draft.id']),
         sa.PrimaryKeyConstraint('id'),
         sa.UniqueConstraint('campaign_id', 'url_id'),
         sa.UniqueConstraint('opentoken'),

migrations/versions/32de3aa6b4f4_link_tracking.py

@@ -0,0 +1,5 @@
+#!/bin/sh
+export FLASK_ENV=development
+export FLASK_RUN_HOST=0.0.0.0
+export FLASK_RUN_PORT=7890
+flask run