Skip to content

Commit

Permalink
Update package installation details.
Browse files Browse the repository at this point in the history
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 and django-bleach.
  • Loading branch information
dracos committed Jun 11, 2018
1 parent a3f1e19 commit b84d271
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions setup.py
Expand Up @@ -10,12 +10,10 @@ def read_file(filename):
return open(filepath).read()


# Fix for dateutil/SSL py3 support
# Fix for SSL py3 support
if sys.version_info >= (3,):
dateutil = 'python-dateutil >= 2'
ssl = []
else:
dateutil = 'python-dateutil < 2'
# @see https://github.com/kennethreitz/requests/blob/master/requests/packages/urllib3/contrib/pyopenssl.py
ssl = [
'pyOpenSSL >= 0.14',
Expand All @@ -39,15 +37,16 @@ def read_file(filename):
packages=find_packages(exclude=('example_project', 'example_project.*')),
include_package_data=True,
install_requires=[
'psycopg2 >= 2.5.1, < 2.6',
'psycopg2 >= 2.7.4',
'pytz >= 2013d',
'six >= 1.4.1',
django,
'lxml',
'mysociety-Django-Select2 == 4.3.2.1',
'audioread >= 1.0.1',
'elasticsearch >= 0.4',
'django-haystack >= 2.5, < 2.6',
'django-bleach >= 0.2.1',
'django-bleach >= 0.3.0',
'mysociety-django-popolo >= 0.0.5',
'mysociety-django-sluggable >= 0.2.7',
'django-subdomain-instances >= 2.0',
Expand All @@ -60,8 +59,7 @@ def read_file(filename):
'mock',
'django-nose == 1.4.4',
'Mutagen',
'lxml',
dateutil,
'python-dateutil >= 2.1',
'requests_cache',
],
'develop': [
Expand Down

0 comments on commit b84d271

Please sign in to comment.