Skip to content

Commit 89952e6

Browse files
committed
Update package installation details.
No special dateutil code needed any longer, lxml should always be installed (it's included from the importer included from speeches.views), and we need a more up-to-date psycopg2, django-bleach and django-nose.
1 parent a3f1e19 commit 89952e6

1 file changed

Lines changed: 6 additions & 8 deletions

File tree

setup.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,10 @@ def read_file(filename):
1010
return open(filepath).read()
1111

1212

13-
# Fix for dateutil/SSL py3 support
13+
# Fix for SSL py3 support
1414
if sys.version_info >= (3,):
15-
dateutil = 'python-dateutil >= 2'
1615
ssl = []
1716
else:
18-
dateutil = 'python-dateutil < 2'
1917
# @see https://github.com/kennethreitz/requests/blob/master/requests/packages/urllib3/contrib/pyopenssl.py
2018
ssl = [
2119
'pyOpenSSL >= 0.14',
@@ -39,15 +37,16 @@ def read_file(filename):
3937
packages=find_packages(exclude=('example_project', 'example_project.*')),
4038
include_package_data=True,
4139
install_requires=[
42-
'psycopg2 >= 2.5.1, < 2.6',
40+
'psycopg2 >= 2.7.4',
4341
'pytz >= 2013d',
4442
'six >= 1.4.1',
4543
django,
44+
'lxml',
4645
'mysociety-Django-Select2 == 4.3.2.1',
4746
'audioread >= 1.0.1',
4847
'elasticsearch >= 0.4',
4948
'django-haystack >= 2.5, < 2.6',
50-
'django-bleach >= 0.2.1',
49+
'django-bleach >= 0.3.0',
5150
'mysociety-django-popolo >= 0.0.5',
5251
'mysociety-django-sluggable >= 0.2.7',
5352
'django-subdomain-instances >= 2.0',
@@ -58,10 +57,9 @@ def read_file(filename):
5857
'test': [
5958
'selenium >= 3',
6059
'mock',
61-
'django-nose == 1.4.4',
60+
'django-nose == 1.4.5',
6261
'Mutagen',
63-
'lxml',
64-
dateutil,
62+
'python-dateutil >= 2.1',
6563
'requests_cache',
6664
],
6765
'develop': [

0 commit comments

Comments
 (0)