Switch over astropy's setup.py to using the astropy_helpers submodule. Had to change all the various 'setup_package' modules to also astropy_helpers. Seems to work in basic cases.

Updating pointer to astropy_helpers

Author: embray

astropy/io/fits/setup_package.py

@@ -5,7 +5,7 @@
 from distutils.core import Extension
 from glob import glob
 
-from astropy import setup_helpers
+from astropy_helpers import setup_helpers
 
 
 def get_extensions():

astropy/io/votable/setup_package.py

@@ -2,7 +2,7 @@
 from distutils.core import Extension
 from os.path import join
 
-from astropy import setup_helpers
+from astropy_helpers import setup_helpers
 
 
 def get_extensions(build_type='release'):

astropy/time/setup_package.py

@@ -3,7 +3,7 @@
 import os
 from distutils.extension import Extension
 
-from astropy import setup_helpers
+from astropy_helpers import setup_helpers
 
 TIMEROOT = os.path.relpath(os.path.dirname(__file__))
 

astropy/utils/xml/setup_package.py

@@ -3,7 +3,7 @@
 from os.path import join
 import sys
 
-from astropy import setup_helpers
+from astropy_helpers import setup_helpers
 
 
 def get_external_libraries():

astropy/wcs/setup_package.py

@@ -1,5 +1,6 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
-from __future__ import absolute_import, division, print_function, unicode_literals
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
 
 CONTACT = "Michael Droettboom"
 EMAIL = "[email protected]"
@@ -11,7 +12,7 @@
 import shutil
 import sys
 
-from astropy import setup_helpers
+from astropy_helpers import setup_helpers
 from astropy.extern import six
 
 WCSROOT = os.path.relpath(os.path.dirname(__file__))

astropy_helpers

@@ -8,6 +8,12 @@
 import setuptools_bootstrap
 from setuptools import setup
 
+# TODO: Any code related to getting astropy_helpers on sys.path will be moved
+# into an astropy_helpers bootstrap script that will also handle the details of
+# *where* to get astropy_helpers: Via submodule sync in source repository
+# clones, or via setuptools setup_requires
+sys.path.insert(1, 'astropy_helpers')
+
 #A dirty hack to get around some early import/configurations ambiguities
 if sys.version_info[0] >= 3:
     import builtins
@@ -18,10 +24,11 @@
 from distutils.dist import Distribution
 
 import astropy
-from astropy.setup_helpers import (register_commands, adjust_compiler,
-                                   get_package_info, get_debug_option,
-                                   is_distutils_display_option)
-from astropy.version_helpers import get_git_devstr, generate_version_py
+from astropy_helpers.setup_helpers import (
+    register_commands, adjust_compiler, get_package_info, get_debug_option,
+    is_distutils_display_option)
+from astropy_helpers.git_helpers import get_git_devstr
+from astropy_helpers.version_helpers import generate_version_py
 
 NAME = 'astropy'
 
@@ -46,7 +53,7 @@
 adjust_compiler(NAME)
 
 # Freeze build information in version.py
-generate_version_py(NAME, VERSION, RELEASE, get_debug_option())
+generate_version_py(NAME, VERSION, RELEASE, get_debug_option(NAME))
 
 # Treat everything in scripts except README.rst as a script to be installed
 scripts = [fname for fname in glob.glob(os.path.join('scripts', '*'))