Permalink
Browse files

Made polar2grid.core and polar2grid.viirs zip_safe

Changed polar2grid_env.sh so it adds the new python directory to the
PYTHONPATH
fixes #12
  • Loading branch information...
1 parent 80d6b8c commit 83fdc1f6a24d17e5ef67513eb38a7b5dc3e24140 @davidh-ssec committed Jul 30, 2012
Showing with 13 additions and 19 deletions.
  1. +1 −1 py/polar2grid_core/setup.py
  2. +2 −2 py/polar2grid_viirs/setup.py
  3. +10 −16 swbundle/polar2grid_env.sh
@@ -16,7 +16,7 @@
packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
namespace_packages=["polar2grid"],
include_package_data=True,
- zip_safe=False,
+ zip_safe=True,
install_requires=['numpy'],
dependency_links = ['http://larch.ssec.wisc.edu/cgi-bin/repos.cgi'],
entry_points = {'console_scripts' : [ ]}
@@ -16,8 +16,8 @@
packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
namespace_packages=["polar2grid"],
include_package_data=True,
- zip_safe=False,
- install_requires=['numpy', 'matplotlib', 'h5py'],
+ zip_safe=True,
+ install_requires=['numpy', 'matplotlib', 'h5py', 'polar2grid.core'],
dependency_links = ['http://larch.ssec.wisc.edu/cgi-bin/repos.cgi'],
entry_points = {'console_scripts' : [ ]}
)
View
@@ -7,29 +7,23 @@ if [ -z "$POLAR2GRID_REV" ]; then
export POLAR2GRID_HOME="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
fi
- EGG_LOC=$POLAR2GRID_HOME/polar2grid
- PKG_BASE=$EGG_LOC/polar2grid
-
- if [ ! -d $PKG_BASE ]; then
- echo "polar2grid software bundle install corrupt. Could not find polar2grid python package"
- exit 1
- fi
+ EGG_LOC=$POLAR2GRID_HOME/python
export PATH=$POLAR2GRID_HOME/bin:$PATH
export PYTHONPATH=$EGG_LOC:$PYTHONPATH
# Script config file locations
- if [ -z "$VIIRS_GRIDS_CONFIG" ]; then
- export VIIRS_GRIDS_CONFIG=$PKG_BASE/awips/awips_grids.conf
- fi
+ #if [ -z "$VIIRS_GRIDS_CONFIG" ]; then
+ # export VIIRS_GRIDS_CONFIG=$PKG_BASE/awips/awips_grids.conf
+ #fi
- if [ -z "$VIIRS_ANCIL_DIR" ]; then
- export VIIRS_ANCIL_DIR=$PKG_BASE/grids/
- fi
+ #if [ -z "$VIIRS_ANCIL_DIR" ]; then
+ # export VIIRS_ANCIL_DIR=$PKG_BASE/grids/
+ #fi
- if [ -z "$VIIRS_SHAPE_CONFIG" ]; then
- export VIIRS_SHAPE_CONFIG=$PKG_BASE/awips/awips_shapes.conf
- fi
+ #if [ -z "$VIIRS_SHAPE_CONFIG" ]; then
+ # export VIIRS_SHAPE_CONFIG=$PKG_BASE/awips/awips_shapes.conf
+ #fi
export POLAR2GRID_REV="$Id$"
fi

0 comments on commit 83fdc1f

Please sign in to comment.