Merge 2102010 into f0351f4

astropy · Jun 2, 2014 · 9c72670 · 9c72670
2 parents f0351f4 + 2102010
commit 9c72670
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/ccdproc/__init__.py b/ccdproc/__init__.py
@@ -27,7 +27,7 @@
     __githash__ = ''
 
 # set up namespace
-from .ccdproc import *
+from .core import *
 from .ccddata import *
 from .combiner import *
 

diff --git a/ccdproc/ccddata.py b/ccdproc/ccddata.py
@@ -162,7 +162,7 @@ def to_hdu(self):
            hdulist : astropy.io.fits.HDUList object
 
         """
-        from .ccdproc import _short_names
+        from .core import _short_names
 
         header = fits.Header()
         for k, v in self.header.items():

diff --git a/ccdproc/ccdproc.py → ccdproc/core.py b/ccdproc/ccdproc.py → ccdproc/core.py
diff --git a/ccdproc/log_meta.py b/ccdproc/log_meta.py
@@ -10,7 +10,7 @@
 from astropy.nddata import NDData
 from astropy import units as u
 
-import ccdproc.ccdproc  # really only need Keyword from ccdproc
+import ccdproc  # really only need Keyword from ccdproc
 
 __all__ = []
 
@@ -92,7 +92,7 @@ def _insert_in_metadata(metadata, arg):
     if isinstance(arg, six.string_types):
         # add the key, no value
         metadata[arg] = None
-    elif isinstance(arg, ccdproc.ccdproc.Keyword):
+    elif isinstance(arg, ccdproc.Keyword):
         metadata[arg.name] = arg.value
     else:
         try:

diff --git a/ccdproc/tests/test_ccddata.py b/ccdproc/tests/test_ccddata.py
@@ -147,7 +147,7 @@ def test_to_hdu_long_metadata_item(ccd_data):
     # auto-logging, and we are supposed to handle that.
 
     # So, a nice long command:
-    from ..ccdproc import subtract_dark, _short_names
+    from ..core import subtract_dark, _short_names
 
     dark = CCDData(np.zeros_like(ccd_data.data), unit="adu")
     result = subtract_dark(ccd_data, dark, dark_exposure=30 * u.second,

diff --git a/ccdproc/tests/test_ccdproc.py b/ccdproc/tests/test_ccdproc.py
@@ -13,7 +13,7 @@
 from astropy.tests.helper import pytest
 
 from ..ccddata import CCDData, electron, adu
-from ..ccdproc import *
+from ..core import *
 
 
 # test creating variance

diff --git a/ccdproc/tests/test_ccdproc_logging.py b/ccdproc/tests/test_ccdproc_logging.py
@@ -6,8 +6,8 @@
 from astropy.tests.helper import pytest
 import astropy.units as u
 
-from ..ccdproc import subtract_bias, create_variance, Keyword
-from ..ccddata import CCDData
+from .. import subtract_bias, create_variance, Keyword, CCDData
+#from ..ccddata import CCDData
 
 @pytest.mark.parametrize('key', [
                          'short',

diff --git a/ccdproc/tests/test_cosmicray.py b/ccdproc/tests/test_cosmicray.py
@@ -8,7 +8,7 @@
 from astropy.tests.helper import pytest
 from astropy.utils import NumpyRNGContext
 
-from ..ccdproc import *
+from ..core import *
 
 import os
 

diff --git a/ccdproc/tests/test_gain.py b/ccdproc/tests/test_gain.py
@@ -12,7 +12,7 @@
 import astropy.units as u
 
 from ..ccddata import electron
-from ..ccdproc import *
+from ..core import *
 
 
 # tests for gain

diff --git a/ccdproc/tests/test_keyword.py b/ccdproc/tests/test_keyword.py
@@ -4,7 +4,7 @@
 from astropy.units import Quantity
 from astropy.io import fits
 
-from ..ccdproc import Keyword
+from ..core import Keyword
 
 
 def test_keyword_init():