From 8f0310bfa7d2fd14322d2fd11aebe2e317f196c5 Mon Sep 17 00:00:00 2001 From: dencheva Date: Mon, 22 Dec 2008 13:57:38 +0000 Subject: Changed setup to be consistent with current pytools git-svn-id: http://svn.stsci.edu/svn/ssb/stsci_python/development/trunk/hstwcs@7405 fe389314-cf27-0410-b35b-8c050e845b92 --- defsetup.py | 16 ++++++++++++++++ setup.py | 25 +++---------------------- 2 files changed, 19 insertions(+), 22 deletions(-) create mode 100644 defsetup.py diff --git a/defsetup.py b/defsetup.py new file mode 100644 index 0000000..0c4de95 --- /dev/null +++ b/defsetup.py @@ -0,0 +1,16 @@ +import sys + +pkg = ["hstwcs", 'hstwcs.updatewcs', 'hstwcs.wcsutil', 'hstwcs.distortion'] + +setupargs = { + 'version' : "0.1", + 'description' : "Recomputes the WCS of an HST observation and puts all istortion corrections in the headers.", + 'package_dir': {'hstwcs':'lib', 'hstwcs.updatewcs': 'updatewcs', + 'hstwcs.wcsutil': 'wcsutil', 'hstwcs.distortion': 'distortion'}, + + 'author' : "Nadia Dencheva, Warren Hack", + 'author_email' : "help@stsci.edu", + 'license' : "http://www.stsci.edu/resources/software_hardware/pyraf/LICENSE", + 'platforms' : ["Linux","Solaris","Mac OS X", "Windows"], +} + diff --git a/setup.py b/setup.py index cc150f1..5084c81 100644 --- a/setup.py +++ b/setup.py @@ -1,23 +1,4 @@ -from distutils.core import setup -from os.path import join -# PyFITS -try: - import pyfits -except ImportError: - print "WARNING: PyFITS must be installed to use hstwcs." - print " Since this is not a build-time dependency, the build will proceed." +#!/usr/bin/env python -# PyWCS -try: - import pywcs -except ImportError: - print "WARNING: PyWCS must be installed to use hstwcs." - print " Since this is not a build-time dependency, the build will proceed." - -setup(name="hstwcs", - version="0.1", - description="HST WCS Corrections", - packages=['hstwcs', 'hstwcs/updatewcs', 'hstwcs/wcsutil', 'hstwcs/distortion'], - package_dir={'hstwcs':'lib', 'hstwcs/updatewcs': 'updatewcs', - 'hstwcs/wcsutil': 'wcsutil', 'hstwcs/distortion': 'distortion'} - ) +import pytools.stsci_distutils_hack +pytools.stsci_distutils_hack.run(pytools_version = "3.0") -- cgit