Python libs updates

filak · Jan 24, 2020 · f423b94 · f423b94
1 parent 6137805
commit f423b94
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/flask-app/!!build__mtw-server-win-service.bat b/flask-app/!!build__mtw-server-win-service.bat
@@ -16,7 +16,7 @@ echo rem call %targetDir%\%fileHandle%.exe stop
 echo.
 echo Building %srcFile% ...
 
-CALL c:\Python37\Scripts\pyinstaller.exe --log-level ERROR --onefile --hidden-import=_cffi_backend --add-data mtw_utils/pyuca/*.txt;pyuca --distpath %targetDir% %srcFile% >> %logFile% 2>&1
+CALL c:\Python37\Scripts\pyinstaller.exe --log-level ERROR --onefile --hidden-import=pkg_resources.py2_warn --hidden-import=_cffi_backend --add-data mtw_utils/pyuca/*.txt;pyuca --distpath %targetDir% %srcFile% >> %logFile% 2>&1
 
 echo  - Done!
 echo.

diff --git a/flask-app/!!build__mtw-server-win-worker.bat b/flask-app/!!build__mtw-server-win-worker.bat
@@ -15,7 +15,7 @@ echo rem call %targetDir%\%fileHandle%.exe stop
 echo.
 echo Building %srcFile% ...
 
-CALL c:\Python37\Scripts\pyinstaller.exe --log-level ERROR --onefile --add-data mtw_utils/pyuca/*.txt;pyuca --distpath %targetDir% %srcFile% >> %logFile% 2>&1
+CALL c:\Python37\Scripts\pyinstaller.exe --log-level ERROR --onefile --hidden-import=_cffi_backend --hidden-import=pkg_resources.py2_warn --add-data mtw_utils/pyuca/*.txt;pyuca --distpath %targetDir% %srcFile% >> %logFile% 2>&1
 
 echo  - Done!
 

diff --git a/flask-app/!!build__set-mtw-admin.bat b/flask-app/!!build__set-mtw-admin.bat
@@ -12,7 +12,7 @@ echo. > %logFile%
 echo.
 echo Building %srcFile% ...
 
-CALL c:\Python37\Scripts\pyinstaller.exe --log-level ERROR --onefile --hidden-import=_cffi_backend --distpath %targetDir% %srcFile% >> %logFile% 2>&1
+CALL c:\Python37\Scripts\pyinstaller.exe --log-level ERROR --onefile --hidden-import=_cffi_backend --hidden-import=pkg_resources.py2_warn --distpath %targetDir% %srcFile% >> %logFile% 2>&1
 
 echo.
 echo Finished

diff --git a/flask-app/mtw/worker.py b/flask-app/mtw/worker.py
@@ -27,7 +27,7 @@
 
 app.config.update(dict(
     APP_NAME = 'MTW Worker',
-    APP_VER = '0.1.5',
+    APP_VER = '0.1.6',
     API_VER = '1.0.0',
     TEMP_DIR = mtu.get_instance_dir(app, 'temp'),
     local_config_file = mtu.get_instance_dir(app, 'conf/mtw.ini'),

diff --git a/flask-app/mtw_requirements.txt b/flask-app/mtw_requirements.txt
@@ -1,5 +1,6 @@
 ### Python 3.7+ ###
-arrow==0.15.4
+arrow==0.15.5
+bcrypt==3.1.7 # NOT python-bcrypt !!!
 diff_match_patch==20181111
 Flask==1.1.1
 Flask_SeaSurf==0.2.2
@@ -8,11 +9,9 @@ Jinja2==2.10.3
 pyuca==1.2
 requests==2.22.0
 requests_futures==1.0.0
-bcrypt==3.1.7 # NOT python-bcrypt !!!
-### If deploying with Tornado:
-#tornado==4.5.3 ## DO NOT UPGRADE to 5+ if on Windows
-### Building for Windows:
-## Install pywin32 using https://github.com/mhammond/pywin32/releases
-#pywin32==227
-#pyinstaller==3.4
-#servicemanager==1.8.1
+#### Building for Windows:
+### If deploying with Tornado use v4.5.3 
+##  - use the local copy from this repo (source: https://github.com/tornadoweb/tornado/releases/tag/v4.5.3)
+##  - DO NOT UPGRADE to 5+ if on Windows !
+### Install pywin32 v227 using https://github.com/mhammond/pywin32/releases
+#pyinstaller==3.6
diff --git a/flask-app/set-mtw-admin.py b/flask-app/set-mtw-admin.py
@@ -4,7 +4,7 @@
 from pathlib import Path
 
 appname = 'set-mtw-admin'
-appversion = '1.1'
+appversion = '1.2'
 appdesc = '(re)Set Admin credentials and SecKey in MTW Admin Config'
 appusage = 'Help:   '+ appname +' -h '