Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Removed Python 2.6 references in GIS docs

Refs #20746.
  • Loading branch information...
commit 1b142ef5dd7a6e5a21abf43d4d21846c9f1eb794 1 parent 64099e3
@claudep claudep authored
View
2  docs/ref/contrib/gis/gdal.txt
@@ -80,7 +80,7 @@ each feature in that layer.
>>> from django.contrib.gis.gdal import DataSource
>>> ds = DataSource(CITIES_PATH)
>>> ds.name # The exact filename may be different on your computer
- '/usr/local/lib/python2.6/site-packages/django/contrib/gis/tests/data/cities/cities.shp'
+ '/usr/local/lib/python2.7/site-packages/django/contrib/gis/tests/data/cities/cities.shp'
>>> ds.layer_count # This file only contains one layer
1
View
9 docs/ref/contrib/gis/install/index.txt
@@ -239,13 +239,14 @@ Python
^^^^^^
Although OS X comes with Python installed, users can use framework
-installers (`2.6`__ and `2.7`__ are available) provided by
+installers (`2.7`__, `3.2`__ and `3.3`__ are available) provided by
the Python Software Foundation. An advantage to using the installer is
that OS X's Python will remain "pristine" for internal operating system
use.
-__ http://python.org/ftp/python/2.6.6/python-2.6.6-macosx10.3.dmg
-__ http://python.org/ftp/python/2.7.3/
+__ http://python.org/ftp/python/2.7.5/
+__ http://python.org/ftp/python/3.2.5/
+__ http://python.org/ftp/python/3.3.2/
.. note::
@@ -284,7 +285,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::
View
50 docs/ref/contrib/gis/install/spatialite.txt
@@ -105,56 +105,6 @@ Finally, do the same for the SpatiaLite tools::
__ http://www.gaia-gis.it/gaia-sins/libspatialite-sources/
-.. _pysqlite2:
-
-pysqlite2
-^^^^^^^^^
-
-If you are on Python 2.6, you will also have to compile pysqlite2, because
-``SpatiaLite`` must be loaded as an external extension, and the required
-``enable_load_extension`` method is only available in versions 2.5+ of
-pysqlite2. Thus, download pysqlite2 2.6, and untar::
-
- $ wget http://pysqlite.googlecode.com/files/pysqlite-2.6.3.tar.gz
- $ tar xzf pysqlite-2.6.3.tar.gz
- $ cd pysqlite-2.6.3
-
-Next, use a text editor (e.g., ``emacs`` or ``vi``) 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::
-
- $ sudo python setup.py install
-
.. _spatialite_macosx:
Mac OS X-specific instructions

0 comments on commit 1b142ef

Please sign in to comment.
Something went wrong with that request. Please try again.