# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1484754659 -3600
# Node ID ae36a174a3e5353433260beed1669f1a90ca28c6
# Parent  6a1851ed271c4753e70210a74594a54d260dd00a
correct setup.py + base.txt

diff -r 6a1851ed271c -r ae36a174a3e5 src/requirements/base.txt
--- a/src/requirements/base.txt	Tue Jan 17 12:17:37 2017 +0100
+++ b/src/requirements/base.txt	Wed Jan 18 16:50:59 2017 +0100
@@ -5,13 +5,11 @@
 django-model-utils==2.6.1
 django-notifications-hq==1.2
 elasticsearch==5.1.0
-iconolab==0.0.19
 jsonfield==1.0.3
 olefile==0.44
 Pillow==4.0.0
-psycopg2==2.6.2
 pytz==2016.10
-requests==2.12.4
+requests==2.12.5
 six==1.10.0
 sorl-thumbnail==12.4a1
 urllib3==1.19.1
diff -r 6a1851ed271c -r ae36a174a3e5 src/requirements/prod.txt
--- a/src/requirements/prod.txt	Tue Jan 17 12:17:37 2017 +0100
+++ b/src/requirements/prod.txt	Wed Jan 18 16:50:59 2017 +0100
@@ -1,4 +1,4 @@
 -r base.txt
 pylibmc
 uWSGI
-psycopg2==2.6.2
+psycopg2
diff -r 6a1851ed271c -r ae36a174a3e5 src/setup.py
--- a/src/setup.py	Tue Jan 17 12:17:37 2017 +0100
+++ b/src/setup.py	Wed Jan 18 16:50:59 2017 +0100
@@ -96,28 +96,29 @@
                 m.write("include %s\n" % (filename))
 
     setup(
-        script_name = script_name,
-        script_args = script_args,
+        script_name=script_name,
+        script_args=script_args,
         name='iconolab',
         version=version,
         author='IRI',
         author_email='contact@iri.centrepompidou.fr',
         packages=packages,
         data_files=data_files,
-        cmdclass = cmdclasses,
+        cmdclass=cmdclasses,
         scripts=[],
         url='http://www.iri.centrepompidou.fr/dev/hg/iconolab',
         license='LICENSE',
         description='projet Iconolab',
         long_description=open('README.md').read(),
-        classifiers=['Development Status :: 4 - Beta',
-                       'Environment :: Web Environment',
-                       'Framework :: Django',
-                       'Intended Audience :: Developers',
-                       'License :: Ceccil-B',
-                       'Operating System :: OS Independent',
-                       'Programming Language :: Python',
-                       'Topic :: Utilities',
+        classifiers=[
+            'Development Status :: 4 - Beta',
+            'Environment :: Web Environment',
+            'Framework :: Django',
+            'Intended Audience :: Developers',
+            'License :: Ceccil-B',
+            'Operating System :: OS Independent',
+            'Programming Language :: Python',
+            'Topic :: Utilities'
         ],
         install_requires=[
             "Django >= 1.9",
@@ -128,11 +129,10 @@
             "elasticsearch",
             "jsonfield",
             "Pillow",
-            "psycopg2",
             "pytz",
             "requests",
             "six",
-            "sorl-thumbnail >= 12.4a1",
+            "sorl-thumbnail >= 12.4a1"
         ],
     )