Merge pull request #4487 from charris/move-swig-to-tools-directory

Move swig to tools directory

39 files changed, 17 insertions, 16 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index fd4f665b5..5b0691b20 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -8,7 +8,6 @@ include COMPATIBILITY
 include *.txt
 include setupegg.py
 include site.cfg.example
-include tools/py3tool.py
 include numpy/random/mtrand/generate_mtrand_c.py
 recursive-include numpy/random/mtrand *.pyx *.pxd
 # Adding scons build related files not found by distutils
@@ -20,9 +19,7 @@ include doc/Makefile doc/postprocess.py
 recursive-include doc/release *
 recursive-include doc/source *
 recursive-include doc/sphinxext *
-recursive-include doc/cython *
-recursive-include doc/pyrex *
-recursive-include doc/swig *
+recursive-include tools/swig *
 recursive-include doc/scipy-sphinx-theme *
 recursive-include doc/f2py *
 
diff --git a/doc/release/1.9.0-notes.rst b/doc/release/1.9.0-notes.rst
index 2e457ad84..c8b08b34d 100644
--- a/doc/release/1.9.0-notes.rst
+++ b/doc/release/1.9.0-notes.rst
@@ -46,8 +46,8 @@ to an array via ``np.array``.
 If the ``overwrite_input`` option is used the input is only partially
 instead of fully sorted.
 
-``npy_3kcompat.h`` header change
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The ``npy_3kcompat.h`` header changed
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 The unused ``simple_capsule_dtor`` function has been removed from
 ``npy_3kcompat.h``.  Note that this header is not meant to be used outside
 of numpy; other projects should be using their own copy of this file when
@@ -65,6 +65,10 @@ ndarray.tofile exception type
 All ``tofile`` exceptions are now ``IOError``, some were previously
 ``ValueError``.
 
+The ``doc/swig`` directory moved
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The ``doc/swig`` directory has been moved to ``tools/swig``.
+
 
 New Features
 ============
diff --git a/doc/source/user/c-info.python-as-glue.rst b/doc/source/user/c-info.python-as-glue.rst
index 6ce266859..985d478e0 100644
--- a/doc/source/user/c-info.python-as-glue.rst
+++ b/doc/source/user/c-info.python-as-glue.rst
@@ -1385,7 +1385,7 @@ Simplified Wrapper and Interface Generator (SWIG) is an old and fairly
 stable method for wrapping C/C++-libraries to a large variety of other
 languages. It does not specifically understand NumPy arrays but can be
 made useable with NumPy through the use of typemaps. There are some
-sample typemaps in the numpy/doc/swig directory under numpy.i along
+sample typemaps in the numpy/tools/swig directory under numpy.i together
 with an example module that makes use of them. SWIG excels at wrapping
 large C/C++ libraries because it can (almost) parse their headers and
 auto-produce an interface. Technically, you need to generate a ``.i``
diff --git a/doc/swig/Makefile b/tools/swig/Makefile
index 0478ac76f..0478ac76f 100644
--- a/doc/swig/Makefile
+++ b/tools/swig/Makefile
diff --git a/doc/swig/README b/tools/swig/README
index df5dbfc47..1f05b106c 100644
--- a/doc/swig/README
+++ b/tools/swig/README
@@ -1,5 +1,5 @@
-Notes for the numpy/doc/swig directory
-======================================
+Notes for the numpy/tools/swig directory
+========================================
 
 This set of files is for developing and testing file numpy.i, which is
 intended to be a set of typemaps for helping SWIG interface between C
@@ -10,7 +10,7 @@ distribution.
 Documentation
 -------------
 Documentation for how to use numpy.i, as well as for the testing
-system used here, can be found in the NumPy reference guide.  
+system used here, can be found in the NumPy reference guide.
 
 Testing
 -------
diff --git a/doc/swig/numpy.i b/tools/swig/numpy.i
index 529725479..49c742616 100644
--- a/doc/swig/numpy.i
+++ b/tools/swig/numpy.i
@@ -996,7 +996,7 @@
       size[0] = array_size(temp_array,0);
       size[1] = array_size(temp_array,1);
     }
-    
+
     if (!require_size(temp_array, size, 2)) SWIG_fail;
 
     array[i] = (DATA_TYPE*) array_data(temp_array);
@@ -1232,7 +1232,7 @@
       size[1] = array_size(temp_array,1);
       size[2] = array_size(temp_array,2);
     }
-    
+
     if (!require_size(temp_array, size, 3)) SWIG_fail;
 
     array[i] = (DATA_TYPE*) array_data(temp_array);
@@ -1634,7 +1634,7 @@
       size[0] = array_size(temp_array,0);
       size[1] = array_size(temp_array,1);
     }
-    
+
     if (!require_size(temp_array, size, 2)) SWIG_fail;
 
     array[i] = (DATA_TYPE*) array_data(temp_array);
@@ -1819,7 +1819,7 @@
       size[1] = array_size(temp_array,1);
       size[2] = array_size(temp_array,2);
     }
-    
+
     if (!require_size(temp_array, size, 3)) SWIG_fail;
 
     array[i] = (DATA_TYPE*) array_data(temp_array);
@@ -2402,7 +2402,7 @@
 %#else
     PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free);
 %#endif
-  
+
 %#if NPY_API_VERSION < 0x00000007
   PyArray_BASE(array) = cap;
 %#else
@@ -2436,7 +2436,7 @@
 %#else
     PyObject* cap = PyCObject_FromVoidPtr((void*)(*$1), free);
 %#endif
-  
+
 %#if NPY_API_VERSION < 0x00000007
   PyArray_BASE(array) = cap;
 %#else
diff --git a/doc/swig/pyfragments.swg b/tools/swig/pyfragments.swg
index b5decf12c..b5decf12c 100644
--- a/doc/swig/pyfragments.swg
+++ b/tools/swig/pyfragments.swg
diff --git a/doc/swig/test/Array.i b/tools/swig/test/Array.i
index 6a8605eb6..6a8605eb6 100644
--- a/doc/swig/test/Array.i
+++ b/tools/swig/test/Array.i
diff --git a/doc/swig/test/Array1.cxx b/tools/swig/test/Array1.cxx
index 0c09e02f9..0c09e02f9 100644
--- a/doc/swig/test/Array1.cxx
+++ b/tools/swig/test/Array1.cxx
diff --git a/doc/swig/test/Array1.h b/tools/swig/test/Array1.h
index 754c248fc..754c248fc 100644
--- a/doc/swig/test/Array1.h
+++ b/tools/swig/test/Array1.h
diff --git a/doc/swig/test/Array2.cxx b/tools/swig/test/Array2.cxx
index e3558f786..e3558f786 100644
--- a/doc/swig/test/Array2.cxx
+++ b/tools/swig/test/Array2.cxx
diff --git a/doc/swig/test/Array2.h b/tools/swig/test/Array2.h
index 7f8d4ca65..7f8d4ca65 100644
--- a/doc/swig/test/Array2.h
+++ b/tools/swig/test/Array2.h
diff --git a/doc/swig/test/Farray.cxx b/tools/swig/test/Farray.cxx
index 3983c333b..3983c333b 100644
--- a/doc/swig/test/Farray.cxx
+++ b/tools/swig/test/Farray.cxx
diff --git a/doc/swig/test/Farray.h b/tools/swig/test/Farray.h
index 4199a287c..4199a287c 100644
--- a/doc/swig/test/Farray.h
+++ b/tools/swig/test/Farray.h
diff --git a/doc/swig/test/Farray.i b/tools/swig/test/Farray.i
index 25f6cd025..25f6cd025 100644
--- a/doc/swig/test/Farray.i
+++ b/tools/swig/test/Farray.i
diff --git a/doc/swig/test/Fortran.cxx b/tools/swig/test/Fortran.cxx
index 475d21ddc..475d21ddc 100644
--- a/doc/swig/test/Fortran.cxx
+++ b/tools/swig/test/Fortran.cxx
diff --git a/doc/swig/test/Fortran.h b/tools/swig/test/Fortran.h
index c243bb50f..c243bb50f 100644
--- a/doc/swig/test/Fortran.h
+++ b/tools/swig/test/Fortran.h
diff --git a/doc/swig/test/Fortran.i b/tools/swig/test/Fortran.i
index 131790dd6..131790dd6 100644
--- a/doc/swig/test/Fortran.i
+++ b/tools/swig/test/Fortran.i
diff --git a/doc/swig/test/Makefile b/tools/swig/test/Makefile
index 5360b1ced..5360b1ced 100644
--- a/doc/swig/test/Makefile
+++ b/tools/swig/test/Makefile
diff --git a/doc/swig/test/Matrix.cxx b/tools/swig/test/Matrix.cxx
index b953d7017..b953d7017 100644
--- a/doc/swig/test/Matrix.cxx
+++ b/tools/swig/test/Matrix.cxx
diff --git a/doc/swig/test/Matrix.h b/tools/swig/test/Matrix.h
index f37836cc4..f37836cc4 100644
--- a/doc/swig/test/Matrix.h
+++ b/tools/swig/test/Matrix.h
diff --git a/doc/swig/test/Matrix.i b/tools/swig/test/Matrix.i
index e721397a0..e721397a0 100644
--- a/doc/swig/test/Matrix.i
+++ b/tools/swig/test/Matrix.i
diff --git a/doc/swig/test/SuperTensor.cxx b/tools/swig/test/SuperTensor.cxx
index 82e8a4bd5..82e8a4bd5 100644
--- a/doc/swig/test/SuperTensor.cxx
+++ b/tools/swig/test/SuperTensor.cxx
diff --git a/doc/swig/test/SuperTensor.h b/tools/swig/test/SuperTensor.h
index 29cc3bbbb..29cc3bbbb 100644
--- a/doc/swig/test/SuperTensor.h
+++ b/tools/swig/test/SuperTensor.h
diff --git a/doc/swig/test/SuperTensor.i b/tools/swig/test/SuperTensor.i
index 7521b8ec4..7521b8ec4 100644
--- a/doc/swig/test/SuperTensor.i
+++ b/tools/swig/test/SuperTensor.i
diff --git a/doc/swig/test/Tensor.cxx b/tools/swig/test/Tensor.cxx
index 4ccefa144..4ccefa144 100644
--- a/doc/swig/test/Tensor.cxx
+++ b/tools/swig/test/Tensor.cxx
diff --git a/doc/swig/test/Tensor.h b/tools/swig/test/Tensor.h
index 1f483b328..1f483b328 100644
--- a/doc/swig/test/Tensor.h
+++ b/tools/swig/test/Tensor.h
diff --git a/doc/swig/test/Tensor.i b/tools/swig/test/Tensor.i
index 5bf9da7e2..5bf9da7e2 100644
--- a/doc/swig/test/Tensor.i
+++ b/tools/swig/test/Tensor.i
diff --git a/doc/swig/test/Vector.cxx b/tools/swig/test/Vector.cxx
index 2c90404da..2c90404da 100644
--- a/doc/swig/test/Vector.cxx
+++ b/tools/swig/test/Vector.cxx
diff --git a/doc/swig/test/Vector.h b/tools/swig/test/Vector.h
index 01da361c6..01da361c6 100644
--- a/doc/swig/test/Vector.h
+++ b/tools/swig/test/Vector.h
diff --git a/doc/swig/test/Vector.i b/tools/swig/test/Vector.i
index e86f21c37..e86f21c37 100644
--- a/doc/swig/test/Vector.i
+++ b/tools/swig/test/Vector.i
diff --git a/doc/swig/test/setup.py b/tools/swig/test/setup.py
index e39114f91..e39114f91 100755
--- a/doc/swig/test/setup.py
+++ b/tools/swig/test/setup.py
diff --git a/doc/swig/test/testArray.py b/tools/swig/test/testArray.py
index d986de3b3..d986de3b3 100755
--- a/doc/swig/test/testArray.py
+++ b/tools/swig/test/testArray.py
diff --git a/doc/swig/test/testFarray.py b/tools/swig/test/testFarray.py
index 15683b70b..15683b70b 100755
--- a/doc/swig/test/testFarray.py
+++ b/tools/swig/test/testFarray.py
diff --git a/doc/swig/test/testFortran.py b/tools/swig/test/testFortran.py
index a42af950e..a42af950e 100644
--- a/doc/swig/test/testFortran.py
+++ b/tools/swig/test/testFortran.py
diff --git a/doc/swig/test/testMatrix.py b/tools/swig/test/testMatrix.py
index af234e0e9..af234e0e9 100755
--- a/doc/swig/test/testMatrix.py
+++ b/tools/swig/test/testMatrix.py
diff --git a/doc/swig/test/testSuperTensor.py b/tools/swig/test/testSuperTensor.py
index ff1f86df2..ff1f86df2 100644
--- a/doc/swig/test/testSuperTensor.py
+++ b/tools/swig/test/testSuperTensor.py
diff --git a/doc/swig/test/testTensor.py b/tools/swig/test/testTensor.py
index a9390ebb1..a9390ebb1 100755
--- a/doc/swig/test/testTensor.py
+++ b/tools/swig/test/testTensor.py
diff --git a/doc/swig/test/testVector.py b/tools/swig/test/testVector.py
index e7d019cf7..e7d019cf7 100755
--- a/doc/swig/test/testVector.py
+++ b/tools/swig/test/testVector.py