Skip to content

Commit

Permalink
update packages
Browse files Browse the repository at this point in the history
  • Loading branch information
aronwk-aaron committed Nov 18, 2023
1 parent 5ae2769 commit abc8af8
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 164 deletions.
3 changes: 0 additions & 3 deletions app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
from webassets import Bundle
import time
from app.models import db, migrate, PlayKey
from app.schemas import ma
from app.forms import CustomUserManager
from flask_user import user_registered, current_user, user_logged_in
from flask_wtf.csrf import CSRFProtect
Expand Down Expand Up @@ -128,8 +127,6 @@ def register_extensions(app):
"""
db.init_app(app)
migrate.init_app(app, db)
ma.init_app(app)

scheduler.init_app(app)
scheduler.start()

Expand Down
4 changes: 0 additions & 4 deletions app/accounts.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,12 @@
db,
Friends
)
from app.schemas import AccountSchema
from app import gm_level, log_audit
from app.forms import EditGMLevelForm, EditEmailForm
from sqlalchemy import or_

accounts_blueprint = Blueprint('accounts', __name__)

account_schema = AccountSchema()


@accounts_blueprint.route('/', methods=['GET'])
@login_required
@gm_level(3)
Expand Down
4 changes: 0 additions & 4 deletions app/characters.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from datatables import ColumnDT, DataTables
import time
from app.models import CharacterInfo, CharacterXML, Account, db
from app.schemas import CharacterInfoSchema
from app.forms import RescueForm, CharXMLUploadForm
from app import gm_level, log_audit
from app.luclient import translate_from_locale
Expand All @@ -15,9 +14,6 @@

character_blueprint = Blueprint('characters', __name__)

character_schema = CharacterInfoSchema()


@character_blueprint.route('/', methods=['GET'])
@login_required
@gm_level(3)
Expand Down
4 changes: 0 additions & 4 deletions app/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@
from flask_user import current_user, login_required

from app.models import Account, CharacterInfo, ActivityLog
from app.schemas import AccountSchema, CharacterInfoSchema

import datetime
import time

main_blueprint = Blueprint('main', __name__)

account_schema = AccountSchema()
char_info_schema = CharacterInfoSchema()


@main_blueprint.route('/', methods=['GET'])
def index():
Expand Down
4 changes: 2 additions & 2 deletions app/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from wtforms import ValidationError

import logging
from flask_sqlalchemy import BaseQuery
from flask_sqlalchemy.query import Query
from sqlalchemy.dialects import mysql
from sqlalchemy.exc import OperationalError, StatementError
from sqlalchemy.types import JSON
Expand All @@ -15,7 +15,7 @@

# retrying query to work around python trash collector
# killing connections of other gunicorn workers
class RetryingQuery(BaseQuery):
class RetryingQuery(Query):
__retry_count__ = 3

def __init__(self, *args, **kwargs):
Expand Down
4 changes: 0 additions & 4 deletions app/properties.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
from datatables import ColumnDT, DataTables
import time
from app.models import Property, db, UGC, CharacterInfo, PropertyContent, Account, Mail
from app.schemas import PropertySchema
from app import gm_level, log_audit
from app.luclient import query_cdclient
from app.forms import RejectPropertyForm
Expand All @@ -24,9 +23,6 @@

property_blueprint = Blueprint('properties', __name__)

property_schema = PropertySchema()


@property_blueprint.route('/', methods=['GET'])
@login_required
@gm_level(3)
Expand Down
130 changes: 0 additions & 130 deletions app/schemas.py

This file was deleted.

33 changes: 20 additions & 13 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,42 @@ alembic==1.7.5
APScheduler==3.8.1
astroid==2.9.1
autopep8==1.6.0
backports.zoneinfo==0.2.1
bcrypt==3.2.0
blinker==1.4
blinker==1.7.0
cffi==1.14.6
click==8.0.1
click==8.1.7
colorama==0.4.4
cryptography==36.0.0
dnspython==2.1.0
dominate==2.6.0
email-validator==1.1.3
Flask==2.0.1
Flask==3.0.0
Flask-APScheduler==1.12.3
Flask-Assets==2.0
Flask-Login==0.5.0
Flask-Assets==2.1.0
Flask-Login==0.6.3
Flask-Mail==0.9.1
flask-marshmallow==0.14.0
flask-marshmallow==0.15.0
Flask-Migrate==3.1.0
Flask-SQLAlchemy==2.5.1
Flask-SQLAlchemy==3.1.1
Flask-User==1.0.2.2
Flask-WTF==1.0.0
Flask-WTF==1.2.1
greenlet==1.1.0
gunicorn==21.2.0
idna==3.3
importlib-metadata==6.8.0
importlib-resources==6.1.1
isort==5.10.1
itsdangerous==2.0.1
Jinja2==3.0.1
itsdangerous==2.1.2
Jinja2==3.1.2
lazy-object-proxy==1.7.1
libsass==0.21.0
Mako==1.2.2
MarkupSafe==2.0.1
MarkupSafe==2.1.3
marshmallow==3.14.1
marshmallow-sqlalchemy==0.26.1
mccabe==0.6.1
packaging==23.2
passlib==1.7.4
platformdirs==2.4.1
pycodestyle==2.8.0
Expand All @@ -47,15 +52,17 @@ pytz==2021.3
pytz-deprecation-shim==0.1.0.post0
six==1.16.0
snowballstemmer==2.2.0
SQLAlchemy==1.4.22
SQLAlchemy==2.0.23
sqlalchemy-datatables==2.0.1
toml==0.10.2
typing_extensions==4.8.0
tzdata==2021.5
tzlocal==4.1
visitor==0.1.3
Wand==0.6.7
webassets==2.0
Werkzeug==2.0.1
Werkzeug==3.0.1
wrapt==1.13.3
WTForms==3.0.0
xmltodict==0.12.0
zipp==3.17.0

0 comments on commit abc8af8

Please sign in to comment.