diff options
| -rw-r--r-- | defsetup.py | 18 | ||||
| -rw-r--r-- | new_setup.cfg (renamed from setup.cfg) | 4 | ||||
| -rwxr-xr-x | new_setup.py | 35 | ||||
| -rw-r--r--[-rwxr-xr-x] | setup.py | 36 |
4 files changed, 58 insertions, 35 deletions
diff --git a/defsetup.py b/defsetup.py new file mode 100644 index 0000000..9ea8cea --- /dev/null +++ b/defsetup.py @@ -0,0 +1,18 @@ +from __future__ import division # confidence high + +import sys + +pkg = ["stwcs", 'stwcs.updatewcs', 'stwcs.wcsutil', 'stwcs.distortion'] + +setupargs = { + 'version' : "0.8", + 'description' : "Recomputes the WCS of an HST observation and puts all istortion corrections in the headers.", + 'package_dir': {'stwcs':'lib/stwcs', 'stwcs.updatewcs': 'lib/stwcs/updatewcs', + 'stwcs.wcsutil': 'lib/stwcs/wcsutil', 'stwcs.distortion': 'lib/stwcs/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.cfg b/new_setup.cfg index e179423..9e70d66 100644 --- a/setup.cfg +++ b/new_setup.cfg @@ -34,8 +34,8 @@ pre-hook.svn-info = stsci.distutils.hooks.svn_info_pre_hook post-hook.svn-info = stsci.distutils.hooks.svn_info_post_hook [build_py] -pre-hook.svn-info = stsci.distutils.hooks.svn_info_pre_hook -post-hook.svn-info = stsci.distutils.hooks.svn_info_post_hook +#pre-hook.svn-info = stsci.distutils.hooks.svn_info_pre_hook +#post-hook.svn-info = stsci.distutils.hooks.svn_info_post_hook [easy_install] find-links = .. diff --git a/new_setup.py b/new_setup.py new file mode 100755 index 0000000..30dc9b6 --- /dev/null +++ b/new_setup.py @@ -0,0 +1,35 @@ +#!/usr/bin/env python + +try: + from setuptools import setup +except ImportError: + from distribute_setup import use_setuptools + use_setuptools() + from setuptools import setup + +try: + from stsci.distutils.command.easier_install import easier_install +except ImportError: + import os + import sys + stsci_distutils = os.path.abspath(os.path.join('..', 'distutils', 'lib')) + if os.path.exists(stsci_distutils) and stsci_distutils not in sys.path: + sys.path.append(stsci_distutils) + try: + from stsci.distutils.command.easier_install import easier_install + import setuptools.command.easy_install + except ImportError: + # If even this failed, we're not in an stsci_python source checkout, + # so there's nothing gained from using easier_install + from setuptools.command.easy_install import easy_install + easier_install = easy_install +# This is required so that easier_install can be used for setup_requires +import setuptools +setuptools.command.easy_install.easy_install = easier_install + +setup( + setup_requires=['d2to1>=0.2.5', 'stsci.distutils==0.2'], + d2to1=True, + use_2to3=True, + zip_safe=False +) @@ -1,35 +1,5 @@ #!/usr/bin/env python +from __future__ import division # confidence high -try: - from setuptools import setup -except ImportError: - from distribute_setup import use_setuptools - use_setuptools() - from setuptools import setup - -try: - from stsci.distutils.command.easier_install import easier_install -except ImportError: - import os - import sys - stsci_distutils = os.path.abspath(os.path.join('..', 'distutils', 'lib')) - if os.path.exists(stsci_distutils) and stsci_distutils not in sys.path: - sys.path.append(stsci_distutils) - try: - from stsci.distutils.command.easier_install import easier_install - import setuptools.command.easy_install - except ImportError: - # If even this failed, we're not in an stsci_python source checkout, - # so there's nothing gained from using easier_install - from setuptools.command.easy_install import easy_install - easier_install = easy_install -# This is required so that easier_install can be used for setup_requires -import setuptools -setuptools.command.easy_install.easy_install = easier_install - -setup( - setup_requires=['d2to1>=0.2.5', 'stsci.distutils==0.2'], - d2to1=True, - use_2to3=True, - zip_safe=False -) +import stsci.tools.stsci_distutils_hack as H +H.run() |