Merge branch 'release/4.0.1' into develop

* release/4.0.1:
  stylling and linting fixes to setup.py
  Bump version to 4.0.1
This commit is contained in:
Venelin Stoykov 2017-05-17 18:20:52 +03:00
commit c3dbb1edf0
2 changed files with 6 additions and 4 deletions

View file

@ -1,5 +1,5 @@
__title__ = 'django-imagekit'
__author__ = 'Matthew Tretter, Venelin Stoykov, Eric Eldredge, Bryan Veloso, Greg Newman, Chris Drackett, Justin Driscoll'
__version__ = '4.0'
__version__ = '4.0.1'
__license__ = 'BSD'
__all__ = ['__title__', '__author__', '__version__', '__license__']

View file

@ -1,4 +1,4 @@
#/usr/bin/env python
#!/usr/bin/env python
import codecs
import os
from setuptools import setup, find_packages
@ -7,7 +7,7 @@ import sys
# Workaround for multiprocessing/nose issue. See http://bugs.python.org/msg170215
try:
import multiprocessing
import multiprocessing # NOQA
except ImportError:
pass
@ -19,13 +19,15 @@ if 'publish' in sys.argv:
read = lambda filepath: codecs.open(filepath, 'r', 'utf-8').read()
def exec_file(filepath, globalz=None, localz=None):
exec(read(filepath), globalz, localz)
# Load package meta from the pkgmeta module without loading imagekit.
pkgmeta = {}
exec_file(os.path.join(os.path.dirname(__file__),
'imagekit', 'pkgmeta.py'), pkgmeta)
'imagekit', 'pkgmeta.py'), pkgmeta)
setup(