Version 1.3.

Remove Django/South from packages files, and put requirements in
setup.py rather than requirements.txt.

.travis.yml

@@ -32,7 +32,7 @@ install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq gdal-bin binutils
   - pip install $MODULES
-  - pip install -r requirements.txt
+  - CFLAGS="-O0" pip install -e .
 # The below is for Django 1.4 compatibility. If you don't need that, you could
 # just do the before_script step commented out below.
   - createdb -E UTF8 template_postgis &&

CHANGES.txt

@@ -1,3 +1,19 @@
+v1.3, 2015-02-12
+    * Ubuntu Trusty Tahr support. #156
+    * Django 1.8 support, subject to it not being finished yet. #165
+    * Stream JSON output, and HTML lists of areas, to use much less memory on
+      very large responses. #164
+    * Italy country app, thanks Guglielmo Celata. #147 #153
+    * South Africa country app, thanks Mark Longair. #155
+    * Add setting for whether this installation uses postcodes.
+    * Add HTML version of /generations endpoint.
+    * Bugfixes:
+        * Fix nginx example config for static file serving. #162
+        * Catch invalid SRID exceptions, and return 400. #157
+        * Cache 0, not '0', to avoid a LocMem incr error.
+        * Move country specific examples to country app templates.
+        * Improve handling of bad /areas/ URLs, such as </areas/,123>.
+
 v1.2.1, 2014-12-16
     * Fix bug when importing non-ASCII named geometry data.
 

MANIFEST.in

@@ -1,4 +1,4 @@
-include LICENSE.txt README.rst requirements.txt
+include LICENSE.txt README.rst
 recursive-include project *.py
 recursive-include mapit *.html *.json *.sql 
 recursive-include mapit/static *

conf/packages

@@ -3,14 +3,11 @@ postgresql-9.1-postgis | postgresql-8.4-postgis | postgresql-8.3-postgis
 libgdal1 | libgdal1-1.6.0 | libgdal1-1.5.0
 memcached
 python-virtualenv
+ruby-sass
+libapache2-mod-wsgi
 
-python-django
-python-django-south
 python-psycopg2
+python-shapely
 python-yaml
 python-memcache
 python-gdal
-
-libapache2-mod-wsgi
-ruby-sass
-python-shapely

conf/packages.debian-squeeze

@@ -3,9 +3,8 @@ postgresql-8.4-postgis
 libgdal1-1.6.0
 memcached
 python-virtualenv
+libhaml-ruby
 
-python-django
-python-django-south
 python-psycopg2
 python-shapely
 python-yaml

conf/packages.debian-wheezy

@@ -5,8 +5,6 @@ memcached
 python-virtualenv
 ruby-sass
 
-python-django
-python-django-south
 python-psycopg2
 python-shapely
 python-yaml

conf/packages.ubuntu-precise

@@ -5,8 +5,6 @@ memcached
 python-virtualenv
 ruby-sass
 
-python-django
-python-django-south
 python-psycopg2
 python-shapely
 python-yaml

conf/packages.ubuntu-trusty

@@ -5,8 +5,6 @@ memcached
 python-virtualenv
 ruby-sass
 
-python-django
-python-django-south
 python-psycopg2
 python-shapely
 python-yaml

conf/post_deploy_actions.bash

@@ -34,7 +34,7 @@ source $virtualenv_activate
 curl -L -s https://raw.github.com/mysociety/commonlib/master/bin/get_pip.bash | bash
 
 # Install all the packages
-pip install -r requirements.txt
+pip install -e .
 
 # make sure that there is no old code (the .py files may have been git deleted) 
 find . -name '*.pyc' -delete

setup.py

@@ -9,16 +9,9 @@ def read_file(filename):
     return open(filepath).read()
 
 
-def install_requires():
-    reqs = read_file('requirements.txt')
-    reqs = reqs.splitlines()
-    reqs = [x for x in reqs if x and x[0] != '#' and x[0:2] != '-e']
-    return reqs
-
-
 setup(
     name='django-mapit',
-    version='1.2.1',
+    version='1.3',
     description=(
         'A web service for mapping postcodes and points to current or past '
         'administrative area information and polygons.'),
@@ -30,7 +23,13 @@ def install_requires():
     packages=find_packages(exclude=['project']),
     scripts=['bin/mapit_make_css'],
     include_package_data=True,
-    install_requires=install_requires(),
+    install_requires=[
+        'Django >= 1.4.18',
+        'South == 1.0.2',
+        'psycopg2',
+        'PyYAML',
+        'Shapely',
+    ],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',