Merge branch 'Beta_1.2.7' of https://github.com/odm2/ODMToolsPython into Beta_1.2.7

Author: stephanie

make.py

@@ -154,9 +154,11 @@ def run_pyinstaller(console=False):
                 '--distpath=%s ' % WIN_DIR +
                 '--workpath=%s ' % WORK_DIR +
                 '--specpath=%s ' % WIN_DIR +
-                '--upx-dir=%s ' % BASE_DIR +
+                #'--upx-dir=%s ' % BASE_DIR +
+                '--noupx '
                 '--icon=%s ' % WIN_ICON_FILE +
                 '--version-file=%s ' % VERSION_FILE +
+                '--onedir '
                 # '--onefile ' +
                 '--exclude=
                 '--noconfirm ' + APP_FILE)
@@ -167,8 +169,10 @@ def run_pyinstaller(console=False):
                 '--distpath=%s ' % WIN_DIR +
                 '--workpath=%s ' % WORK_DIR +
                 '--specpath=%s ' % WIN_DIR +
-                '--upx-dir=%s ' % BASE_DIR +
+                #'--upx-dir=%s ' % BASE_DIR +
+                '--noupx '
                 '--icon=%s ' % WIN_ICON_FILE +
+                '--onedir '
                 # '--onefile ' +
                 '--version-file=%s ' % VERSION_FILE +
                 '--noconsole '

setup/Windows/odmtools_console.iss

@@ -8,7 +8,7 @@
 #define MyAppPublisher "ODM2"
 #define MyAppURL "https://github.com/ODM2/ODMToolsPython"
 #define MyAppExeName "ODMTools.exe"
-#define MyAppDir "D:\DEV\ODMToolsPython"
+#define MyAppDir "D:\DEV\ODMTools"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.

setup/Windows/odmtools_no_console.iss

@@ -10,7 +10,7 @@
 #define MyAppPublisher "ODM2"
 #define MyAppURL "https://github.com/ODM2/ODMToolsPython"
 #define MyAppExeName "ODMTools.exe"
-#define MyAppDir "D:\DEV\ODMToolsPython"
+#define MyAppDir "D:\DEV\ODMTools"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.

setup/Windows/odmtools_setup.iss

@@ -6,7 +6,7 @@
 #define MyAppPublisher "ODM2"
 #define MyAppURL "https://github.com/ODM2/ODMToolsPython"
 #define MyAppExeName "ODMTools.exe"
-#define MyAppDir "D:\DEV\ODMToolsPython"
+#define MyAppDir "D:\DEV\ODMTools"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.

toolsenvironment.yml

@@ -1,31 +1,20 @@
 name: odmtools
+channels:
+  - ioos
 dependencies:
-- dateutil=2.4.1=py27_0
-- freetype=2.4.10=1
-- libpng=1.5.13=1
-- matplotlib=1.4.3=np19py27_0
-- numpy=1.9.2=py27_0
-- openssl=1.0.1k=1
-- pandas=0.15.2=np19py27_0
-- pip=7.1.2=py27_0
-- psycopg2=2.6=py27_0
-- pymysql=0.6.6=py27_0
-- pyparsing=2.0.3=py27_0
-- python=2.7.10=1
-- python.app=1.2=py27_3
-- pytz=2014.9=py27_0
-- readline=6.2=2
-- scipy=0.15.1=np19py27_0
-- setuptools=18.4=py27_0
-- six=1.9.0=py27_0
-- sqlalchemy=0.9.9=py27_0
-- sqlite=3.8.4.1=1
-- tk=8.5.18=0
-- wheel=0.26.0=py27_1
-- wxpython=3.0=py27_0
-- zlib=1.2.8=0
-- pip:
-  - geoalchemy2==0.2.5
-  - pyodbc==3.0.7
-  - python-dateutil==2.4.1
-  - wxpython-common==3.0.0.0
+  - python=2.7
+  - matplotlib
+  - numpy
+  - pandas
+  - pip
+  - psycopg2
+  - pymysql
+  - pyparsing
+  - scipy
+  - sqlalchemy
+  - sqlite
+  - wheel
+  - wxpython
+  - pip:
+    - geoalchemy
+    - pyodbc