upgrade dependencies (#4)

upgrade dependencies and fix some things which broke
mysql fulltextsearch module doesn't work but nobody uses that

PyMySQL not upgraded due to
julien-duponchelle/python-mysql-replication#337

ES not really tested as always xd (I need to make a proper dev setup)

Author: nyaadev

README.md

@@ -40,7 +40,7 @@ pyenv eases the use of different Python versions, and as not all Linux distros o
 
 ### Finishing up
 - Run `python db_create.py` to create the database and import categories
-    - Follow the advice of `db_create.py` and run `./db_migrate.py stamp head` to mark the database version for Alembic
+    - Follow the advice of `db_create.py` and run `flask db stamp head` to mark the database version for Alembic
 - Start the dev server with `python run.py`
 - When you are finished developing, deactivate your virtualenv with `pyenv deactivate` or `source deactivate` (or just close your shell session)
 
@@ -51,16 +51,16 @@ Continue below to learn about database migrations and enabling the advanced sear
 ## Database migrations
 - Database migrations are done with [flask-Migrate](https://flask-migrate.readthedocs.io/), a wrapper around [Alembic](http://alembic.zzzcomputing.com/en/latest/).
 - If someone has made changes in the database schema and included a new migration script:
-    - If your database has never been marked by Alembic (you're on a database from before the migrations), run `./db_migrate.py stamp head` before pulling the new migration script(s).
-        - If you already have the new scripts, check the output of `./db_migrate.py history` instead and choose a hash that matches your current database state, then run `./db_migrate.py stamp <hash>`.
+    - If your database has never been marked by Alembic (you're on a database from before the migrations), run `flask db stamp head` before pulling the new migration script(s).
+        - If you already have the new scripts, check the output of `flask db history` instead and choose a hash that matches your current database state, then run `flask db stamp <hash>`.
     - Update your branch (eg. `git fetch && git rebase origin/master`)
-    - Run `./db_migrate.py upgrade head` to run the migration. Done!
+    - Run `flask db upgrade head` to run the migration. Done!
 - If *you* have made a change in the database schema:
     - Save your changes in `models.py` and ensure the database schema matches the previous version (ie. your new tables/columns are not added to the live database)
-    - Run `./db_migrate.py migrate -m "Short description of changes"` to automatically generate a migration script for the changes
+    - Run `flask db migrate -m "Short description of changes"` to automatically generate a migration script for the changes
       - Check the script (`migrations/versions/...`) and make sure it works! Alembic may not able to notice all changes.
-    - Run `./db_migrate.py upgrade` to run the migration and verify the upgrade works.
-       - (Run `./db_migrate.py downgrade` to verify the downgrade works as well, then upgrade again)
+    - Run `flask db upgrade` to run the migration and verify the upgrade works.
+       - (Run `flask db downgrade` to verify the downgrade works as well, then upgrade again)
 
 
 ## Setting up and enabling Elasticsearch

db_create.py

@@ -57,6 +57,6 @@ def add_categories(categories, main_class, sub_class):
 
         if database_empty:
             print('Remember to run the following to mark the database up-to-date for Alembic:')
-            print('./db_migrate.py stamp head')
+            print('flask db stamp head')
             # Technically we should be able to do this here, but when you have
             # Flask-Migrate and Flask-SQA and everything... I didn't get it working.

db_migrate.py

@@ -6,7 +6,7 @@
 from flask_assets import Bundle  # noqa F401
 
 from nyaa.api_handler import api_blueprint
-from nyaa.extensions import assets, cache, db, fix_paginate, limiter, toolbar
+from nyaa.extensions import assets, cache, db, fix_paginate, limiter, toolbar, migrate
 from nyaa.template_utils import bp as template_utils_bp
 from nyaa.template_utils import caching_url_for
 from nyaa.utils import random_string
@@ -114,6 +114,7 @@ def internal_error(exception):
     app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
     app.config['MYSQL_DATABASE_CHARSET'] = 'utf8mb4'
     db.init_app(app)
+    migrate.init_app(app, db)
 
     # Assets
     assets.init_app(app)

nyaa/__init__.py

@@ -8,12 +8,14 @@
 from flask_limiter import Limiter
 from flask_limiter.util import get_remote_address
 from flask_sqlalchemy import BaseQuery, Pagination, SQLAlchemy
+from flask_migrate import Migrate
 
 assets = Environment()
 db = SQLAlchemy()
 toolbar = DebugToolbarExtension()
 cache = Cache()
 limiter = Limiter(key_func=get_remote_address)
+migrate = Migrate()
 
 
 class LimitedPagination(Pagination):

nyaa/extensions.py

@@ -192,13 +192,13 @@ def __repr__(self):
 
     def update_comment_count(self):
         self.comment_count = db.session.query(func.count(
-            Comment.id)).filter_by(torrent_id=self.id).first()[0]
+            Comment.id)).filter(Comment.torrent_id == self.id).first()[0]
         return self.comment_count
 
     @classmethod
     def update_comment_count_db(cls, torrent_id):
         cls.query.filter_by(id=torrent_id).update({'comment_count': db.session.query(
-            func.count(Comment.id)).filter_by(torrent_id=torrent_id).as_scalar()}, False)
+            func.count(Comment.id)).filter(Comment.torrent_id == torrent_id).as_scalar()}, False)
 
     @property
     def created_utc_timestamp(self):
@@ -494,7 +494,7 @@ class User(db.Model):
     sukebei_torrents = db.relationship('SukebeiTorrent', back_populates='user', lazy='dynamic')
     sukebei_comments = db.relationship('SukebeiComment', back_populates='user', lazy='dynamic')
 
-    bans = db.relationship('Ban', uselist=True, foreign_keys='Ban.user_id')
+    bans = db.relationship('Ban', uselist=True, foreign_keys='Ban.user_id', back_populates='user')
 
     preferences = db.relationship('UserPreferences', back_populates='user', uselist=False)
 
@@ -776,7 +776,8 @@ class Ban(db.Model):
     reason = db.Column(db.String(length=2048), nullable=False)
 
     admin = db.relationship('User', uselist=False, lazy='joined', foreign_keys=[admin_id])
-    user = db.relationship('User', uselist=False, lazy='joined', foreign_keys=[user_id])
+    user = db.relationship('User', uselist=False, lazy='joined',
+                           foreign_keys=[user_id], back_populates='bans')
 
     __table_args__ = (
         Index('user_ip_4', 'user_ip', mysql_length=4, unique=True),
@@ -880,7 +881,7 @@ class TrustedApplication(db.Model):
     why_give = db.Column(db.String(length=4000), nullable=False)
     status = db.Column(ChoiceType(TrustedApplicationStatus, impl=db.Integer()), nullable=False,
                        default=TrustedApplicationStatus.NEW)
-    reviews = db.relationship('TrustedReview', backref='trusted_applications')
+    reviews = db.relationship('TrustedReview', back_populates='application')
     submitter = db.relationship('User', uselist=False, lazy='joined', foreign_keys=[submitter_id])
 
     @hybrid_property
@@ -929,7 +930,7 @@ class TrustedReview(db.Model):
                                nullable=False)
     reviewer = db.relationship('User', uselist=False, lazy='joined', foreign_keys=[reviewer_id])
     application = db.relationship('TrustedApplication', uselist=False, lazy='joined',
-                                  foreign_keys=[app_id])
+                                  foreign_keys=[app_id], back_populates='reviews')
 
 
 # Actually declare our site-specific classes

nyaa/models.py

@@ -1,69 +1,68 @@
-alembic==1.4.3
+alembic==1.6.5
 appdirs==1.4.4
 argon2-cffi==20.1.0
-attrs==20.3.0
-autopep8==1.5.4
+attrs==21.2.0
+autopep8==1.5.7
 blinker==1.4
 certifi==2020.12.5
-cffi==1.14.4
-chardet==3.0.4
-click==7.1.2
-dnspython==2.0.0
-elasticsearch==7.10.0
+cffi==1.14.5
+chardet==4.0.0
+click==8.0.1
+dnspython==2.1.0
+elasticsearch==7.13.1
 elasticsearch-dsl==7.3.0
 email-validator==1.1.2
-flake8==3.8.4
+flake8==3.9.2
 flake8-isort==4.0.0
-Flask==1.1.2
+Flask==2.0.1
 Flask-Assets==2.0
-Flask-Caching==1.9.0
+Flask-Caching==1.10.1
 Flask-DebugToolbar==0.11.0
 Flask-Limiter==1.4
-Flask-Migrate==2.5.3
-flask-paginate==0.7.1
-Flask-Script==2.0.6
-Flask-SQLAlchemy==2.4.4
-Flask-WTF==0.14.3
-gevent==20.9.0
-greenlet==0.4.17
+Flask-Migrate==3.0.1
+flask-paginate==0.8.1
+Flask-SQLAlchemy==2.5.1
+Flask-WTF==0.15.1
+gevent==21.1.2
+greenlet==1.1.0
 idna==2.10
 iniconfig==1.1.1
-isort==5.6.4
-itsdangerous==1.1.0
-Jinja2==2.11.2
+isort==5.8.0
+itsdangerous==2.0.1
+Jinja2==3.0.1
 limits==1.5.1
-Mako==1.1.3
-MarkupSafe==1.1.1
+Mako==1.1.4
+MarkupSafe==2.0.1
 mccabe==0.6.1
-mysql-replication==0.22
-mysqlclient==2.0.1
+mysql-replication==0.23
+mysqlclient==2.0.3
 orderedset==2.0.3
-packaging==20.7
+packaging==20.9
 passlib==1.7.4
 pluggy==0.13.1
 progressbar33==2.4
-py==1.9.0
-pycodestyle==2.6.0
+py==1.10.0
+pycodestyle==2.7.0
 pycparser==2.20
-pyflakes==2.2.0
+pyflakes==2.3.1
 PyMySQL==0.10.1
 pyparsing==2.4.7
-pytest==6.1.2
+pytest==6.2.4
 python-dateutil==2.8.1
 python-editor==1.0.4
-python-utils==2.4.0
+python-utils==2.5.6
 redis==3.5.3
-requests==2.25.0
-six==1.15.0
-SQLAlchemy==1.3.20
-SQLAlchemy-Utils==0.36.8
+requests==2.25.1
+six==1.16.0
+SQLAlchemy==1.4.17
+SQLAlchemy-Utils==0.37.6
 statsd==3.3.0
-testfixtures==6.15.0
+testfixtures==6.17.1
 toml==0.10.2
-urllib3==1.26.2
+urllib3==1.26.5
 uWSGI==2.0.19.1
 webassets==2.0
-Werkzeug==1.0.1
+Werkzeug==2.0.1
 WTForms==2.3.3
 zope.event==4.5.0
-zope.interface==5.2.0
+zope.interface==5.4.0

requirements.txt

@@ -2,5 +2,6 @@
 from nyaa import create_app
 
 app = create_app('config')
+
 if __name__ == "__main__":
-	app.run(host='0.0.0.0', port=5500, debug=True)
+    app.run(host='0.0.0.0', port=5500, debug=True)