Replace flask_restful with flask_restx (#1282)

Co-authored-by: Kevin Chung <kchung@ctfd.io>

CTFd/api/__init__.py

@@ -1,5 +1,5 @@
 from flask import Blueprint, current_app
-from flask_restplus import Api
+from flask_restx import Api
 
 from CTFd.api.v1.awards import awards_namespace
 from CTFd.api.v1.challenges import challenges_namespace

CTFd/api/v1/awards.py

@@ -1,5 +1,5 @@
 from flask import request
-from flask_restplus import Namespace, Resource
+from flask_restx import Namespace, Resource
 
 from CTFd.cache import clear_standings
 from CTFd.utils.config import is_teams_mode

CTFd/api/v1/challenges.py

@@ -1,7 +1,7 @@
 import datetime
 
 from flask import abort, request, url_for
-from flask_restplus import Namespace, Resource
+from flask_restx import Namespace, Resource
 from sqlalchemy.sql import and_
 
 from CTFd.cache import clear_standings

CTFd/api/v1/config.py

@@ -1,5 +1,5 @@
 from flask import request
-from flask_restplus import Namespace, Resource
+from flask_restx import Namespace, Resource
 
 from CTFd.cache import clear_config, clear_standings
 from CTFd.models import Configs, db

CTFd/api/v1/files.py

@@ -1,5 +1,5 @@
 from flask import request
-from flask_restplus import Namespace, Resource
+from flask_restx import Namespace, Resource
 
 from CTFd.models import Files, db
 from CTFd.schemas.files import FileSchema

CTFd/api/v1/flags.py

@@ -1,5 +1,5 @@
 from flask import request
-from flask_restplus import Namespace, Resource
+from flask_restx import Namespace, Resource
 
 from CTFd.models import Flags, db
 from CTFd.plugins.flags import FLAG_CLASSES, get_flag_class

CTFd/api/v1/hints.py

@@ -1,5 +1,5 @@
 from flask import request
-from flask_restplus import Namespace, Resource
+from flask_restx import Namespace, Resource
 
 from CTFd.models import Hints, HintUnlocks, db
 from CTFd.schemas.hints import HintSchema

CTFd/api/v1/notifications.py

@@ -1,5 +1,5 @@
 from flask import current_app, request
-from flask_restplus import Namespace, Resource
+from flask_restx import Namespace, Resource
 
 from CTFd.models import Notifications, db
 from CTFd.schemas.notifications import NotificationSchema

CTFd/api/v1/pages.py

@@ -1,5 +1,5 @@
 from flask import request
-from flask_restplus import Namespace, Resource
+from flask_restx import Namespace, Resource
 
 from CTFd.cache import clear_pages
 from CTFd.models import Pages, db

CTFd/api/v1/scoreboard.py

@@ -1,4 +1,4 @@
-from flask_restplus import Namespace, Resource
+from flask_restx import Namespace, Resource
 
 from CTFd.cache import cache, make_cache_key
 from CTFd.models import Awards, Solves, Teams

CTFd/api/v1/statistics/__init__.py

@@ -1,4 +1,4 @@
-from flask_restplus import Namespace
+from flask_restx import Namespace
 
 statistics_namespace = Namespace(
     "statistics", description="Endpoint to retrieve Statistics"

CTFd/api/v1/statistics/challenges.py

@@ -1,4 +1,4 @@
-from flask_restplus import Resource
+from flask_restx import Resource
 from sqlalchemy import func
 from sqlalchemy.sql import or_
 

CTFd/api/v1/statistics/submissions.py

@@ -1,4 +1,4 @@
-from flask_restplus import Resource
+from flask_restx import Resource
 from sqlalchemy import func
 
 from CTFd.api.v1.statistics import statistics_namespace

CTFd/api/v1/statistics/teams.py

@@ -1,4 +1,4 @@
-from flask_restplus import Resource
+from flask_restx import Resource
 
 from CTFd.api.v1.statistics import statistics_namespace
 from CTFd.models import Teams

CTFd/api/v1/statistics/users.py

@@ -1,4 +1,4 @@
-from flask_restplus import Resource
+from flask_restx import Resource
 from sqlalchemy import func
 
 from CTFd.api.v1.statistics import statistics_namespace

CTFd/api/v1/submissions.py

@@ -1,5 +1,5 @@
 from flask import request
-from flask_restplus import Namespace, Resource
+from flask_restx import Namespace, Resource
 
 from CTFd.cache import clear_standings
 from CTFd.models import Submissions, db

CTFd/api/v1/tags.py

@@ -1,5 +1,5 @@
 from flask import request
-from flask_restplus import Namespace, Resource
+from flask_restx import Namespace, Resource
 
 from CTFd.models import Tags, db
 from CTFd.schemas.tags import TagSchema

CTFd/api/v1/teams.py

@@ -1,7 +1,7 @@
 import copy
 
 from flask import abort, request, session
-from flask_restplus import Namespace, Resource
+from flask_restx import Namespace, Resource
 
 from CTFd.cache import clear_standings
 from CTFd.models import Awards, Submissions, Teams, Unlocks, Users, db

CTFd/api/v1/tokens.py

@@ -1,7 +1,7 @@
 import datetime
 
 from flask import request, session
-from flask_restplus import Namespace, Resource
+from flask_restx import Namespace, Resource
 
 from CTFd.models import Tokens, db
 from CTFd.schemas.tokens import TokenSchema

CTFd/api/v1/unlocks.py

@@ -1,5 +1,5 @@
 from flask import request
-from flask_restplus import Namespace, Resource
+from flask_restx import Namespace, Resource
 
 from CTFd.cache import clear_standings
 from CTFd.models import Unlocks, db, get_class_by_tablename

CTFd/api/v1/users.py

@@ -1,5 +1,5 @@
 from flask import abort, request, session
-from flask_restplus import Namespace, Resource
+from flask_restx import Namespace, Resource
 
 from CTFd.cache import clear_standings
 from CTFd.models import (

requirements.txt

@@ -21,7 +21,7 @@ redis==3.3.11
 datafreeze==0.1.0
 gevent==1.4.0
 python-dotenv==0.10.3
-flask-restplus==0.13.0
+flask-restx==0.1.1
 pathlib2==2.3.5
 flask-marshmallow==0.10.1
 marshmallow-sqlalchemy==0.17.0