diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2014-03-12 11:19:40 -0600 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2014-03-12 11:26:48 -0600 |
commit | a38888c18cd2a20de0eb0578b3fa8660cda79582 (patch) | |
tree | 4f0590684328a013544de84b1577f9322db4cbac | |
parent | 4fd4850d6b8bb9a8837e19b7ef2b38d0cd67fdd1 (diff) | |
download | numpy-a38888c18cd2a20de0eb0578b3fa8660cda79582.tar.gz |
MAINT: Move doc/swig to tools/swig.
Also update MANIFEST.in and documentation to reflect the move. The
discussion of this change is at #2384.
Closes #2384. Closes #4374.
-rw-r--r-- | MANIFEST.in | 2 | ||||
-rw-r--r-- | doc/source/user/c-info.python-as-glue.rst | 2 | ||||
-rw-r--r-- | tools/swig/Makefile (renamed from doc/swig/Makefile) | 0 | ||||
-rw-r--r-- | tools/swig/README (renamed from doc/swig/README) | 6 | ||||
-rw-r--r-- | tools/swig/numpy.i (renamed from doc/swig/numpy.i) | 0 | ||||
-rw-r--r-- | tools/swig/pyfragments.swg (renamed from doc/swig/pyfragments.swg) | 0 | ||||
-rw-r--r-- | tools/swig/test/Array.i (renamed from doc/swig/test/Array.i) | 0 | ||||
-rw-r--r-- | tools/swig/test/Array1.cxx (renamed from doc/swig/test/Array1.cxx) | 0 | ||||
-rw-r--r-- | tools/swig/test/Array1.h (renamed from doc/swig/test/Array1.h) | 0 | ||||
-rw-r--r-- | tools/swig/test/Array2.cxx (renamed from doc/swig/test/Array2.cxx) | 0 | ||||
-rw-r--r-- | tools/swig/test/Array2.h (renamed from doc/swig/test/Array2.h) | 0 | ||||
-rw-r--r-- | tools/swig/test/Farray.cxx (renamed from doc/swig/test/Farray.cxx) | 0 | ||||
-rw-r--r-- | tools/swig/test/Farray.h (renamed from doc/swig/test/Farray.h) | 0 | ||||
-rw-r--r-- | tools/swig/test/Farray.i (renamed from doc/swig/test/Farray.i) | 0 | ||||
-rw-r--r-- | tools/swig/test/Fortran.cxx (renamed from doc/swig/test/Fortran.cxx) | 0 | ||||
-rw-r--r-- | tools/swig/test/Fortran.h (renamed from doc/swig/test/Fortran.h) | 0 | ||||
-rw-r--r-- | tools/swig/test/Fortran.i (renamed from doc/swig/test/Fortran.i) | 0 | ||||
-rw-r--r-- | tools/swig/test/Makefile (renamed from doc/swig/test/Makefile) | 0 | ||||
-rw-r--r-- | tools/swig/test/Matrix.cxx (renamed from doc/swig/test/Matrix.cxx) | 0 | ||||
-rw-r--r-- | tools/swig/test/Matrix.h (renamed from doc/swig/test/Matrix.h) | 0 | ||||
-rw-r--r-- | tools/swig/test/Matrix.i (renamed from doc/swig/test/Matrix.i) | 0 | ||||
-rw-r--r-- | tools/swig/test/SuperTensor.cxx (renamed from doc/swig/test/SuperTensor.cxx) | 0 | ||||
-rw-r--r-- | tools/swig/test/SuperTensor.h (renamed from doc/swig/test/SuperTensor.h) | 0 | ||||
-rw-r--r-- | tools/swig/test/SuperTensor.i (renamed from doc/swig/test/SuperTensor.i) | 0 | ||||
-rw-r--r-- | tools/swig/test/Tensor.cxx (renamed from doc/swig/test/Tensor.cxx) | 0 | ||||
-rw-r--r-- | tools/swig/test/Tensor.h (renamed from doc/swig/test/Tensor.h) | 0 | ||||
-rw-r--r-- | tools/swig/test/Tensor.i (renamed from doc/swig/test/Tensor.i) | 0 | ||||
-rw-r--r-- | tools/swig/test/Vector.cxx (renamed from doc/swig/test/Vector.cxx) | 0 | ||||
-rw-r--r-- | tools/swig/test/Vector.h (renamed from doc/swig/test/Vector.h) | 0 | ||||
-rw-r--r-- | tools/swig/test/Vector.i (renamed from doc/swig/test/Vector.i) | 0 | ||||
-rwxr-xr-x | tools/swig/test/setup.py (renamed from doc/swig/test/setup.py) | 0 | ||||
-rwxr-xr-x | tools/swig/test/testArray.py (renamed from doc/swig/test/testArray.py) | 0 | ||||
-rwxr-xr-x | tools/swig/test/testFarray.py (renamed from doc/swig/test/testFarray.py) | 0 | ||||
-rw-r--r-- | tools/swig/test/testFortran.py (renamed from doc/swig/test/testFortran.py) | 0 | ||||
-rwxr-xr-x | tools/swig/test/testMatrix.py (renamed from doc/swig/test/testMatrix.py) | 0 | ||||
-rw-r--r-- | tools/swig/test/testSuperTensor.py (renamed from doc/swig/test/testSuperTensor.py) | 0 | ||||
-rwxr-xr-x | tools/swig/test/testTensor.py (renamed from doc/swig/test/testTensor.py) | 0 | ||||
-rwxr-xr-x | tools/swig/test/testVector.py (renamed from doc/swig/test/testVector.py) | 0 |
38 files changed, 5 insertions, 5 deletions
diff --git a/MANIFEST.in b/MANIFEST.in index 352103039..5b0691b20 100644 --- 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 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..529725479 100644 --- a/doc/swig/numpy.i +++ b/tools/swig/numpy.i 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 |