From abd33d80dbd8af14c1ff3b7f89625ebe9f780b89 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Thu, 17 Sep 2015 16:05:07 -0400 Subject: [PATCH] Removed obsolete pysqlite documentation. These steps are no longer needed as of pysqlite 2.7.0. https://github.com/ghaering/pysqlite/commit/76f34850be582249d9048e6acb2993943b07d31b --- docs/ref/contrib/gis/install/index.txt | 2 +- docs/ref/contrib/gis/install/spatialite.txt | 54 --------------------- 2 files changed, 1 insertion(+), 55 deletions(-) diff --git a/docs/ref/contrib/gis/install/index.txt b/docs/ref/contrib/gis/install/index.txt index 7f6751bece..4294f3850e 100644 --- a/docs/ref/contrib/gis/install/index.txt +++ b/docs/ref/contrib/gis/install/index.txt @@ -294,7 +294,7 @@ William Kyngesburye provides a number of `geospatial library binary packages`__ that make it simple to get GeoDjango installed on OS X without compiling them from source. However, the `Apple Developer Tools`_ are still necessary for compiling the Python database adapters :ref:`psycopg2_kyngchaos` (for PostGIS) -and :ref:`pysqlite2` (for SpatiaLite). +and `pysqlite2 `_ (for SpatiaLite). .. note:: diff --git a/docs/ref/contrib/gis/install/spatialite.txt b/docs/ref/contrib/gis/install/spatialite.txt index 8cb44bccbf..01a9a266bc 100644 --- a/docs/ref/contrib/gis/install/spatialite.txt +++ b/docs/ref/contrib/gis/install/spatialite.txt @@ -105,60 +105,6 @@ Finally, do the same for the SpatiaLite tools:: __ http://www.gaia-gis.it/gaia-sins/libspatialite-sources/ -.. _pysqlite2: - -pysqlite2 -^^^^^^^^^ - -If you've decided to use a :ref:`newer version of pysqlite2 -` instead of the ``sqlite3`` Python stdlib -module, then you need to make sure it can load external extensions (i.e. the -required ``enable_load_extension`` method is available so ``SpatiaLite`` can be -loaded). - -This might involve building it yourself. For this, download pysqlite2 2.6, and -untar:: - - $ wget https://pypi.python.org/packages/source/p/pysqlite/pysqlite-2.6.3.tar.gz - $ tar xzf pysqlite-2.6.3.tar.gz - $ cd pysqlite-2.6.3 - -Next, use a text editor to edit the ``setup.cfg`` file to look like the -following: - -.. code-block:: ini - - [build_ext] - #define= - include_dirs=/usr/local/include - library_dirs=/usr/local/lib - libraries=sqlite3 - #define=SQLITE_OMIT_LOAD_EXTENSION - -or if you are on Mac OS X: - -.. code-block:: ini - - [build_ext] - #define= - include_dirs=/Library/Frameworks/SQLite3.framework/unix/include - library_dirs=/Library/Frameworks/SQLite3.framework/unix/lib - libraries=sqlite3 - #define=SQLITE_OMIT_LOAD_EXTENSION - -.. note:: - - The important thing here is to make sure you comment out the - ``define=SQLITE_OMIT_LOAD_EXTENSION`` flag and that the ``include_dirs`` - and ``library_dirs`` settings are uncommented and set to the appropriate - path if the SQLite header files and libraries are not in ``/usr/include`` - and ``/usr/lib``, respectively. - -After modifying ``setup.cfg`` appropriately, then run the ``setup.py`` script -to build and install:: - - $ python setup.py install - .. _spatialite_macosx: Mac OS X-specific instructions