From 0e7084b80d6f1c6ceaf6ebe59b0a20d3f8a54643 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Tue, 29 Mar 2016 13:13:31 -0400
Subject: Implement RECON

---
 setup.py | 46 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 10 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 26bc0d2..9511de0 100755
--- a/setup.py
+++ b/setup.py
@@ -1,15 +1,41 @@
 #!/usr/bin/env python
+import recon.release
+from glob import glob
+from numpy import get_include as np_include
+from setuptools import setup, find_packages, Extension
 
-try:
-    from setuptools import setup
-except ImportError:
-    from distribute_setup import use_setuptools
-    use_setuptools()
-    from setuptools import setup
+
+version = recon.release.get_info()
+recon.release.write_template(version, 'lib/stwcs')
 
 setup(
-    setup_requires=['d2to1>=0.2.9', 'stsci.distutils>=0.3.2'],
-    d2to1=True,
-    use_2to3=False,
-    zip_safe=False
+    name = 'stwcs',
+    version = version.pep386,
+    author = 'Nadia Dencheva, Warren Hack',
+    author_email = 'help@stsci.edu',
+    description = 'Recomputes the WCS of an HST observation and puts all distortion',
+    url = 'https://github.com/spacetelescope/stwcs',
+    classifiers = [
+        'Intended Audience :: Science/Research',
+        'License :: OSI Approved :: BSD License',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+        'Topic :: Scientific/Engineering :: Astronomy',
+        'Topic :: Software Development :: Libraries :: Python Modules',
+    ],
+    install_requires = [
+        'astropy',
+        'nose',
+        'numpy',
+        'stsci.tools',
+    ],
+    package_dir = {
+        '': 'lib',
+    },
+    packages = find_packages('lib'),
+    package_data = {
+        'stwcs/gui': ['*.help'],
+        'stwcs/gui/pars': ['*'],
+        'stwcs/gui/htmlhelp': ['*'],
+    },
 )
-- 
cgit 


From 6ec4d4b6c695bf8b259da24ea7d61166a5a7f143 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Thu, 31 Mar 2016 16:37:17 -0400
Subject: Implement RELIC

---
 setup.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 9511de0..349a86c 100755
--- a/setup.py
+++ b/setup.py
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
-import recon.release
+import relic.release
 from glob import glob
 from numpy import get_include as np_include
 from setuptools import setup, find_packages, Extension
 
 
-version = recon.release.get_info()
-recon.release.write_template(version, 'lib/stwcs')
+version = relic.release.get_info()
+relic.release.write_template(version, 'lib/stwcs')
 
 setup(
     name = 'stwcs',
-- 
cgit 


From cafca759dab73ffb48df0698eb35345944ee123f Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Thu, 14 Apr 2016 14:55:17 -0400
Subject: Implement RELIC bootstrap

---
 setup.py | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 349a86c..db38d0b 100755
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,29 @@
 #!/usr/bin/env python
-import relic.release
+import os
+import subprocess
+import sys
 from glob import glob
 from numpy import get_include as np_include
 from setuptools import setup, find_packages, Extension
 
 
+if os.path.exists('relic'):
+    sys.path.insert(1, 'relic')
+    import relic.release
+else:
+    try:
+        import relic.release
+    except ImportError:
+        try:
+            subprocess.check_call(['git', 'clone',
+                'https://github.com/jhunkeler/relic.git'])
+            sys.path.insert(1, 'relic')
+            import relic.release
+        except subprocess.CalledProcessError as e:
+            print(e)
+            exit(1)
+
+
 version = relic.release.get_info()
 relic.release.write_template(version, 'lib/stwcs')
 
-- 
cgit 


From aa719ca93f860a86d4b17bc211929b0770092c1a Mon Sep 17 00:00:00 2001
From: Nadia Dencheva <nadia.dencheva@gmail.com>
Date: Sun, 31 Jul 2016 17:22:54 -0400
Subject: setuptools conversion from jhunkeler

---
 setup.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index db38d0b..ef81207 100755
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ setup(
     version = version.pep386,
     author = 'Nadia Dencheva, Warren Hack',
     author_email = 'help@stsci.edu',
-    description = 'Recomputes the WCS of an HST observation and puts all distortion',
+    description = 'Recomputes and records the WCS of an HST observation (includeing distortion) in the file.',
     url = 'https://github.com/spacetelescope/stwcs',
     classifiers = [
         'Intended Audience :: Science/Research',
@@ -44,7 +44,6 @@ setup(
     ],
     install_requires = [
         'astropy',
-        'nose',
         'numpy',
         'stsci.tools',
     ],
-- 
cgit