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

Removed bokeh dependency #133

Open
wants to merge 6 commits 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ docs/source/.idea
docs/source/analytics
docs/build/
/calipso/dat/config.json
venv
3 changes: 1 addition & 2 deletions calipso/Calipso.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions calipso/settingsdialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(
Expand Down
10 changes: 3 additions & 7 deletions docs/source/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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]_
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
matplotlib == 2.0.0