Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated files for python3 support #137

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion calipso/Calipso.py
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,7 @@ def load(self):
options['defaultextension'] = '.json'
options['filetypes'] = [('CALIPSO Data files', '*.json'), ('All files', '*')]
f = tkFileDialog.askopenfilename(**options)
if f is '':
if f == '':
return
self.__shapemanager.read_plot(f)

Expand Down
4 changes: 2 additions & 2 deletions calipso/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ class Plot(object):

TIME_VARIANCE = 0.001
ALTITUDE_VARIANCE = 0.3
PATH = '.'
PATH = os.path.dirname(os.path.realpath(__file__))
HOMEPATH = expanduser('~')

# Makes a single persistent instance of the config for VOCAL to grab
CONF = Config(PATH + '/dat/config.json')
CONF = Config(os.path.join(PATH, 'config.json'))

ICO = PATH + '/ico/broadcasting.ico'
if _platform == 'linux' or _platform == 'linux2':
Expand Down
72 changes: 36 additions & 36 deletions calipso/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,43 +5,43 @@
sys.setrecursionlimit(5000)
DATA = [
('dat',
['C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/CALIPSO.jpg',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/calipso-aerosol_subtype.cmap',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/calipso-backscatter.cmap',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/calipso-depolar.cmap',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/calipso-horizontalaveraging.cmap',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/calipso-icewaterphase.cmap',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/calipso-vfm.cmap',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/CALIPSO_A_Train.jpg',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/config.json',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/depolarization_ratio.png',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/grey.jpg',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/lidar_backscatter.png']),
['C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/CALIPSO.jpg',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/calipso-aerosol_subtype.cmap',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/calipso-backscatter.cmap',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/calipso-depolar.cmap',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/calipso-horizontalaveraging.cmap',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/calipso-icewaterphase.cmap',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/calipso-vfm.cmap',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/CALIPSO_A_Train.jpg',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/config.json',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/depolarization_ratio.png',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/grey.jpg',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/dat/lidar_backscatter.png']),
('log',
['C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/log/trace.log']),
['C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/log/trace.log']),
('ico',
['C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/back.png',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/broadcasting.gif',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/broadcasting.ico',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/broadcasting.png',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/broadcasting.xbm',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/cog.png',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/cursorhand.png',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/cursorhighlight.png',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/edit.png',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/eraser.png',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/extract.png',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/focus.png',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/forward.png',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/freedraw.png',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/hide.png',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/home.png',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/load.png',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/magnify.png',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/paint.png',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/plotcursor.png',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/polygon.png',
'C:\Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/save.png'])
['C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/back.png',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/broadcasting.gif',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/broadcasting.ico',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/broadcasting.png',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/broadcasting.xbm',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/cog.png',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/cursorhand.png',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/cursorhighlight.png',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/edit.png',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/eraser.png',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/extract.png',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/focus.png',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/forward.png',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/freedraw.png',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/hide.png',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/home.png',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/load.png',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/magnify.png',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/paint.png',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/plotcursor.png',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/polygon.png',
'C:/Users/cpampalo/PycharmProjects/VOCAL/calipso/ico/save.png'])
]

DATA.extend(matplotlib.get_py2exe_datafiles())
Expand All @@ -50,7 +50,7 @@
windows=[{'script': 'Calipso.py'}],
options={
"py2exe":{
"dist_dir": "C:\Users/cpampalo/Desktop/build",
"dist_dir": "C:/Users/cpampalo/Desktop/build",
'excludes': [
'jinja2.asyncsupport',
'_gtkagg',
Expand Down