Remove d2to1 and stsci.distutils

82 files changed, 7 insertions, 155 deletions

diff --git a/acstools/bld.bat b/acstools/bld.bat
index d1ddf28..726b367 100644
--- a/acstools/bld.bat
+++ b/acstools/bld.bat
@@ -1,6 +1,4 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1
 if errorlevel 1 exit 1
 
 python setup.py install || exit 1
diff --git a/acstools/build.sh b/acstools/build.sh
index 5e8b365..4b71885 100644
--- a/acstools/build.sh
+++ b/acstools/build.sh
@@ -1,4 +1,2 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1 || exit 1
 python setup.py install || exit 1
\ No newline at end of file
diff --git a/acstools/meta.yaml b/acstools/meta.yaml
index 3664fb4..cf21c9a 100644
--- a/acstools/meta.yaml
+++ b/acstools/meta.yaml
@@ -9,8 +9,6 @@ package:
     version: 2.0.0
 requirements:
     build:
-    - d2to1
-    - stsci.distutils
     - python x.x
     - astropy >=1.1
     - numpy x.x
diff --git a/astrolib.coords/bld.bat b/astrolib.coords/bld.bat
index fe97c61..5d42b68 100644
--- a/astrolib.coords/bld.bat
+++ b/astrolib.coords/bld.bat
@@ -1,5 +1,4 @@
 
 
-pip install --no-deps --upgrade --force d2to1 || exit 1
 python setup.py install
 if errorlevel 1 exit 1
\ No newline at end of file
diff --git a/astrolib.coords/build.sh b/astrolib.coords/build.sh
index 5d1e7ae..c5199fc 100644
--- a/astrolib.coords/build.sh
+++ b/astrolib.coords/build.sh
@@ -1,4 +1,3 @@
 
-pip install --no-deps --upgrade --force d2to1 || exit 1
 test -f README.md && ln -s README.md README.txt
 python setup.py install || exit 1
\ No newline at end of file
diff --git a/astrolib.coords/meta.yaml b/astrolib.coords/meta.yaml
index 9c8a9d0..cfbe886 100644
--- a/astrolib.coords/meta.yaml
+++ b/astrolib.coords/meta.yaml
@@ -9,8 +9,6 @@ package:
     version: 0.39.6
 requirements:
     build:
-    - d2to1
-    - stsci.distutils
     - setuptools
     - numpy x.x
     - python x.x
diff --git a/calcos/build.sh b/calcos/build.sh
index 52582b9..535529d 100644
--- a/calcos/build.sh
+++ b/calcos/build.sh
@@ -1,4 +1,2 @@
 
-pip install --no-deps --upgrade --force d2to1
-sed -i -e 's|pyfits.*|astropy (>=0.3.1)|' setup.cfg
-python setup.py install || exit 1
\ No newline at end of file
+python setup.py install || exit 1
diff --git a/calcos/meta.yaml b/calcos/meta.yaml
index 7914c87..fb66411 100644
--- a/calcos/meta.yaml
+++ b/calcos/meta.yaml
@@ -8,11 +8,9 @@ package:
     version: 3.1.3
 requirements:
     build:
-    - d2to1
     - numpy x.x
     - astropy >=1.1
     - scipy
-    - stsci.distutils
     - stsci.tools
     - setuptools
     - python x.x
diff --git a/costools/bld.bat b/costools/bld.bat
index d1ddf28..726b367 100644
--- a/costools/bld.bat
+++ b/costools/bld.bat
@@ -1,6 +1,4 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1
 if errorlevel 1 exit 1
 
 python setup.py install || exit 1
diff --git a/costools/build.sh b/costools/build.sh
index 5e8b365..4b71885 100644
--- a/costools/build.sh
+++ b/costools/build.sh
@@ -1,4 +1,2 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1 || exit 1
 python setup.py install || exit 1
\ No newline at end of file
diff --git a/costools/meta.yaml b/costools/meta.yaml
index a8504f7..f26457d 100644
--- a/costools/meta.yaml
+++ b/costools/meta.yaml
@@ -9,8 +9,6 @@ package:
     version: 1.2.1
 requirements:
     build:
-    - d2to1
-    - stsci.distutils
     - astropy >=1.1
     - calcos
     - stsci.tools
diff --git a/crds/build.sh b/crds/build.sh
index b623a78..10954df 100644
--- a/crds/build.sh
+++ b/crds/build.sh
@@ -1,4 +1,3 @@
 
 
-pip install --no-deps --upgrade --force d2to1 || exit 1
 python setup.py install || exit 1
\ No newline at end of file
diff --git a/crds/meta.yaml b/crds/meta.yaml
index 12e7ae4..bf7f408 100644
--- a/crds/meta.yaml
+++ b/crds/meta.yaml
@@ -10,7 +10,6 @@ package:
     version: '{{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}'
 requirements:
     build:
-    - d2to1
     - astropy >=1.1
     - numpy x.x
     - setuptools
diff --git a/drizzlepac/bld.bat b/drizzlepac/bld.bat
index d1ddf28..726b367 100644
--- a/drizzlepac/bld.bat
+++ b/drizzlepac/bld.bat
@@ -1,6 +1,4 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1
 if errorlevel 1 exit 1
 
 python setup.py install || exit 1
diff --git a/drizzlepac/build.sh b/drizzlepac/build.sh
index 76f1510..63d76ee 100644
--- a/drizzlepac/build.sh
+++ b/drizzlepac/build.sh
@@ -1,5 +1,3 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1 || exit 1
 test -f setup.cfg && sed -i -e '/astrolib\.coords.*/d' setup.cfg
 python setup.py install || exit 1
\ No newline at end of file
diff --git a/drizzlepac/meta.yaml b/drizzlepac/meta.yaml
index 55940d9..7bd6c06 100644
--- a/drizzlepac/meta.yaml
+++ b/drizzlepac/meta.yaml
@@ -15,7 +15,6 @@ requirements:
     - numpy x.x
     - scipy
     - stsci.convolve
-    - stsci.distutils
     - stsci.image
     - stsci.imagemanip
     - stsci.imagestats
diff --git a/fitsblender/bld.bat b/fitsblender/bld.bat
index 695f708..976d3b9 100644
--- a/fitsblender/bld.bat
+++ b/fitsblender/bld.bat
@@ -1,5 +1,4 @@
 
-pip install --no-deps --upgrade --force d2to1
 if errorlevel 1 exit 1
 
 python setup.py install
diff --git a/fitsblender/build.sh b/fitsblender/build.sh
index 60e0bea..10954df 100644
--- a/fitsblender/build.sh
+++ b/fitsblender/build.sh
@@ -1,4 +1,3 @@
 
-pip install --no-deps --upgrade --force d2to1 || exit 1
 
 python setup.py install || exit 1
\ No newline at end of file
diff --git a/fitsblender/meta.yaml b/fitsblender/meta.yaml
index 9b5a094..45eeb75 100644
--- a/fitsblender/meta.yaml
+++ b/fitsblender/meta.yaml
@@ -10,8 +10,6 @@ package:
 requirements:
     build:
     - astropy >=1.1
-    - d2to1
-    - stsci.distutils
     - stsci.tools
     - setuptools
     - numpy x.x
diff --git a/nictools/build.sh b/nictools/build.sh
index 88ffa4c..4b71885 100644
--- a/nictools/build.sh
+++ b/nictools/build.sh
@@ -1,3 +1,2 @@
 
-pip install --no-deps --upgrade --force d2to1
 python setup.py install || exit 1
\ No newline at end of file
diff --git a/nictools/meta.yaml b/nictools/meta.yaml
index 56203d7..bae978c 100644
--- a/nictools/meta.yaml
+++ b/nictools/meta.yaml
@@ -11,7 +11,6 @@ requirements:
     - astropy >=1.1
     - numpy x.x
     - scipy
-    - stsci.distutils
     - stsci.tools
     - setuptools
     - python x.x
diff --git a/pandeia-engine/bld.bat b/pandeia-engine/bld.bat
index 27207f4..44a837c 100644
--- a/pandeia-engine/bld.bat
+++ b/pandeia-engine/bld.bat
@@ -1,5 +1,4 @@
 
-pip install --no-deps --upgrade --force d2to1
 if errorlevel 1 exit 1
 python setup.py install
 if errorlevel 1 exit 1
\ No newline at end of file
diff --git a/pandeia-engine/build.sh b/pandeia-engine/build.sh
index 4aadc69..51c2412 100644
--- a/pandeia-engine/build.sh
+++ b/pandeia-engine/build.sh
@@ -1,5 +1,4 @@
 
-pip install --no-deps --upgrade --force d2to1 || exit 1
 
 ( cd engine && \
 (python setup.py install || exit 1 ) ) && \
diff --git a/pandeia-engine/meta.yaml b/pandeia-engine/meta.yaml
index e33c57f..a7e0a71 100644
--- a/pandeia-engine/meta.yaml
+++ b/pandeia-engine/meta.yaml
@@ -10,8 +10,6 @@ package:
     version: '{{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }'
 requirements:
     build:
-    - d2to1
-    - stsci.distutils
     - tornado
     - setuptools
     - python x.x
diff --git a/pandeia-thirdparty/meta.yaml b/pandeia-thirdparty/meta.yaml
index 71fad36..7205b66 100644
--- a/pandeia-thirdparty/meta.yaml
+++ b/pandeia-thirdparty/meta.yaml
@@ -9,7 +9,6 @@ package:
     version: 1.1.4
 requirements:
     build:
-    - d2to1
     - astropy >=1.1
     - pandokia
     - yolk
@@ -34,7 +33,6 @@ requirements:
     - ipython-notebook
     - python x.x
     run:
-    - d2to1
     - astropy >=1.1
     - pandokia
     - yolk
diff --git a/pyraf/bld.bat b/pyraf/bld.bat
index 695f708..976d3b9 100644
--- a/pyraf/bld.bat
+++ b/pyraf/bld.bat
@@ -1,5 +1,4 @@
 
-pip install --no-deps --upgrade --force d2to1
 if errorlevel 1 exit 1
 
 python setup.py install
diff --git a/pyraf/build.sh b/pyraf/build.sh
index 60e0bea..10954df 100644
--- a/pyraf/build.sh
+++ b/pyraf/build.sh
@@ -1,4 +1,3 @@
 
-pip install --no-deps --upgrade --force d2to1 || exit 1
 
 python setup.py install || exit 1
\ No newline at end of file
diff --git a/pyraf/meta.yaml b/pyraf/meta.yaml
index 02a2824..fa45875 100644
--- a/pyraf/meta.yaml
+++ b/pyraf/meta.yaml
@@ -9,10 +9,8 @@ package:
     version: 2.1.10
 requirements:
     build:
-    - d2to1
     - astropy >=1.1
     - ipython
-    - stsci.distutils
     - stsci.tools
     - setuptools
     - numpy x.x
@@ -20,7 +18,6 @@ requirements:
     run:
     - astropy >=1.1
     - ipython
-    - stsci.distutils
     - stsci.tools
     - numpy x.x
     - python x.x
diff --git a/pyregion/bld.bat b/pyregion/bld.bat
index d1ddf28..726b367 100644
--- a/pyregion/bld.bat
+++ b/pyregion/bld.bat
@@ -1,6 +1,4 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1
 if errorlevel 1 exit 1
 
 python setup.py install || exit 1
diff --git a/pyregion/build.sh b/pyregion/build.sh
index 5e8b365..4b71885 100644
--- a/pyregion/build.sh
+++ b/pyregion/build.sh
@@ -1,4 +1,2 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1 || exit 1
 python setup.py install || exit 1
\ No newline at end of file
diff --git a/pyregion/meta.yaml b/pyregion/meta.yaml
index 30663f4..691a6ce 100644
--- a/pyregion/meta.yaml
+++ b/pyregion/meta.yaml
@@ -9,7 +9,6 @@ package:
     version: 1.1.2
 requirements:
     build:
-    - d2to1
     - numpy x.x
     - pyparsing
     - python x.x
diff --git a/pysynphot/build.sh b/pysynphot/build.sh
index 5e8b365..4b71885 100644
--- a/pysynphot/build.sh
+++ b/pysynphot/build.sh
@@ -1,4 +1,2 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1 || exit 1
 python setup.py install || exit 1
\ No newline at end of file
diff --git a/pysynphot/meta.yaml b/pysynphot/meta.yaml
index 82de156..f131e32 100644
--- a/pysynphot/meta.yaml
+++ b/pysynphot/meta.yaml
@@ -10,9 +10,7 @@ package:
     version: 0.9.8.2
 requirements:
     build:
-    - d2to1
     - nose
-    - stsci.distutils
     - astropy >=1.1
     - cython
     - numpy x.x
diff --git a/reftools/bld.bat b/reftools/bld.bat
index d1ddf28..726b367 100644
--- a/reftools/bld.bat
+++ b/reftools/bld.bat
@@ -1,6 +1,4 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1
 if errorlevel 1 exit 1
 
 python setup.py install || exit 1
diff --git a/reftools/build.sh b/reftools/build.sh
index 5e8b365..4b71885 100644
--- a/reftools/build.sh
+++ b/reftools/build.sh
@@ -1,4 +1,2 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1 || exit 1
 python setup.py install || exit 1
\ No newline at end of file
diff --git a/reftools/meta.yaml b/reftools/meta.yaml
index 2417fe5..dd9e6a4 100644
--- a/reftools/meta.yaml
+++ b/reftools/meta.yaml
@@ -10,8 +10,6 @@ package:
     version: 1.7.1
 requirements:
     build:
-    - d2to1
-    - stsci.distutils
     - stsci.imagestats
     - stsci.tools
     - pywcs
diff --git a/stistools/bld.bat b/stistools/bld.bat
index d1ddf28..726b367 100644
--- a/stistools/bld.bat
+++ b/stistools/bld.bat
@@ -1,6 +1,4 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1
 if errorlevel 1 exit 1
 
 python setup.py install || exit 1
diff --git a/stistools/build.sh b/stistools/build.sh
index 5e8b365..4b71885 100644
--- a/stistools/build.sh
+++ b/stistools/build.sh
@@ -1,4 +1,2 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1 || exit 1
 python setup.py install || exit 1
\ No newline at end of file
diff --git a/stistools/meta.yaml b/stistools/meta.yaml
index 424e8d6..dd3428c 100644
--- a/stistools/meta.yaml
+++ b/stistools/meta.yaml
@@ -9,10 +9,8 @@ package:
     version: '1.1'
 requirements:
     build:
-    - d2to1
     - astropy >=1.1
     - scipy
-    - stsci.distutils
     - stsci.tools
     - setuptools
     - numpy x.x
diff --git a/stsci-hst/meta.yaml b/stsci-hst/meta.yaml
index b8fbf95..8a951ba 100644
--- a/stsci-hst/meta.yaml
+++ b/stsci-hst/meta.yaml
@@ -16,7 +16,6 @@ requirements:
     - calcos ==3.1.3
     - costools ==1.2.1
     - crds ==0.0.0
-    - d2to1 ==0.2.12
     - drizzlepac ==2.1.3
     - fitsblender ==0.2.6
     - hstcal ==1.0.0
@@ -27,7 +26,6 @@ requirements:
     - reftools ==1.7.1
     - stistools ==1.1
     - stsci.convolve ==2.1.3
-    - stsci.distutils ==0.3.8
     - stsci.image ==2.2.0
     - stsci.imagemanip ==1.1.2
     - stsci.imagestats ==1.4.1
@@ -51,7 +49,6 @@ requirements:
     - calcos ==3.1.3
     - costools ==1.2.1
     - crds ==0.0.0
-    - d2to1 ==0.2.12
     - drizzlepac ==2.1.3
     - fitsblender ==0.2.6
     - hstcal ==1.0.0
@@ -62,7 +59,6 @@ requirements:
     - reftools ==1.7.1
     - stistools ==1.1
     - stsci.convolve ==2.1.3
-    - stsci.distutils ==0.3.8
     - stsci.image ==2.2.0
     - stsci.imagemanip ==1.1.2
     - stsci.imagestats ==1.4.1
diff --git a/stsci.convolve/bld.bat b/stsci.convolve/bld.bat
index 2096589..976d3b9 100644
--- a/stsci.convolve/bld.bat
+++ b/stsci.convolve/bld.bat
@@ -1,6 +1,4 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1
 if errorlevel 1 exit 1
 
 python setup.py install
diff --git a/stsci.convolve/build.sh b/stsci.convolve/build.sh
index 5e8b365..4b71885 100644
--- a/stsci.convolve/build.sh
+++ b/stsci.convolve/build.sh
@@ -1,4 +1,2 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1 || exit 1
 python setup.py install || exit 1
\ No newline at end of file
diff --git a/stsci.convolve/meta.yaml b/stsci.convolve/meta.yaml
index 0685748..b534377 100644
--- a/stsci.convolve/meta.yaml
+++ b/stsci.convolve/meta.yaml
@@ -10,8 +10,6 @@ package:
     version: 2.1.3
 requirements:
     build:
-    - d2to1
-    - stsci.distutils
     - numpy x.x
     - python x.x
     run:
diff --git a/stsci.distutils/build.sh b/stsci.distutils/build.sh
index 5e8b365..4b71885 100644
--- a/stsci.distutils/build.sh
+++ b/stsci.distutils/build.sh
@@ -1,4 +1,2 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1 || exit 1
 python setup.py install || exit 1
\ No newline at end of file
diff --git a/stsci.image/bld.bat b/stsci.image/bld.bat
index 695f708..976d3b9 100644
--- a/stsci.image/bld.bat
+++ b/stsci.image/bld.bat
@@ -1,5 +1,4 @@
 
-pip install --no-deps --upgrade --force d2to1
 if errorlevel 1 exit 1
 
 python setup.py install
diff --git a/stsci.image/build.sh b/stsci.image/build.sh
index 5e8b365..4b71885 100644
--- a/stsci.image/build.sh
+++ b/stsci.image/build.sh
@@ -1,4 +1,2 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1 || exit 1
 python setup.py install || exit 1
\ No newline at end of file
diff --git a/stsci.image/meta.yaml b/stsci.image/meta.yaml
index ab7162c..777bd81 100644
--- a/stsci.image/meta.yaml
+++ b/stsci.image/meta.yaml
@@ -10,11 +10,9 @@ package:
     version: 2.2.0
 requirements:
     build:
-    - d2to1
     - astropy >=1.1
     - numpy x.x
     - scipy
-    - stsci.distutils
     - stsci.tools
     - setuptools
     - python x.x
diff --git a/stsci.imagemanip/bld.bat b/stsci.imagemanip/bld.bat
index 2096589..976d3b9 100644
--- a/stsci.imagemanip/bld.bat
+++ b/stsci.imagemanip/bld.bat
@@ -1,6 +1,4 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1
 if errorlevel 1 exit 1
 
 python setup.py install
diff --git a/stsci.imagemanip/build.sh b/stsci.imagemanip/build.sh
index 5e8b365..4b71885 100644
--- a/stsci.imagemanip/build.sh
+++ b/stsci.imagemanip/build.sh
@@ -1,4 +1,2 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1 || exit 1
 python setup.py install || exit 1
\ No newline at end of file
diff --git a/stsci.imagemanip/meta.yaml b/stsci.imagemanip/meta.yaml
index 1b7511c..60f05bd 100644
--- a/stsci.imagemanip/meta.yaml
+++ b/stsci.imagemanip/meta.yaml
@@ -10,9 +10,7 @@ package:
     version: 1.1.2
 requirements:
     build:
-    - d2to1
     - numpy x.x
-    - stsci.distutils
     - stsci.tools
     - setuptools
     - python x.x
diff --git a/stsci.imagestats/bld.bat b/stsci.imagestats/bld.bat
index 2096589..976d3b9 100644
--- a/stsci.imagestats/bld.bat
+++ b/stsci.imagestats/bld.bat
@@ -1,6 +1,4 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1
 if errorlevel 1 exit 1
 
 python setup.py install
diff --git a/stsci.imagestats/build.sh b/stsci.imagestats/build.sh
index 5e8b365..4b71885 100644
--- a/stsci.imagestats/build.sh
+++ b/stsci.imagestats/build.sh
@@ -1,4 +1,2 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1 || exit 1
 python setup.py install || exit 1
\ No newline at end of file
diff --git a/stsci.imagestats/meta.yaml b/stsci.imagestats/meta.yaml
index 34589e6..bad27fa 100644
--- a/stsci.imagestats/meta.yaml
+++ b/stsci.imagestats/meta.yaml
@@ -10,8 +10,6 @@ package:
     version: 1.4.1
 requirements:
     build:
-    - d2to1
-    - stsci.distutils
     - setuptools
     - numpy x.x
     - python x.x
diff --git a/stsci.ndimage/bld.bat b/stsci.ndimage/bld.bat
index 2096589..976d3b9 100644
--- a/stsci.ndimage/bld.bat
+++ b/stsci.ndimage/bld.bat
@@ -1,6 +1,4 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1
 if errorlevel 1 exit 1
 
 python setup.py install
diff --git a/stsci.ndimage/build.sh b/stsci.ndimage/build.sh
index 5e8b365..4b71885 100644
--- a/stsci.ndimage/build.sh
+++ b/stsci.ndimage/build.sh
@@ -1,4 +1,2 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1 || exit 1
 python setup.py install || exit 1
\ No newline at end of file
diff --git a/stsci.ndimage/meta.yaml b/stsci.ndimage/meta.yaml
index 86315c7..cc5058c 100644
--- a/stsci.ndimage/meta.yaml
+++ b/stsci.ndimage/meta.yaml
@@ -10,8 +10,6 @@ package:
     version: 0.10.1
 requirements:
     build:
-    - d2to1
-    - stsci.distutils
     - setuptools
     - astropy >=1.1
     - numpy x.x
diff --git a/stsci.numdisplay/bld.bat b/stsci.numdisplay/bld.bat
index 2096589..976d3b9 100644
--- a/stsci.numdisplay/bld.bat
+++ b/stsci.numdisplay/bld.bat
@@ -1,6 +1,4 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1
 if errorlevel 1 exit 1
 
 python setup.py install
diff --git a/stsci.numdisplay/build.sh b/stsci.numdisplay/build.sh
index 5e8b365..4b71885 100644
--- a/stsci.numdisplay/build.sh
+++ b/stsci.numdisplay/build.sh
@@ -1,4 +1,2 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1 || exit 1
 python setup.py install || exit 1
\ No newline at end of file
diff --git a/stsci.numdisplay/meta.yaml b/stsci.numdisplay/meta.yaml
index 6e59c4c..c5859f9 100644
--- a/stsci.numdisplay/meta.yaml
+++ b/stsci.numdisplay/meta.yaml
@@ -10,7 +10,6 @@ package:
     version: 1.6.1
 requirements:
     build:
-    - d2to1
     - numpy x.x
     - stsci.tools
     - setuptools
diff --git a/stsci.skypac/build.sh b/stsci.skypac/build.sh
index f452b7b..c2dff0e 100644
--- a/stsci.skypac/build.sh
+++ b/stsci.skypac/build.sh
@@ -20,9 +20,7 @@ export -f set_py3k
 set_py3k
 
 
-pip install --no-deps --upgrade --force d2to1
 if [ $PY3K -ne 0 ] ; then
-sed -i -e "s|stsci.distutils.hooks.tag_svn_revision|#removed|" setup.cfg
 2to3 -w .
 fi
-python setup.py install || exit 1
\ No newline at end of file
+python setup.py install || exit 1
diff --git a/stsci.skypac/meta.yaml b/stsci.skypac/meta.yaml
index c8801f2..dc03ec9 100644
--- a/stsci.skypac/meta.yaml
+++ b/stsci.skypac/meta.yaml
@@ -11,7 +11,6 @@ package:
 requirements:
     build:
     - astropy >=1.1
-    - stsci.distutils
     - stsci.imagestats
     - stsci.sphere
     - stsci.tools
diff --git a/stsci.sphere/bld.bat b/stsci.sphere/bld.bat
index 2096589..976d3b9 100644
--- a/stsci.sphere/bld.bat
+++ b/stsci.sphere/bld.bat
@@ -1,6 +1,4 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1
 if errorlevel 1 exit 1
 
 python setup.py install
diff --git a/stsci.sphere/build.sh b/stsci.sphere/build.sh
index 5e8b365..4b71885 100644
--- a/stsci.sphere/build.sh
+++ b/stsci.sphere/build.sh
@@ -1,4 +1,2 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1 || exit 1
 python setup.py install || exit 1
\ No newline at end of file
diff --git a/stsci.sphere/meta.yaml b/stsci.sphere/meta.yaml
index 33ba98a..712086d 100644
--- a/stsci.sphere/meta.yaml
+++ b/stsci.sphere/meta.yaml
@@ -10,12 +10,10 @@ package:
     version: '0.2'
 requirements:
     build:
-    - d2to1
     - astropy >=1.1
     - matplotlib
     - numpy x.x
     - setuptools
-    - stsci.distutils
     - python x.x
     run:
     - astropy >=1.1
diff --git a/stsci.sphinxext/bld.bat b/stsci.sphinxext/bld.bat
index 2096589..976d3b9 100644
--- a/stsci.sphinxext/bld.bat
+++ b/stsci.sphinxext/bld.bat
@@ -1,6 +1,4 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1
 if errorlevel 1 exit 1
 
 python setup.py install
diff --git a/stsci.sphinxext/build.sh b/stsci.sphinxext/build.sh
index 5e8b365..4b71885 100644
--- a/stsci.sphinxext/build.sh
+++ b/stsci.sphinxext/build.sh
@@ -1,4 +1,2 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1 || exit 1
 python setup.py install || exit 1
\ No newline at end of file
diff --git a/stsci.sphinxext/meta.yaml b/stsci.sphinxext/meta.yaml
index d7b3486..c6484e4 100644
--- a/stsci.sphinxext/meta.yaml
+++ b/stsci.sphinxext/meta.yaml
@@ -10,14 +10,11 @@ package:
     version: 1.2.2
 requirements:
     build:
-    - d2to1
     - numpydoc
-    - stsci.distutils
     - setuptools
     - python x.x
     run:
     - numpydoc
-    - stsci.distutils
     - python x.x
 source:
     git_url: https://github.com/spacetelescope/stsci.sphinxext
diff --git a/stsci.stimage/bld.bat b/stsci.stimage/bld.bat
index 2096589..976d3b9 100644
--- a/stsci.stimage/bld.bat
+++ b/stsci.stimage/bld.bat
@@ -1,6 +1,4 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1
 if errorlevel 1 exit 1
 
 python setup.py install
diff --git a/stsci.stimage/build.sh b/stsci.stimage/build.sh
index 5e8b365..4b71885 100644
--- a/stsci.stimage/build.sh
+++ b/stsci.stimage/build.sh
@@ -1,4 +1,2 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1 || exit 1
 python setup.py install || exit 1
\ No newline at end of file
diff --git a/stsci.stimage/meta.yaml b/stsci.stimage/meta.yaml
index d314bd4..134647b 100644
--- a/stsci.stimage/meta.yaml
+++ b/stsci.stimage/meta.yaml
@@ -10,9 +10,7 @@ package:
     version: 0.2.1
 requirements:
     build:
-    - d2to1
     - numpy x.x
-    - stsci.distutils
     - setuptools
     - python x.x
     run:
diff --git a/stsci.tools/bld.bat b/stsci.tools/bld.bat
index 2096589..976d3b9 100644
--- a/stsci.tools/bld.bat
+++ b/stsci.tools/bld.bat
@@ -1,6 +1,4 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1
 if errorlevel 1 exit 1
 
 python setup.py install
diff --git a/stsci.tools/build.sh b/stsci.tools/build.sh
index 5e8b365..4b71885 100644
--- a/stsci.tools/build.sh
+++ b/stsci.tools/build.sh
@@ -1,4 +1,2 @@
 
-echo This d2to1 hack is deadly.
-pip install --no-deps --upgrade --force d2to1 || exit 1
 python setup.py install || exit 1
\ No newline at end of file
diff --git a/stsci.tools/meta.yaml b/stsci.tools/meta.yaml
index 1463370..a42bc84 100644
--- a/stsci.tools/meta.yaml
+++ b/stsci.tools/meta.yaml
@@ -10,18 +10,15 @@ package:
     version: 3.4.1
 requirements:
     build:
-    - d2to1
     - astropy >=1.1
     - pytools
     - setuptools
-    - stsci.distutils
     - numpy x.x
     - python x.x
     run:
     - astropy >=1.1
     - numpy x.x
     - pytools
-    - stsci.distutils
     - python x.x
 source:
     git_url: https://github.com/spacetelescope/stsci.tools
diff --git a/stsci/meta.yaml b/stsci/meta.yaml
index 6bea935..919b880 100644
--- a/stsci/meta.yaml
+++ b/stsci/meta.yaml
@@ -6,14 +6,13 @@ build:
     number: '0'
 package:
     name: stsci
-    version: 1.0.0
+    version: 1.0.1
 requirements:
     build:
-    - stsci-hst
-    - stsci-data-analysis
+    - stsci-hst ==1.0.1
+    - stsci-data-analysis ==1.0.1
     - astropy >=1.1
     - cfitsio ==3.370
-    - d2to1 ==0.2.12
     - ds9 ==7.4
     - fftw ==3.3.4
     - htc_utils >=0.1
@@ -28,11 +27,10 @@ requirements:
     - numpy x.x
     - python x.x
     run:
-    - stsci-hst
-    - stsci-data-analysis
+    - stsci-hst ==1.0.1
+    - stsci-data-analysis ==1.0.1
     - astropy >=1.1
     - cfitsio ==3.370
-    - d2to1 ==0.2.12
     - ds9 ==7.4
     - fftw ==3.3.4
     - htc_utils >=0.1
diff --git a/stwcs/build.sh b/stwcs/build.sh
index 92417fa..7ee7c62 100644
--- a/stwcs/build.sh
+++ b/stwcs/build.sh
@@ -20,11 +20,9 @@ export -f set_py3k
 set_py3k
 
 
-pip install --no-deps --upgrade --force d2to1
 
 sed -i -e "s|use_2to3=True|use_2to3=False|" setup.py
 if [ $PY3K -ne 0 ] ; then
-sed -i -e "s|stsci.distutils.hooks.tag_svn_revision|#removed|" setup.cfg
 fi
 
 python setup.py install || exit 1
\ No newline at end of file
diff --git a/stwcs/meta.yaml b/stwcs/meta.yaml
index cb720b0..4afb2bc 100644
--- a/stwcs/meta.yaml
+++ b/stwcs/meta.yaml
@@ -10,7 +10,6 @@ package:
 requirements:
     build:
     - astropy >=1.1
-    - stsci.distutils
     - stsci.tools
     - setuptools
     - numpy x.x
diff --git a/wfc3tools/bld.bat b/wfc3tools/bld.bat
index 695f708..976d3b9 100644
--- a/wfc3tools/bld.bat
+++ b/wfc3tools/bld.bat
@@ -1,5 +1,4 @@
 
-pip install --no-deps --upgrade --force d2to1
 if errorlevel 1 exit 1
 
 python setup.py install
diff --git a/wfc3tools/build.sh b/wfc3tools/build.sh
index 60e0bea..10954df 100644
--- a/wfc3tools/build.sh
+++ b/wfc3tools/build.sh
@@ -1,4 +1,3 @@
 
-pip install --no-deps --upgrade --force d2to1 || exit 1
 
 python setup.py install || exit 1
\ No newline at end of file
diff --git a/wfc3tools/meta.yaml b/wfc3tools/meta.yaml
index 23c6c12..52b035e 100644
--- a/wfc3tools/meta.yaml
+++ b/wfc3tools/meta.yaml
@@ -9,8 +9,6 @@ package:
     version: 1.3.1
 requirements:
     build:
-    - d2to1
-    - stsci.distutils
     - stsci.tools
     - astropy >=1.1
     - matplotlib
diff --git a/wfpc2tools/bld.bat b/wfpc2tools/bld.bat
index 695f708..976d3b9 100644
--- a/wfpc2tools/bld.bat
+++ b/wfpc2tools/bld.bat
@@ -1,5 +1,4 @@
 
-pip install --no-deps --upgrade --force d2to1
 if errorlevel 1 exit 1
 
 python setup.py install
diff --git a/wfpc2tools/build.sh b/wfpc2tools/build.sh
index 6313265..5b1a523 100644
--- a/wfpc2tools/build.sh
+++ b/wfpc2tools/build.sh
@@ -19,11 +19,9 @@ export -f set_py3k
 
 set_py3k
 
-pip install --no-deps --upgrade --force d2to1 || exit 1
 
 echo "This doesn't work. Why conda why? --python 2.7 is useless here"
 if [ $PY3K -ne 0 ] ; then
-sed -i -e "s|stsci.distutils.hooks.tag_svn_revision|#removed|" setup.cfg
 2to3 -w .
 fi
 
diff --git a/wfpc2tools/meta.yaml b/wfpc2tools/meta.yaml
index c6627c6..3906f89 100644
--- a/wfpc2tools/meta.yaml
+++ b/wfpc2tools/meta.yaml
@@ -9,10 +9,8 @@ package:
     version: 1.0.3
 requirements:
     build:
-    - d2to1
     - astropy >=1.1
     - scipy
-    - stsci.distutils
     - stsci.imagestats
     - stsci.tools
     - setuptools