migrated from flask-restplus to flask-restx, updated submodule

ActivityWatch · Feb 15, 2020 · 36e970e · 36e970e
1 parent 47a208b
commit 36e970e
Show file tree

Hide file tree

Showing 5 changed files with 109 additions and 95 deletions.
diff --git a/aw-server.spec b/aw-server.spec
@@ -6,8 +6,8 @@ import os
 import aw_core
 aw_core_path = os.path.dirname(aw_core.__file__)
 
-import flask_restplus
-restplus_path = os.path.dirname(flask_restplus.__file__)
+import flask_restx
+restx_path = os.path.dirname(flask_restx.__file__)
 
 block_cipher = None
 
@@ -18,8 +18,8 @@ a = Analysis(['__main__.py'],
              datas=[
                 ('aw_server/static', 'aw_server/static'),
 
-                (os.path.join(restplus_path, 'templates'), 'flask_restplus/templates'),
-                (os.path.join(restplus_path, 'static'), 'flask_restplus/static'),
+                (os.path.join(restx_path, 'templates'), 'flask_restx/templates'),
+                (os.path.join(restx_path, 'static'), 'flask_restx/static'),
                 (os.path.join(aw_core_path, 'schemas'), 'aw_core/schemas')
              ],
              hiddenimports=[],

diff --git a/aw-webui b/aw-webui
diff --git a/aw_server/rest.py b/aw_server/rest.py
@@ -3,7 +3,7 @@
 import json
 
 from flask import request, Blueprint, jsonify, current_app, make_response
-from flask_restplus import Api, Resource, fields
+from flask_restx import Api, Resource, fields
 import iso8601
 from datetime import datetime, timedelta