Skip to content

Commit 43619d2

Browse files
author
sreeder
committed
update version and name
1 parent b1afe95 commit 43619d2

File tree

9 files changed

+22
-22
lines changed

9 files changed

+22
-22
lines changed

‎odmtools/controller/olvSeriesSelector.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def _buildColumns(self, columns):
5050
seriesColumns = [
5151
ColumnDefn(key, align="left", minimumWidth=100, valueGetter=key,
5252
# stringConverter = '%s')
53-
stringConverter='%Y-%m-%d %H:%M:%S' if "date" in key.lower() else '%s')
53+
stringConverter='%Y-%m-%d %H:%M:%S' if ("date" in key.lower()) else '%s')
5454
for key in columns]
5555

5656

‎odmtools/meta/data.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
app_name = "ODMTools"
2-
version = "1.2.8_Beta"
1+
app_name = "ODM2Tools"
2+
version = "2.0.0_Beta"
33
copyright = "Copyright (c) 2013 - 2015, Utah State University. All rights reserved."
44
description = "ODMTools is a python application for managing observational data using the Observations Data Model. " \
55
"ODMTools allows you to query, visualize, and edit data stored in an Observations Data Model (ODM) database." \
66
" ODMTools was originally developed as part of the CUAHSI Hydrologic Information System."
77

88
developers = ["Jeffery S. Horsburgh", "Amber Spackman Jones",
9-
"Stephanie L. Reeder", "Jacob Meline", "James Patton"]
9+
"Stephanie L. Reeder", "Francisco Arrieta", "Mikaila Young", "Jacob Meline", "James Patton"]
1010

1111
license = "This material is copyright (c) 2013 - 2015 Utah State University." \
1212
"\nIt is open and licensed under the New Berkeley Software Distribution (BSD) License. Full text of the license follows." \
@@ -18,5 +18,5 @@
1818
"\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. "
1919

2020

21-
website = ("http://uchic.github.io/ODMToolsPython/", "ODMTools home page")
21+
website = ("http://odm2.github.io/ODMToolsPython/", "ODMTools home page")
2222

‎setup/Mac/Welcome.rtf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
\margl1440\margr1440\vieww10800\viewh8400\viewkind0
55
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
66

7-
\f0\fs24 \cf0 Please click Continue to install ODMTools for your mac. \
7+
\f0\fs24 \cf0 Please click Continue to install ODM2Tools for your mac. \
88
}

‎setup/Windows/ODMTools.spec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ coll = COLLECT(exe,
2727
a.datas,
2828
strip=False,
2929
upx=True,
30-
name='ODMTools')
30+
name='ODM2Tools')
3131

3232

3333

‎setup/Windows/odmtools_console.iss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
; Script generated by the Inno Setup Script Wizard.
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
33

4-
#define MyAppName "ODMTools"
4+
#define MyAppName "ODM2Tools"
55

6-
#define MyAppVersion "1.2.8_Beta"
7-
#define MyAppExeLongName "ODMTools_1.2.8_Beta_win32_x86_64_console.exe"
6+
#define MyAppVersion "2.0.0_Beta"
7+
#define MyAppExeLongName "ODM2Tools_2.0.0_Beta_win32_x86_64_console.exe"
88
#define MyAppPublisher "ODM2"
99
#define MyAppURL "https://github.com/ODM2/ODMToolsPython"
10-
#define MyAppExeName "ODMTools.exe"
10+
#define MyAppExeName "ODM2Tools.exe"
1111
#define MyAppDir "D:\DEV\ODMTools"
1212

1313
[Setup]

‎setup/Windows/odmtools_no_console.iss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
#define MyAppName "ODMTools"
66

7-
#define MyAppExeLongName "ODMTools_1.2.8_Beta_win32_x86_64.exe"
8-
#define MyAppVersion "1.2.8_Beta"
7+
#define MyAppExeLongName "ODM2Tools_2.0.0_Beta_win32_x86_64.exe"
8+
#define MyAppVersion "2.0.0_Beta"
99

1010
#define MyAppPublisher "ODM2"
1111
#define MyAppURL "https://github.com/ODM2/ODMToolsPython"
12-
#define MyAppExeName "ODMTools.exe"
12+
#define MyAppExeName "ODM2Tools.exe"
1313
#define MyAppDir "D:\DEV\ODMTools"
1414

1515
[Setup]

‎setup/Windows/odmtools_setup.iss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
; Script generated by the Inno Setup Script Wizard.
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
33

4-
#define MyAppName "ODMTools"
5-
#define MyAppVersion "1.2.8_Beta"
4+
#define MyAppName "ODM2Tools"
5+
#define MyAppVersion "2.0.0_Beta"
66
#define MyAppPublisher "ODM2"
77
#define MyAppURL "https://github.com/ODM2/ODMToolsPython"
8-
#define MyAppExeName "ODMTools.exe"
8+
#define MyAppExeName "ODM2Tools.exe"
99
#define MyAppDir "D:\DEV\ODMTools"
1010

1111
[Setup]

‎setup/Windows/odmtools_setup_build.iss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
; http://www.jrsoftware.org/isinfo.php
44
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
55

6-
#define MyAppName "ODMTools"
6+
#define MyAppName "ODM2Tools"
77
#define OrgName "UCHIC"
8-
#define MyAppVersion "v1.2.8-beta"
8+
#define MyAppVersion "v2.0.0-beta"
99
#define MyAppURL "https://github.com/ODM2/ODMToolsPython"
1010

1111
[Setup]

‎setup/Windows/test.iss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
; Script generated by the Inno Setup Script Wizard.
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
33

4-
#define MyAppName "ODMTools"
5-
#define MyAppVersion "1.2.8"
4+
#define MyAppName "ODM2Tools"
5+
#define MyAppVersion "2.0.0"
66
#define MyAppPublisher "My Company, Inc."
77
#define MyAppURL "http://www.example.com/"
8-
#define MyAppExeName "ODMTools_console.exe"
8+
#define MyAppExeName "ODM2Tools_console.exe"
99

1010
[Setup]
1111
; NOTE: The value of AppId uniquely identifies this application.

0 commit comments

Comments
 (0)