Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Removed Python 2.6 references in GIS docs

Refs #20746.
  • Loading branch information...
commit 1b142ef5dd7a6e5a21abf43d4d21846c9f1eb794 1 parent 64099e3
Claude Paroz authored July 13, 2013
2  docs/ref/contrib/gis/gdal.txt
@@ -80,7 +80,7 @@ each feature in that layer.
80 80
        >>> from django.contrib.gis.gdal import DataSource
81 81
        >>> ds = DataSource(CITIES_PATH)
82 82
        >>> ds.name                         # The exact filename may be different on your computer
83  
-       '/usr/local/lib/python2.6/site-packages/django/contrib/gis/tests/data/cities/cities.shp'
  83
+       '/usr/local/lib/python2.7/site-packages/django/contrib/gis/tests/data/cities/cities.shp'
84 84
        >>> ds.layer_count                  # This file only contains one layer
85 85
        1
86 86
 
9  docs/ref/contrib/gis/install/index.txt
@@ -239,13 +239,14 @@ Python
239 239
 ^^^^^^
240 240
 
241 241
 Although OS X comes with Python installed, users can use framework
242  
-installers (`2.6`__ and `2.7`__ are available) provided by
  242
+installers (`2.7`__, `3.2`__ and `3.3`__ are available) provided by
243 243
 the Python Software Foundation.  An advantage to using the installer is
244 244
 that OS X's Python will remain "pristine" for internal operating system
245 245
 use.
246 246
 
247  
-__ http://python.org/ftp/python/2.6.6/python-2.6.6-macosx10.3.dmg
248  
-__ http://python.org/ftp/python/2.7.3/
  247
+__ http://python.org/ftp/python/2.7.5/
  248
+__ http://python.org/ftp/python/3.2.5/
  249
+__ http://python.org/ftp/python/3.3.2/
249 250
 
250 251
 .. note::
251 252
 
@@ -284,7 +285,7 @@ William Kyngesburye provides a number of `geospatial library binary packages`__
284 285
 that make it simple to get GeoDjango installed on OS X without compiling
285 286
 them from source.  However, the `Apple Developer Tools`_ are still necessary
286 287
 for compiling the Python database adapters :ref:`psycopg2_kyngchaos` (for PostGIS)
287  
-and :ref:`pysqlite2` (for SpatiaLite).
  288
+and ``pysqlite2`` (for SpatiaLite).
288 289
 
289 290
 .. note::
290 291
 
50  docs/ref/contrib/gis/install/spatialite.txt
@@ -105,56 +105,6 @@ Finally, do the same for the SpatiaLite tools::
105 105
 
106 106
 __ http://www.gaia-gis.it/gaia-sins/libspatialite-sources/
107 107
 
108  
-.. _pysqlite2:
109  
-
110  
-pysqlite2
111  
-^^^^^^^^^
112  
-
113  
-If you are on Python 2.6, you will also have to compile pysqlite2, because
114  
-``SpatiaLite`` must be loaded as an external extension, and the required
115  
-``enable_load_extension`` method is only available in versions 2.5+ of
116  
-pysqlite2. Thus, download pysqlite2 2.6, and untar::
117  
-
118  
-    $ wget http://pysqlite.googlecode.com/files/pysqlite-2.6.3.tar.gz
119  
-    $ tar xzf pysqlite-2.6.3.tar.gz
120  
-    $ cd pysqlite-2.6.3
121  
-
122  
-Next, use a text editor (e.g., ``emacs`` or ``vi``) to edit the ``setup.cfg`` file
123  
-to look like the following:
124  
-
125  
-.. code-block:: ini
126  
-
127  
-    [build_ext]
128  
-    #define=
129  
-    include_dirs=/usr/local/include
130  
-    library_dirs=/usr/local/lib
131  
-    libraries=sqlite3
132  
-    #define=SQLITE_OMIT_LOAD_EXTENSION
133  
-
134  
-or if you are on Mac OS X:
135  
-
136  
-.. code-block:: ini
137  
-
138  
-    [build_ext]
139  
-    #define=
140  
-    include_dirs=/Library/Frameworks/SQLite3.framework/unix/include
141  
-    library_dirs=/Library/Frameworks/SQLite3.framework/unix/lib
142  
-    libraries=sqlite3
143  
-    #define=SQLITE_OMIT_LOAD_EXTENSION
144  
-
145  
-.. note::
146  
-
147  
-    The important thing here is to make sure you comment out the
148  
-    ``define=SQLITE_OMIT_LOAD_EXTENSION`` flag and that the ``include_dirs``
149  
-    and ``library_dirs`` settings are uncommented and set to the appropriate
150  
-    path if the SQLite header files and libraries are not in ``/usr/include``
151  
-    and ``/usr/lib``, respectively.
152  
-
153  
-After modifying ``setup.cfg`` appropriately, then run the ``setup.py`` script
154  
-to build and install::
155  
-
156  
-    $ sudo python setup.py install
157  
-
158 108
 .. _spatialite_macosx:
159 109
 
160 110
 Mac OS X-specific instructions

0 notes on commit 1b142ef

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