update version

Author: sreeder

README.md

@@ -11,42 +11,44 @@ If you want to try ODM Tools, we have created a couple of [testing databases](ht
 
 ##ODM Compatibility
 
-ODM Tools Python is currenlty fully compatible with ODM Version 1.1.1. We are working on ODM2 compatibility, and should have it worked out this summer.
+ODM Tools Python is currenlty fully compatible with ODM Version 1.1.1. We are working on ODM2 compatibility, and should have it worked out this winter.
 
 ##Releases
 
 To make running ODMTools easier we have included installers. Please select the one that is appropriate for your operating system
 
 ####Windows
 Recommended Release:
-+   [Window v1.2.5-beta](https://github.com/ODM2/ODMToolsPython/releases/download/v1.2.5_beta/ODMTools_1.2.5_Beta_Win_Installer.exe)
++   [Window v1.2.8-beta](https://github.com/ODM2/ODMToolsPython/releases/download/v1.2.8_beta/ODMTools_1.2.8_Beta_Win_Installer.exe)
 
 ####Mac
-+   [Mac v1.2.5-beta](https://github.com/ODM2/ODMToolsPython/releases/download/v1.2.5_beta/ODMTools_v1.2.5-beta_Mac_installer.pkg.zip)
++   [Mac v1.2.8-beta](https://github.com/ODM2/ODMToolsPython/releases/download/v1.2.8_beta/ODMTools_v1.2.8-beta_Mac_installer.pkg.zip)
 
 ####Linux
 +   *Please run from source*
 
 Running From Source
 -------------------
 
-+	[Matplotlib-1.4.3](https://github.com/matplotlib/matplotlib/releases/tag/v1.4.3)
-+	[Pandas-0.16.0](https://github.com/pydata/pandas/releases)
++	[Matplotlib](https://github.com/matplotlib/matplotlib/releases/)
++	[Pandas](https://github.com/pydata/pandas/releases)
 +	[Pip](http://docs.python-guide.org/en/latest/starting/install/win.html)
 +	[PyMySQL](https://github.com/petehunt/PyMySQL/)
-+	[Pyodbc-3.0.7](https://code.google.com/p/pyodbc/downloads/detail?name=pyodbc-3.0.7.win-amd64-py2.7.exe)
++	[Pyodbc](https://code.google.com/p/pyodbc/downloads/)
 +	[Python-2.7.9 x64/x32](http://www.python.org/download/releases/2.7.9/) (Python 3 version isn't available)
-+	[Psycopg2-2.4.6](http://initd.org/psycopg/docs/install.html)
-+	[Sqlalchemy-1.0.0] (http://pypi.python.org/pypi/SQLAlchemy/1.0.0)
-+	[wxpython-3.0.0](http://www.wxpython.org/download.php)
++	[Psycopg2](http://initd.org/psycopg/docs/install.html)
++	[Sqlalchemy] (http://pypi.python.org/pypi/SQLAlchemy/)
++	[wxpython](http://www.wxpython.org/download.php)
++	[Numpy](http://www.scipy.org/scipylib/download.html)
++	[Scipy](https://www.scipy.org/scipylib/download.html)
 
 Install the following software/libraries.
 It is recommended to create an environment using 'Conda'.
 'Conda' comes prepackaged in the Python Scientific Package Suite [Anaconda](http://continuum.io/downloads) (Available for Windows, OSX, Linux)
 
 Example environment creation:
 
-+   conda create -n odmtools python=2.7.8 wxpython matplotlib pandas pyodbc sqlalchemy pip psycopg2
++   conda create -n odmtools python=2.7.8 wxpython matplotlib pandas numpy scipy pyodbc sqlalchemy pip psycopg2
 
 +   pip install pymysql
 

doc/developer_docs/source/conf.py

@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = 'beta-v1.2.0'
+version = '1.2.8'
 # The full version, including alpha/beta/rc tags.
-release = 'beta-v1.2.0'
+release = 'beta-v1.2.8'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

odmtools/meta/data.py

@@ -1,5 +1,5 @@
 app_name = "ODMTools"
-version = "1.2.5_Beta"
+version = "1.2.8_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/Mac/ODMTools.packproj

@@ -567,9 +567,9 @@
 						<string></string>
 						<key>IFPkgDescriptionTitle</key>
 
-						<string>ODMTools_v1.2.5</string>
+						<string>ODMTools_v1.2.8</string>
 						<key>IFPkgDescriptionVersion</key>
-						<string>1.2.5 Beta</string>
+						<string>1.2.8 Beta</string>
 
 					</dict>
 				</dict>
@@ -586,7 +586,7 @@
 					<key>CFBundleName</key>
 					<string>ODMTools</string>
 					<key>CFBundleShortVersionString</key>
-					<string>1.2.5</string>
+					<string>1.2.8</string>
 				</dict>
 				<key>Options</key>
 				<dict>
@@ -621,7 +621,7 @@
 		<key>IFPkgFlagPackageSelection</key>
 		<integer>0</integer>
 		<key>Name</key>
-		<string>ODMTools_v1.2.5-beta_Mac_installer</string>
+		<string>ODMTools_v1.2.8-beta_Mac_installer</string>
 		<key>Status</key>
 		<integer>1</integer>
 		<key>Type</key>

setup/Windows/odmtools_console.iss

@@ -3,8 +3,8 @@
 
 #define MyAppName "ODMTools"
 
-#define MyAppVersion "1.2.5_Beta"
-#define MyAppExeLongName "ODMTools_1.2.5_Beta_win32_x86_64_console.exe"
+#define MyAppVersion "1.2.8_Beta"
+#define MyAppExeLongName "ODMTools_1.2.8_Beta_win32_x86_64_console.exe"
 #define MyAppPublisher "ODM2"
 #define MyAppURL "https://github.com/ODM2/ODMToolsPython"
 #define MyAppExeName "ODMTools.exe"

setup/Windows/odmtools_no_console.iss

@@ -4,8 +4,8 @@
 
 #define MyAppName "ODMTools"
 
-#define MyAppExeLongName "ODMTools_1.2.5_Beta_win32_x86_64.exe"
-#define MyAppVersion "1.2.5_Beta"
+#define MyAppExeLongName "ODMTools_1.2.8_Beta_win32_x86_64.exe"
+#define MyAppVersion "1.2.8_Beta"
 
 #define MyAppPublisher "ODM2"
 #define MyAppURL "https://github.com/ODM2/ODMToolsPython"

setup/Windows/odmtools_setup.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "ODMTools"
-#define MyAppVersion "1.2.5_Beta"
+#define MyAppVersion "1.2.8_Beta"
 #define MyAppPublisher "ODM2"
 #define MyAppURL "https://github.com/ODM2/ODMToolsPython"
 #define MyAppExeName "ODMTools.exe"

setup/Windows/test.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "ODMTools"
-#define MyAppVersion "1.2.0"
+#define MyAppVersion "1.2.8"
 #define MyAppPublisher "My Company, Inc."
 #define MyAppURL "http://www.example.com/"
 #define MyAppExeName "ODMTools_console.exe"
@@ -33,8 +33,8 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "C:\Users\jmeline_\Documents\GitHub\ODMToolsPython\setup\Dist\ODMTools_1.2.0_Beta_win32_x86_64_console\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\jmeline_\Documents\GitHub\ODMToolsPython\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: "D:\DEV\ODMToolsPython\setup\Dist\ODMTools_1.2.8_Beta_win32_x86_64_console\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "D:\DEV\ODMToolsPython\setup\Dist\ODMTools_1.2.8_Beta_win32_x86_64_console\ODMTools_1.2.8_Beta_win32_x86_64_console.exe"; DestDir: "{app}"; Flags: ignoreversion
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]

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.5 beta'),
+        StringStruct(u'ProductVersion', u'1.2.8 beta'),
         StringStruct(u'InternalName', u'ODMTools'),
         StringStruct(u'OriginalFilename', u'ODMTools.exe'),
-        StringStruct(u'FileVersion', u'1.2.5 beta'),
+        StringStruct(u'FileVersion', u'1.2.8 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'),])