Skip to content

Commit

Permalink
Version 1.3.
Browse files Browse the repository at this point in the history
Remove Django/South from packages files, and put requirements in
setup.py rather than reqirements.txt.
  • Loading branch information
dracos committed Feb 12, 2015
1 parent 9212c49 commit 3e633e1
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down
16 changes: 16 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
v1.3, 2015-02-12
* Ubuntu Trusty Tahr support. #156
* Django 1.8 support. #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.

Expand Down
9 changes: 3 additions & 6 deletions conf/packages
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions conf/packages.debian-squeeze
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions conf/packages.debian-wheezy
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ memcached
python-virtualenv
ruby-sass

python-django
python-django-south
python-psycopg2
python-shapely
python-yaml
Expand Down
2 changes: 0 additions & 2 deletions conf/packages.ubuntu-precise
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ memcached
python-virtualenv
ruby-sass

python-django
python-django-south
python-psycopg2
python-shapely
python-yaml
Expand Down
2 changes: 0 additions & 2 deletions conf/packages.ubuntu-trusty
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ memcached
python-virtualenv
ruby-sass

python-django
python-django-south
python-psycopg2
python-shapely
python-yaml
Expand Down
5 changes: 0 additions & 5 deletions requirements.txt

This file was deleted.

17 changes: 8 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.'),
Expand All @@ -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',
Expand Down

2 comments on commit 3e633e1

@mhl
Copy link
Contributor

@mhl mhl commented on 3e633e1 Feb 12, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think conf/post_deploy_actions.bash still references requirements.txt (as does MANIFEST.in)

@dracos
Copy link
Member Author

@dracos dracos commented on 3e633e1 Feb 12, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doh, ta.

Please sign in to comment.