Skip to content

Commit

Permalink
Version 1.1.
Browse files Browse the repository at this point in the history
Includes Travis testing of Python 3.
  • Loading branch information
dracos committed Jul 4, 2014
1 parent 0f43e73 commit e77707a
Show file tree
Hide file tree
Showing 9 changed files with 65 additions and 77 deletions.
11 changes: 2 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,13 @@ matrix:
exclude:
- python: "3.3"
env: MODULES="Django>=1.4,<1.5 django-tastypie==0.9.16"
# Remove the following two exclusions once SayIt is compatible with Python 3.
- python: "3.3"
env: MODULES="Django>=1.5,<1.6 django-tastypie>=0.10.0"
- python: "3.3"
env: MODULES="Django>=1.6,<1.7 django-tastypie>=0.10.0"

install:
- sudo apt-get update -qq
- sudo apt-get install -qq ffmpeg libavcodec-extra-53 iceweasel xvfb
- gem install --conservative --no-ri --no-rdoc sass -v 3.2.14
- gem install --conservative --no-ri --no-rdoc compass -v 0.12.2
- gem install --conservative --no-ri --no-rdoc zurb-foundation -v 4.3.2
- pip install $MODULES
- pip install -r requirements-testing.txt
- if [ $TRAVIS_PYTHON_VERSION = 3.3 ]; then pip install -r requirements-py3.txt; fi
- pip install -e .[test]

before_script:
- psql -c 'create database "sayit-example-project";' -U postgres
Expand Down
19 changes: 19 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
v1.1, 2014-07-04
* Display improvements, including to the default front page, the speech
detail page, nicer empty content messages and various tweaks
* Editing improvements, including a much nicer speech editing form, with
inline creation of new speakers and sections
* django-popolo is now used to store people data
* Python 3 compatibility
* Removal of unneeded dependencies
* Included git pre-commit hook for CSS compilation
* Realtime search processer enabled in the example project
* Akoma Ntoso import
* Support coverPage and docTitle
* Log rather than die on error
* Namespace handling fix

Thanks to Richard Lewis, James McKinney, Duncan Parkes, Matthew Somerville, and
Zarino Zappia for their work on this release.

v1.0, 2014-04-16 -- Initial release.
3 changes: 2 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
recursive-include web *
include *.txt
recursive-include speeches/locale *
recursive-include speeches/static *
recursive-include speeches/templates *

12 changes: 0 additions & 12 deletions requirements-dev.txt

This file was deleted.

1 change: 1 addition & 0 deletions requirements-py3.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-e git+https://bitbucket.org/jpmckinney/django-bleach.git@python3#egg=django-bleach
5 changes: 0 additions & 5 deletions requirements-scraping.txt

This file was deleted.

11 changes: 0 additions & 11 deletions requirements-testing.txt

This file was deleted.

32 changes: 0 additions & 32 deletions requirements.txt

This file was deleted.

48 changes: 41 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,29 +1,63 @@
from setuptools import setup, find_packages
import os
import sys

file_dir = os.path.abspath(os.path.dirname(__file__))

def read_file(filename):
filepath = os.path.join(file_dir, 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
# Fix for Select2 py3 branching
if sys.version_info >= (3,):
select2 = 'Django-Select2-Py3 >= 4.2.1, < 4.3'
else:
select2 = 'Django-Select2 >= 4.2.2, < 4.3'

setup(
name="django-sayit",
version='1.0.0',
version='1.1.0',
description='A data store for speeches and transcripts to make them searchable and pretty.',
long_description=read_file('README.rst'),
author='mySociety',
author_email='sayit@mysociety.org',
url='https://github.com/mysociety/sayit',
packages=find_packages(exclude=('example_project', 'example_project.*')),
include_package_data=True,
install_requires=install_requires(),
install_requires=[
'psycopg2 >= 2.5.1, < 2.6',
'pytz >= 2013d',
'six >= 1.4.1',
'Django >= 1.4, < 1.7',
select2,
'django-qmethod == 0.0.3',
'django-bleach >= 0.1.5',
'audioread >= 1.0.1',
'pyelasticsearch >= 0.6, < 0.7',
'django-haystack >= 2.1, < 2.2',
'mysociety-django-popolo >= 0.0.2',
'mysociety-django-sluggable >= 0.2.5',
'django-subdomain-instances >= 0.4',
],
extras_require={
'test': [
'selenium',
'mock',
'django-nose == 1.2',
'Mutagen',
],
'develop': [
'django-debug-toolbar',
'python-dateutil < 2',
'lxml',
'South',
'popit-django == 0.0.3',
],
'scraping': [
'beautifulsoup4',
'requests_cache',
],
},
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment',
Expand Down

0 comments on commit e77707a

Please sign in to comment.