Merge pull request #20 from plone/fix-19

Fix #19: Fix: Products.MimetypesRegistry used in p.a.blob.utils but no dependency
plone · Mar 7, 2015 · dd60e7e · dd60e7e
2 parents 8d749a7 + 1d1a7fc
commit dd60e7e
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 34 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,6 +4,9 @@ Changelog
 1.5.11 (unreleased)
 -------------------
 
+- Fix: Products.MimetypesRegistry used in p.a.blob.utils but no dependency
+  [jensens]
+
 - Fix some testes.
   [rafaelbco]
 

diff --git a/setup.py b/setup.py
@@ -1,5 +1,6 @@
+from setuptools import find_packages
+from setuptools import setup
 import os
-from setuptools import setup, find_packages
 
 
 def read(*rnames):
@@ -14,56 +15,58 @@ def read(*rnames):
     + '\n' +
     read('CHANGES.rst')
     + '\n'
-    )
+)
 
 tests_require = [
-    'collective.monkeypatcher',
     'Products.contentmigration',
+    'collective.monkeypatcher',
     'plone.app.imaging',
-    'plone.app.testing',]
+    'plone.app.testing',
+]
 
-setup(name='plone.app.blob',
-      version=version,
-      description='ZODB blob support for Plone',
-      #long_description=readme[readme.find('\n\n'):] + '\n' + history,
-      long_description=long_description,
-      keywords='zodb blob support plone integration',
-      author='Plone Foundation',
-      author_email='plone-developers@lists.sourceforge.net',
-      url='http://plone.org/products/plone.app.blob',
-      download_url='http://pypi.python.org/pypi/plone.app.blob/',
-      license='GPL version 2',
-      packages=find_packages('src'),
-      package_dir={'': 'src'},
-      namespace_packages=['plone', 'plone.app'],
-      include_package_data=True,
-      platforms='Any',
-      zip_safe=False,
-      install_requires=[
-        'setuptools',
+setup(
+    name='plone.app.blob',
+    version=version,
+    description='ZODB blob support for Plone',
+    long_description=long_description,
+    keywords='zodb blob support plone integration',
+    author='Plone Foundation',
+    author_email='plone-developers@lists.sourceforge.net',
+    url='http://plone.org/products/plone.app.blob',
+    download_url='http://pypi.python.org/pypi/plone.app.blob/',
+    license='GPL version 2',
+    packages=find_packages('src'),
+    package_dir={'': 'src'},
+    namespace_packages=['plone', 'plone.app'],
+    include_package_data=True,
+    platforms='Any',
+    zip_safe=False,
+    install_requires=[
+        'Products.MimetypesRegistry',
         'ZODB3 >=3.8.1',
-        'zope.proxy >=3.4',
         'archetypes.schemaextender >=1.6',
         'plone.app.imaging >1.0b9',
         'plone.scale',
-      ],
-      tests_require=tests_require,
-      extras_require={'test': tests_require},
-      classifiers=[
+        'setuptools',
+        'zope.proxy >=3.4',
+    ],
+    tests_require=tests_require,
+    extras_require={'test': tests_require},
+    classifiers=[
         'Environment :: Web Environment',
-        'Framework :: Plone',
         'Framework :: Plone :: 4.3',
         'Framework :: Plone :: 5.0',
+        'Framework :: Plone',
         'Intended Audience :: Developers',
-        'Intended Audience :: System Administrators',
         'Intended Audience :: Other Audience',
+        'Intended Audience :: System Administrators',
         'License :: OSI Approved :: GNU General Public License (GPL)',
         'Operating System :: OS Independent',
-        'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
-      ],
-      entry_points='''
+        'Programming Language :: Python',
+    ],
+    entry_points='''
         [z3c.autoinclude.plugin]
         target = plone
-      ''',
+    ''',
 )