diff --git a/.gitignore b/.gitignore index c2cd8a3..0166e0f 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ docs/source/.idea docs/source/analytics docs/build/ /calipso/dat/config.json +venv \ No newline at end of file diff --git a/calipso/Calipso.py b/calipso/Calipso.py index a422358..5c8ae45 100644 --- a/calipso/Calipso.py +++ b/calipso/Calipso.py @@ -30,7 +30,6 @@ from os.path import dirname from attributesdialog import AttributesDialog -from bokeh.colors import white from constants import Plot, PATH, ICO, CONF import constants from extractdialog import ExtractDialog @@ -242,7 +241,7 @@ def setup_main_screen(self): # Create label , entry box and browse button label_file = Label(self.__dialog_frame, text="File:") self.__label_file_dialog = Label(self.__dialog_frame, width=50, justify=LEFT, - bg=white, relief=SUNKEN) + bg='white', relief=SUNKEN) browse_button = Button(self.__dialog_frame, text='Browse', width=10, command=self.import_file) label_file.grid(row=1, column=0) diff --git a/calipso/settingsdialog.py b/calipso/settingsdialog.py index e2374b9..f9459cc 100644 --- a/calipso/settingsdialog.py +++ b/calipso/settingsdialog.py @@ -10,7 +10,6 @@ from Tkinter import Toplevel, Entry, Button, BOTH, Frame, SUNKEN, Label, LEFT, BOTTOM, TOP, X, \ Checkbutton, StringVar, BooleanVar, W, Grid, NORMAL -from bokeh.colors import white from Tkconstants import END from constants import CONF from log.log import logger @@ -91,7 +90,7 @@ def create_top_frame(self): # Create a readonly entry to display the string of the directory path self.__settings_entries.append(Entry(self.__top_frame, state='readonly', width=30, justify=LEFT, textvariable=var_text, - readonlybackground=white, relief=SUNKEN)) + readonlybackground='white', relief=SUNKEN)) # Create a browse button to change the path dialog_box = self.__settings_entries[-1] self.__browse_buttons.append( diff --git a/docs/source/installation.rst b/docs/source/installation.rst index d5f6f48..436eebd 100644 --- a/docs/source/installation.rst +++ b/docs/source/installation.rst @@ -70,7 +70,7 @@ Linux [#f3]_ .. warning:: At this time, Linux and OS X have not been tested with the current version of VOCAL. Installation - may not work + may not work. 1. start off by grabbing the SciPy Stack @@ -84,7 +84,7 @@ Linux [#f3]_ * CCPLOT has quite a bit of dependencies, so run - * ``sudo apt-get install --no-intall-recommends cython libhdf4-dev libhdfeos-dev python-imaging ttf-bitstream-vera`` + * ``sudo apt-get install --no-install-recommends cython libhdf4-dev libhdfeos-dev python-imaging ttf-bitstream-vera`` * now CCPLOT needs to be built on Linux, so grab the `source`_ * extract the source anywhere you'd like, the directory does not matter @@ -101,11 +101,7 @@ Linux [#f3]_ * run ``python setup.py install`` , ``sudo`` may be required as well * CCPLOT should be installed -4. install bokeh.color - - * ``sudo pip install bokeh`` - -5. run the application with ``python CALIPSO_Visualization_Tool.py`` +4. run the application with ``python Calipso.py`` *********** OS X [#f4]_ diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..438acaf --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +matplotlib == 2.0.0 \ No newline at end of file