Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Revert "Re-organize the setup.py so that Astropy is not required for …

…egg_info"

This reverts commit 9aa5339.
  • Loading branch information...
commit fc89028e947f6babccdd3dffc1571b12fca75262 1 parent c91de52
@astrofrog astrofrog authored
Showing with 78 additions and 80 deletions.
  1. +78 −80 setup.py
View
158 setup.py
@@ -15,6 +15,11 @@
import __builtin__ as builtins
builtins._ASTROPY_SETUP_ = True
+import astropy
+from astropy.setup_helpers import (register_commands, adjust_compiler,
+ get_debug_option)
+from astropy.version_helpers import get_git_devstr, generate_version_py
+
# Set affiliated package-specific settings
PACKAGENAME = 'packagename'
DESCRIPTION = 'Astropy affiliated package'
@@ -30,87 +35,80 @@
# Indicates if this version is a release version
RELEASE = 'dev' not in VERSION
-metadata = dict(
- name=PACKAGENAME,
- package_data={},
- version=VERSION,
- description=DESCRIPTION,
- requires=['astropy'],
- install_requires=['astropy'],
- provides=[PACKAGENAME],
- author=AUTHOR,
- author_email=AUTHOR_EMAIL,
- license=LICENSE,
- url=URL,
- long_description=LONG_DESCRIPTION,
- zip_safe=False,
- use_2to3=True
-)
-
-# Treat everything in scripts except README.rst as a script to be installed
-metadata['scripts'] = [fname for fname in glob.glob(os.path.join('scripts', '*'))
- if os.path.basename(fname) != 'README.rst']
-
-# Add the project-global data
-metadata['package_data'][PACKAGENAME] = ['data/*']
-
-if len(sys.argv) >= 2 and sys.argv[1] == 'egg_info':
-
- # TODO: if we have a copy of get_git_devstr in the package template we can
- # set the proper version here.
-
- pass
-
-else:
-
- from astropy.setup_helpers import register_commands, adjust_compiler, get_debug_option
- from astropy.version_helpers import get_git_devstr, generate_version_py
-
- if not RELEASE:
- VERSION += get_git_devstr(False)
+if not RELEASE:
+ VERSION += get_git_devstr(False)
- # Populate the dict of setup command overrides; this should be done before
- # invoking any other functionality from distutils since it can potentially
- # modify distutils' behavior.
- metadata['cmdclass'] = register_commands(PACKAGENAME, VERSION, RELEASE)
+# Populate the dict of setup command overrides; this should be done before
+# invoking any other functionality from distutils since it can potentially
+# modify distutils' behavior.
+cmdclassd = register_commands(PACKAGENAME, VERSION, RELEASE)
- # Adjust the compiler in case the default on this platform is to use a
- # broken one.
- adjust_compiler(PACKAGENAME)
+# Adjust the compiler in case the default on this platform is to use a
+# broken one.
+adjust_compiler(PACKAGENAME)
- # Freeze build information in version.py
- generate_version_py(PACKAGENAME, VERSION, RELEASE, get_debug_option())
+# Freeze build information in version.py
+generate_version_py(PACKAGENAME, VERSION, RELEASE, get_debug_option())
- try:
-
- from astropy.setup_helpers import get_package_info
-
- # Get configuration information from all of the various subpackages.
- # See the docstring for setup_helpers.update_package_files for more
- # details.
- metadata.update(get_package_info(PACKAGENAME))
-
- except ImportError: # compatibility with Astropy 0.2 - can be removed in cases
- # where Astropy 0.2 is no longer supported
-
- from setuptools import find_packages
- from astropy.setup_helpers import filter_packages, update_package_files
-
- # Use the find_packages tool to locate all packages and modules
- metadata['packages'] = filter_packages(find_packages())
-
- # Additional C extensions that are not Cython-based should be added here.
- metadata['ext_modules'] = []
-
- # A dictionary to keep track of extra packagedir mappings
- metadata['package_dir'] = {}
-
- # Update extensions, package_data, packagenames and package_dirs from
- # any sub-packages that define their own extension modules and package
- # data. See the docstring for setup_helpers.update_package_files for
- # more details.
- update_package_files(PACKAGENAME, metadata['ext_modules'],
- metadata['package_data'], metadata['packages'],
- metadata['package_dir'])
-
-setup(**metadata)
+# Treat everything in scripts except README.rst as a script to be installed
+scripts = [fname for fname in glob.glob(os.path.join('scripts', '*'))
+ if os.path.basename(fname) != 'README.rst']
+
+
+try:
+
+ from astropy.setup_helpers import get_package_info
+
+ # Get configuration information from all of the various subpackages.
+ # See the docstring for setup_helpers.update_package_files for more
+ # details.
+ package_info = get_package_info(PACKAGENAME)
+
+ # Add the project-global data
+ package_info['package_data'][PACKAGENAME] = ['data/*']
+
+except ImportError: # compatibility with Astropy 0.2 - can be removed in cases
+ # where Astropy 0.2 is no longer supported
+
+ from setuptools import find_packages
+ from astropy.setup_helpers import filter_packages, update_package_files
+
+ package_info = {}
+
+ # Use the find_packages tool to locate all packages and modules
+ package_info['packages'] = filter_packages(find_packages())
+
+ # Additional C extensions that are not Cython-based should be added here.
+ package_info['ext_modules'] = []
+
+ # A dictionary to keep track of all package data to install
+ package_info['package_data'] = {PACKAGENAME: ['data/*']}
+
+ # A dictionary to keep track of extra packagedir mappings
+ package_info['package_dir'] = {}
+
+ # Update extensions, package_data, packagenames and package_dirs from
+ # any sub-packages that define their own extension modules and package
+ # data. See the docstring for setup_helpers.update_package_files for
+ # more details.
+ update_package_files(PACKAGENAME, package_info['ext_modules'],
+ package_info['package_data'], package_info['packages'],
+ package_info['package_dir'])
+
+setup(name=PACKAGENAME,
+ version=VERSION,
+ description=DESCRIPTION,
+ scripts=scripts,
+ requires=['astropy'],
+ install_requires=['astropy'],
+ provides=[PACKAGENAME],
+ author=AUTHOR,
+ author_email=AUTHOR_EMAIL,
+ license=LICENSE,
+ url=URL,
+ long_description=LONG_DESCRIPTION,
+ cmdclass=cmdclassd,
+ zip_safe=False,
+ use_2to3=True,
+ **package_info
+)
Please sign in to comment.
Something went wrong with that request. Please try again.