update setup files

Author: sreeder

ODMTools.py

@@ -18,9 +18,9 @@
 from multiprocessing import cpu_count, freeze_support
 from odmtools.odmdata import MemoryDatabase
 
-# import pyodbc
-# import pymysql
-# import psycopg2
+import pyodbc
+import pymysql
+import psycopg2
 
 tool = LoggerTool()
 logger = tool.setupLogger(__name__, __name__ + '.log', 'w', logging.DEBUG)

make.py

@@ -4,6 +4,15 @@
 from contextlib import closing
 from zipfile import ZipFile, ZIP_DEFLATED
 
+#need Windows installer
+#windows installer with console
+#windows no install( include console)
+#mac installer
+#mac no installer
+
+
+
+
 ## Update odmtools.meta.data whenever creating a release
 from odmtools.meta import data
 
@@ -148,7 +157,7 @@ def run_pyinstaller(console=False):
                 '--noconfirm ' + APP_FILE)
         else:
             ## Non Console Version
-            os.system('pyinstaller '
+            val = os.system('pyinstaller '
                 '--clean '
                 '--distpath=%s ' % WIN_DIR +
                 '--workpath=%s ' % WORK_DIR +

odmtools/meta/data.py

@@ -1,5 +1,5 @@
 app_name = "ODMTools"
-version = "1.2.0_Beta"
+version = "1.2.1_Beta"
 copyright = "Copyright (c) 2013 - 2015, Utah State University. All rights reserved."
 description = "ODMTools is a python application for managing observational data using the Observations Data Model. " \
             "ODMTools allows you to query, visualize, and edit data stored in an Observations Data Model (ODM) database." \

setup/Windows/odmtools_console.iss

@@ -2,11 +2,11 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "ODMTools"
-#define MyAppVersion "1.2.0_Beta"
+#define MyAppVersion "1.2.1_Beta"
 #define MyAppPublisher "ODM2"
 #define MyAppURL "https://github.com/ODM2/ODMToolsPython"
-#define MyAppExeName "ODMTools_1.2.0_Beta_win32_x86_64_console.exe"
-#define MyAppDir "C:\Users\jmeline_\Documents\GitHub\ODMToolsPython"
+#define MyAppExeName "ODMTools_1.2.1_Beta_win32_x86_64_console.exe"
+#define MyAppDir "D:\DEV\ODMToolsPython"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
@@ -37,8 +37,8 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "{#MyAppDir}\setup\Dist\ODMTools_1.2.0_Beta_win32_x86_64_console\ODMTools_1.2.0_Beta_win32_x86_64_console.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyAppDir}\setup\Dist\ODMTools_1.2.0_Beta_win32_x86_64_console\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#MyAppDir}\setup\Dist\ODMTools_1.2.1_Beta_win32_x86_64_console\ODMTools_1.2.0_Beta_win32_x86_64_console.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#MyAppDir}\setup\Dist\ODMTools_1.2.1_Beta_win32_x86_64_console\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]

setup/Windows/odmtools_no_console.iss

@@ -2,11 +2,11 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "ODMTools"
-#define MyAppVersion "1.2.0_Beta"
+#define MyAppVersion "1.2.1_Beta"
 #define MyAppPublisher "ODM2"
 #define MyAppURL "https://github.com/ODM2/ODMToolsPython"
-#define MyAppExeName "ODMTools_1.2.0_Beta_win32_x86_64.exe"
-#define MyAppDir "C:\Users\jmeline_\Documents\GitHub\ODMToolsPython"
+#define MyAppExeName "ODMTools_1.2.1_Beta_win32_x86_64.exe"
+#define MyAppDir "D:\DEV\ODMToolsPython"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
@@ -37,8 +37,8 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "{#MyAppDir}\setup\Dist\ODMTools_1.2.0_Beta_win32_x86_64\ODMTools_1.2.0_Beta_win32_x86_64.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyAppDir}\setup\Dist\ODMTools_1.2.0_Beta_win32_x86_64\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#MyAppDir}\setup\Dist\ODMTools_1.2.1_Beta_win32_x86_64\ODMTools_1.2.1_Beta_win32_x86_64.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#MyAppDir}\setup\Dist\ODMTools_1.2.1_Beta_win32_x86_64\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]

setup/Windows/odmtools_setup.iss

@@ -2,11 +2,11 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "ODMTools"
-#define MyAppVersion "1.2.0_Beta"
+#define MyAppVersion "1.2.1_Beta"
 #define MyAppPublisher "ODM2"
 #define MyAppURL "https://github.com/ODM2/ODMToolsPython"
 #define MyAppExeName "ODMTools.exe"
-#define MyAppDir "C:\DEV\ODMToolsPython"
+#define MyAppDir "D:\DEV\ODMToolsPython"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.

setup/version.txt

@@ -31,10 +31,10 @@ VSVersionInfo(
         u'040904b0',
         [StringStruct(u'CompanyName', u'Utah Water Research Laboratory'),
         StringStruct(u'ProductName', u'ODMTools'),
-        StringStruct(u'ProductVersion', u'1.2.0 beta'),
+        StringStruct(u'ProductVersion', u'1.2.1 beta'),
         StringStruct(u'InternalName', u'ODMTools'),
         StringStruct(u'OriginalFilename', u'ODMTools.exe'),
-        StringStruct(u'FileVersion', u'1.2.0 beta'),
+        StringStruct(u'FileVersion', u'1.2.1 beta'),
         StringStruct(u'FileDescription', u'ODMTools is a python application for managing observational data using the Observations Data Model. ODMTools allows you to query, visualize, and edit data stored in an Observations Data Model (ODM) database.ODMTools was originally developed as part of the CUAHSI Hydrologic Information System.'),
         StringStruct(u'LegalCopyright', u'Copyright (c) 2013, Utah State University. All rights reserved.'),
         StringStruct(u'LegalTrademarks', u'N/A'),])