Merge pull request #42 from weaverba137/harris-geospatial

Update owner of IDL
weaverba137 · May 24, 2018 · d7f5261 · d7f5261
2 parents 849aced + a14e812
commit d7f5261
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 9 deletions.
diff --git a/README.rst b/README.rst
@@ -78,10 +78,10 @@ the ``licenses/LICENSE.rst`` file.
 Legal
 -----
 
-* IDL is a registered trademark of `Exelis Visual Information Solutions`_.
+* IDL is a registered trademark of `Harris Geospatial Solutions`_.
 
 .. _Python: http://python.org
-.. _`IDL®`: http://www.exelisvis.com/language/en-us/productsservices/idl.aspx
+.. _`IDL®`: http://www.harrisgeospatial.com/SoftwareTechnology/IDL.aspx
 .. _idlutils: http://www.sdss.org/dr12/software/idlutils/
 .. _SDSS: http://www.sdss.org
 .. _`Goddard utilities`: http://idlastro.gsfc.nasa.gov/
@@ -95,4 +95,4 @@ Legal
 .. _SDSS-III: http://www.sdss3.org
 .. _`svn repository`: http://www.sdss.org/dr12/software/products/
 .. _GitHub: http://github.com
-.. _`Exelis Visual Information Solutions`: http://www.exelisvis.com
+.. _`Harris Geospatial Solutions`: http://www.harrisgeospatial.com/
diff --git a/docs/pydl/changes.rst b/docs/pydl/changes.rst
@@ -2,6 +2,12 @@
 PyDL Changelog
 ==============
 
+1.0.0 (unreleased)
+------------------
+
+*This version will only support Python 3 and Astropy 3.*  This release is
+planned for the Summer or Fall of 2018.
+
 0.7.0 (unreleased)
 ------------------
 
@@ -12,7 +18,9 @@ PyDL Changelog
 * Update to `astropy_helpers`_/v2.0.6 (PR `#40`_).
 * Add :mod:`astropy.units` support to :func:`~pydl.goddard.astro.airtovac`
   and :func:`~pydl.goddard.astro.vactoair` (PR `#41`_).
+* Change Exelis to Harris Geospatial (PR `#42`_).
 
+.. _`#42`: https://github.com/weaverba137/pydl/pull/42
 .. _`#41`: https://github.com/weaverba137/pydl/pull/41
 .. _`#40`: https://github.com/weaverba137/pydl/pull/40
 .. _`#37`: https://github.com/weaverba137/pydl/issues/37.

diff --git a/pydl/__init__.py b/pydl/__init__.py
@@ -10,7 +10,7 @@
 the astronomical library functions.  Only the bare minimum of IDL_ built-in
 functions are implemented to support this.
 
-.. _IDL: http://www.exelisvis.com/language/en-us/productsservices/idl.aspx
+.. _IDL: http://www.harrisgeospatial.com/SoftwareTechnology/IDL.aspx
 """
 
 # Packages may add whatever they like to this file, but

diff --git a/pydl/file_lines.py b/pydl/file_lines.py
@@ -28,7 +28,7 @@ def file_lines(path, compress=False):
 
     References
     ----------
-    http://www.exelisvis.com/docs/FILE_LINES.html
+    http://www.harrisgeospatial.com/docs/file_lines.html
 
     Examples
     --------

diff --git a/pydl/pcomp.py b/pydl/pcomp.py
@@ -26,7 +26,7 @@ class pcomp(object):
 
     References
     ----------
-    http://www.exelisvis.com/docs/PCOMP.html
+    http://www.harrisgeospatial.com/docs/pcomp.html
 
     Examples
     --------

diff --git a/pydl/rebin.py b/pydl/rebin.py
@@ -38,7 +38,7 @@ def rebin(x, d, sample=False):
 
     References
     ----------
-    http://www.exelisvis.com/docs/REBIN.html
+    http://www.harrisgeospatial.com/docs/rebin.html
 
     Examples
     --------

diff --git a/pydl/smooth.py b/pydl/smooth.py
@@ -26,7 +26,7 @@ def smooth(signal, owidth, edge_truncate=False):
 
     References
     ----------
-    http://www.exelisvis.com/docs/SMOOTH.html
+    http://www.harrisgeospatial.com/docs/smooth.html
 
     Examples
     --------

diff --git a/pydl/uniq.py b/pydl/uniq.py
@@ -31,7 +31,7 @@ def uniq(x, index=None):
 
     References
     ----------
-    http://www.exelisvis.com/docs/UNIQ.html
+    http://www.harrisgeospatial.com/docs/uniq.html
 
     Examples
     --------