migrated to flask-restx, updated submodules

ActivityWatch · Feb 15, 2020 · e2d57b7 · e2d57b7
1 parent dc89d60
commit e2d57b7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/aw-qt b/aw-qt
diff --git a/aw-server b/aw-server
diff --git a/aw-watcher-afk b/aw-watcher-afk
diff --git a/aw-watcher-window b/aw-watcher-window
diff --git a/aw.spec b/aw.spec
@@ -4,10 +4,10 @@
 import os
 import platform
 import aw_core
-import flask_restplus
+import flask_restx
 
 aw_core_path = os.path.dirname(aw_core.__file__)
-restplus_path = os.path.dirname(flask_restplus.__file__)
+restx_path = os.path.dirname(flask_restx.__file__)
 
 aws_location = "aw-server/"
 aw_qt_location = "aw-qt/"
@@ -36,8 +36,8 @@ aw_server_a = Analysis(['aw-server/__main__.py'],
                        datas=[
                            (aws_location + '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=[],
+4 −4		aw-server.spec
+1 −1		aw-webui
+1 −1		aw_server/rest.py
+102 −88		poetry.lock
+1 −1		pyproject.toml
+8 −11		.travis.yml
+4 −4		Makefile
+1 −1		README.md
+550 −0		poetry.lock
+25 −0		pyproject.toml
+0 −6		requirements.txt
+0 −21		setup.py
+11 −22		.travis.yml
+6 −6		Makefile
+6 −8		aw_watcher_window/main.py
+6 −5		aw_watcher_window/xprop.py
+656 −0		poetry.lock
+26 −0		pyproject.toml
+0 −6		requirements.txt
+0 −30		setup.py