Skip to content

Commit

Permalink
checks for installed modules implemented; docs moved to readthedocs.i…
Browse files Browse the repository at this point in the history
…o; .gitignore updated
  • Loading branch information
Michael Mommert committed Mar 3, 2017
1 parent f688011 commit 7704cd7
Show file tree
Hide file tree
Showing 70 changed files with 88 additions and 19,101 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

# other stuff
# supplemental files not to track
*~
*/#*
dump/
#*#

# stuff we don't want to track
setup/mytelescopes.py
doc/_build/

### Python ###
## Byte-compiled / optimized / DLL files
Expand Down
16 changes: 12 additions & 4 deletions _pp_conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,18 @@
import sys
import logging
import warnings
from astropy import wcs
from astropy.io import fits
import numpy as np

try:
from astropy import wcs
from astropy.io import fits
except ImportError:
print('Module astropy not found. Please install with: pip install astropy')
sys.exit()
try:
import numpy as np
except ImportError:
print('Module numpy not found. Please install with: pip install numpy')
sys.exit()

# import pipeline-specific modules
from toolbox import *

Expand Down
13 changes: 11 additions & 2 deletions catalog.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,19 @@
#import urllib.request, urllib.error, urllib.parse
import time
import sqlite3 as sql
from scipy import spatial
try:
from scipy import spatial
except ImportError:
print('Module scipy not found. Please install with: pip install scipy')
sys.exit()
from astropy.io import fits
import scipy.optimize as optimization
from astroquery.vizier import Vizier
try:
from astroquery.vizier import Vizier
except ImportError:
print('Module astroquery not found. Please install with: pip install '
'astroquery')
sys.exit()
import astropy.units as u
import astropy.coordinates as coord
from astropy.table import Table, Column
Expand Down
24 changes: 17 additions & 7 deletions diagnostics.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,25 @@
from astropy.io import fits
from astropy import wcs
import datetime
import matplotlib
matplotlib.use('Agg')
import matplotlib.pylab as plt
try:
import matplotlib
matplotlib.use('Agg')
import matplotlib.pylab as plt
except ImportError:
print('Module matplotlib not found. Please install with: pip install '
'matplotlib')
sys.exit()
import subprocess
#from PIL import Image
from scipy.misc import toimage # requires Pillow
from scipy.misc import imresize # requires Pillow
from scipy.misc import bytescale

try:
from scipy.misc import toimage # requires Pillow
from scipy.misc import imresize # requires Pillow
from scipy.misc import bytescale
except ImportError:
print('Modules scipy or pillow not found. Please install with: pip '
'install scipy pillow')
sys.exit()

# only import if Python3 is used
if sys.version_info > (3,0):
from builtins import str
Expand Down
Binary file removed doc/_build/doctrees/changelog.doctree
Binary file not shown.
Binary file removed doc/_build/doctrees/diagnostics.doctree
Binary file not shown.
Binary file removed doc/_build/doctrees/environment.pickle
Binary file not shown.
Binary file removed doc/_build/doctrees/functions.doctree
Binary file not shown.
Binary file removed doc/_build/doctrees/index.doctree
Binary file not shown.
Binary file removed doc/_build/doctrees/install.doctree
Binary file not shown.
Binary file removed doc/_build/doctrees/problems.doctree
Binary file not shown.
Binary file removed doc/_build/doctrees/quickstart.doctree
Binary file not shown.
Binary file removed doc/_build/doctrees/supported.doctree
Binary file not shown.
4 changes: 0 additions & 4 deletions doc/_build/html/.buildinfo

This file was deleted.

Binary file removed doc/_build/html/_images/aperture_size.png
Binary file not shown.
Binary file removed doc/_build/html/_images/phot_calibration.png
Binary file not shown.
Binary file removed doc/_build/html/_images/phot_calibration_single.png
Binary file not shown.
Binary file removed doc/_build/html/_images/phot_results.png
Binary file not shown.
20 changes: 0 additions & 20 deletions doc/_build/html/_sources/changelog.txt

This file was deleted.

232 changes: 0 additions & 232 deletions doc/_build/html/_sources/diagnostics.txt

This file was deleted.

0 comments on commit 7704cd7

Please sign in to comment.