MAINT: Move doc/swig to tools/swig.

Also update MANIFEST.in and documentation to reflect the move. The discussion of this change is at numpy#2384. Closes numpy#2384. Closes numpy#4374.
pablocael · Mar 12, 2014 · a38888c · a38888c
1 parent 4fd4850
commit a38888c
Show file tree

Hide file tree

Showing 38 changed files with 5 additions and 5 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -19,7 +19,7 @@ include doc/Makefile doc/postprocess.py
 recursive-include doc/release *
 recursive-include doc/source *
 recursive-include doc/sphinxext *
-recursive-include doc/swig *
+recursive-include tools/swig *
 recursive-include doc/scipy-sphinx-theme *
 recursive-include doc/f2py *
 

diff --git 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 → tools/swig/Makefile b/doc/swig/Makefile → tools/swig/Makefile
diff --git a/doc/swig/README → tools/swig/README b/doc/swig/README → 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 → tools/swig/numpy.i b/doc/swig/numpy.i → tools/swig/numpy.i
diff --git a/doc/swig/pyfragments.swg → tools/swig/pyfragments.swg b/doc/swig/pyfragments.swg → tools/swig/pyfragments.swg
diff --git a/doc/swig/test/Array.i → tools/swig/test/Array.i b/doc/swig/test/Array.i → tools/swig/test/Array.i
diff --git a/doc/swig/test/Array1.cxx → tools/swig/test/Array1.cxx b/doc/swig/test/Array1.cxx → tools/swig/test/Array1.cxx
diff --git a/doc/swig/test/Array1.h → tools/swig/test/Array1.h b/doc/swig/test/Array1.h → tools/swig/test/Array1.h
diff --git a/doc/swig/test/Array2.cxx → tools/swig/test/Array2.cxx b/doc/swig/test/Array2.cxx → tools/swig/test/Array2.cxx
diff --git a/doc/swig/test/Array2.h → tools/swig/test/Array2.h b/doc/swig/test/Array2.h → tools/swig/test/Array2.h
diff --git a/doc/swig/test/Farray.cxx → tools/swig/test/Farray.cxx b/doc/swig/test/Farray.cxx → tools/swig/test/Farray.cxx
diff --git a/doc/swig/test/Farray.h → tools/swig/test/Farray.h b/doc/swig/test/Farray.h → tools/swig/test/Farray.h
diff --git a/doc/swig/test/Farray.i → tools/swig/test/Farray.i b/doc/swig/test/Farray.i → tools/swig/test/Farray.i
diff --git a/doc/swig/test/Fortran.cxx → tools/swig/test/Fortran.cxx b/doc/swig/test/Fortran.cxx → tools/swig/test/Fortran.cxx
diff --git a/doc/swig/test/Fortran.h → tools/swig/test/Fortran.h b/doc/swig/test/Fortran.h → tools/swig/test/Fortran.h
diff --git a/doc/swig/test/Fortran.i → tools/swig/test/Fortran.i b/doc/swig/test/Fortran.i → tools/swig/test/Fortran.i
diff --git a/doc/swig/test/Makefile → tools/swig/test/Makefile b/doc/swig/test/Makefile → tools/swig/test/Makefile
diff --git a/doc/swig/test/Matrix.cxx → tools/swig/test/Matrix.cxx b/doc/swig/test/Matrix.cxx → tools/swig/test/Matrix.cxx
diff --git a/doc/swig/test/Matrix.h → tools/swig/test/Matrix.h b/doc/swig/test/Matrix.h → tools/swig/test/Matrix.h
diff --git a/doc/swig/test/Matrix.i → tools/swig/test/Matrix.i b/doc/swig/test/Matrix.i → tools/swig/test/Matrix.i
diff --git a/doc/swig/test/SuperTensor.cxx → tools/swig/test/SuperTensor.cxx b/doc/swig/test/SuperTensor.cxx → tools/swig/test/SuperTensor.cxx
diff --git a/doc/swig/test/SuperTensor.h → tools/swig/test/SuperTensor.h b/doc/swig/test/SuperTensor.h → tools/swig/test/SuperTensor.h
diff --git a/doc/swig/test/SuperTensor.i → tools/swig/test/SuperTensor.i b/doc/swig/test/SuperTensor.i → tools/swig/test/SuperTensor.i
diff --git a/doc/swig/test/Tensor.cxx → tools/swig/test/Tensor.cxx b/doc/swig/test/Tensor.cxx → tools/swig/test/Tensor.cxx
diff --git a/doc/swig/test/Tensor.h → tools/swig/test/Tensor.h b/doc/swig/test/Tensor.h → tools/swig/test/Tensor.h
diff --git a/doc/swig/test/Tensor.i → tools/swig/test/Tensor.i b/doc/swig/test/Tensor.i → tools/swig/test/Tensor.i
diff --git a/doc/swig/test/Vector.cxx → tools/swig/test/Vector.cxx b/doc/swig/test/Vector.cxx → tools/swig/test/Vector.cxx
diff --git a/doc/swig/test/Vector.h → tools/swig/test/Vector.h b/doc/swig/test/Vector.h → tools/swig/test/Vector.h
diff --git a/doc/swig/test/Vector.i → tools/swig/test/Vector.i b/doc/swig/test/Vector.i → tools/swig/test/Vector.i
diff --git a/doc/swig/test/setup.py → tools/swig/test/setup.py b/doc/swig/test/setup.py → tools/swig/test/setup.py
diff --git a/doc/swig/test/testArray.py → tools/swig/test/testArray.py b/doc/swig/test/testArray.py → tools/swig/test/testArray.py
diff --git a/doc/swig/test/testFarray.py → tools/swig/test/testFarray.py b/doc/swig/test/testFarray.py → tools/swig/test/testFarray.py
diff --git a/doc/swig/test/testFortran.py → tools/swig/test/testFortran.py b/doc/swig/test/testFortran.py → tools/swig/test/testFortran.py
diff --git a/doc/swig/test/testMatrix.py → tools/swig/test/testMatrix.py b/doc/swig/test/testMatrix.py → tools/swig/test/testMatrix.py
diff --git a/doc/swig/test/testSuperTensor.py → tools/swig/test/testSuperTensor.py b/doc/swig/test/testSuperTensor.py → tools/swig/test/testSuperTensor.py
diff --git a/doc/swig/test/testTensor.py → tools/swig/test/testTensor.py b/doc/swig/test/testTensor.py → tools/swig/test/testTensor.py
diff --git a/doc/swig/test/testVector.py → tools/swig/test/testVector.py b/doc/swig/test/testVector.py → tools/swig/test/testVector.py