Merge f629db8 into 13bedfb

.gitignore

@@ -16,6 +16,7 @@ sdist/
 var/
 *.egg-info/
 *.egg
+*.eggs
 .installed.cfg
 
 # Installer logs

.travis.yml

@@ -1,138 +1,68 @@
 language: python
 dist: xenial
-
-matrix:
+python:
+  - 3.6
+  - 3.7
+  - 3.8
+env:
+  - DJANGO=1.11 PACKAGE=pil
+  - DJANGO=1.11 PACKAGE=imagemagick
+  - DJANGO=1.11 PACKAGE=graphicsmagick
+  - DJANGO=1.11 PACKAGE=redis
+  - DJANGO=1.11 PACKAGE=wand
+  - DJANGO=1.11 PACKAGE=dbm
+
+  - DJANGO=2.2  PACKAGE=pil
+  - DJANGO=2.2  PACKAGE=imagemagick
+  - DJANGO=2.2  PACKAGE=graphicsmagick
+  - DJANGO=2.2  PACKAGE=redis
+  - DJANGO=2.2  PACKAGE=wand
+  - DJANGO=2.2  PACKAGE=dbm
+
+  - DJANGO=3.0  PACKAGE=pil
+  - DJANGO=3.0  PACKAGE=imagemagick
+  - DJANGO=3.0  PACKAGE=graphicsmagick
+  - DJANGO=3.0  PACKAGE=redis
+  - DJANGO=3.0  PACKAGE=wand
+  - DJANGO=3.0  PACKAGE=dbm
+jobs:
   include:
-    - python: "3.6"
-      env: TOXENV=py36-django111-pil
-    - python: "3.6"
-      env: TOXENV=py36-django111-imagemagick
-    - python: "3.6"
-      env: TOXENV=py36-django111-graphicsmagick
-    - python: "3.6"
-      env: TOXENV=py36-django111-redis
-    - python: "3.6"
-      env: TOXENV=py36-django111-wand
-    - python: "3.6"
-      env: TOXENV=py36-django111-dbm
-    - python: 3.6
-      env: TOXENV=flake8
-
-    - python: "3.6"
-      env: TOXENV=py36-django20-pil
-    - python: "3.6"
-      env: TOXENV=py36-django20-imagemagick
-    - python: "3.6"
-      env: TOXENV=py36-django20-graphicsmagick
-    - python: "3.6"
-      env: TOXENV=py36-django20-redis
-    - python: "3.6"
-      env: TOXENV=py36-django20-wand
-    - python: "3.6"
-      env: TOXENV=py36-django20-dbm
-
-    - python: "3.6"
-      env: TOXENV=py36-django21-pil
-    - python: "3.6"
-      env: TOXENV=py36-django21-imagemagick
-    - python: "3.6"
-      env: TOXENV=py36-django21-graphicsmagick
-    - python: "3.6"
-      env: TOXENV=py36-django21-redis
-    - python: "3.6"
-      env: TOXENV=py36-django21-wand
-    - python: "3.6"
-      env: TOXENV=py36-django21-dbm
-
-    - python: "3.6"
-      env: TOXENV=py36-django30-pil
-
-    - python: "3.7"
-      env: TOXENV=py37-django20-pil
-    - python: "3.7"
-      env: TOXENV=py37-django21-pil
-
-    - python: "3.7"
-      env: TOXENV=py37-django22-pil
-    - python: "3.7"
-      env: TOXENV=py37-django22-imagemagick
-    - python: "3.7"
-      env: TOXENV=py37-django22-graphicsmagick
-    - python: "3.7"
-      env: TOXENV=py37-django22-redis
-    - python: "3.7"
-      env: TOXENV=py37-django22-wand
-    - python: "3.7"
-      env: TOXENV=py37-django22-dbm
-
-    - python: "3.7"
-      env: TOXENV=py37-django30-pil
-    - python: "3.7"
-      env: TOXENV=py37-django30-imagemagick
-    - python: "3.7"
-      env: TOXENV=py37-django30-graphicsmagick
-    - python: "3.7"
-      env: TOXENV=py37-django30-redis
-    - python: "3.7"
-      env: TOXENV=py37-django30-wand
-    - python: "3.7"
-      env: TOXENV=py37-django30-dbm
-
-    - python: "3.8"
-      env: TOXENV=py38-django30-pil
-    - python: "3.8"
-      env: TOXENV=py38-django30-imagemagick
-    - python: "3.8"
-      env: TOXENV=py38-django30-graphicsmagick
-    - python: "3.8"
-      env: TOXENV=py38-django30-redis
-    - python: "3.8"
-      env: TOXENV=py38-django30-wand
-    - python: "3.8"
-      env: TOXENV=py38-django30-dbm
-
+    - stage: deploy
+      env:
+      python: 3.6
+      script: skip
+      deploy:
+        provider: pypi
+        user: jazzband
+        server: https://jazzband.co/projects/sorl-thumbnail/upload
+        distributions: sdist bdist_wheel
+        password:
+          secure: BZlzJyqEbo1nofxEqeE12EyIcM6ldJL40yDRo62qk1dBirUV+eJQN3kTJtKTqVgTMRalQJKqMZgbhWtvxo2wsuBx+JW3LlfjYuY/fNzj/+5x7Tq/NEy4HyBj4RdWdincmdvQ0n4ixar6cDr79KjHUzC9Db3psbTRE6+Vw0EJTM4=
+        skip_existing: true
+        on:
+          tags: true
+          repo: jazzband/sorl-thumbnail
+          python: 3.6
 addons:
   apt:
     packages:
       - libgraphicsmagick1-dev
-      # - libgraphicsmagick++1-dev
-      # - libboost-python-dev
       - graphicsmagick
       - libjpeg62
       - zlib1g-dev
-
 cache:
-  apt: true
-  directories:
-    - .tox
-    - $HOME/.cache/pip
-
+  pip: true
 after_failure:
   - cat /home/travis/.pip/pip.log
-
-after_success: coveralls
-
+after_success:
+  - coveralls
 install:
-  - pip install --upgrade pip
-  - pip install -q tox coveralls
-
+  - pip install tox-travis coveralls
 script:
   - env | sort
   - tox
-
 services:
   - redis-server
-
 notifications:
   email: false
 
-deploy:
-  provider: pypi
-  user: jazzband
-  server: https://jazzband.co/projects/sorl-thumbnail/upload
-  distributions: sdist bdist_wheel
-  password:
-    secure: BZlzJyqEbo1nofxEqeE12EyIcM6ldJL40yDRo62qk1dBirUV+eJQN3kTJtKTqVgTMRalQJKqMZgbhWtvxo2wsuBx+JW3LlfjYuY/fNzj/+5x7Tq/NEy4HyBj4RdWdincmdvQ0n4ixar6cDr79KjHUzC9Db3psbTRE6+Vw0EJTM4=
-  on:
-    tags: true
-    repo: jazzband/sorl-thumbnail

docs/conf.py

@@ -11,24 +11,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import os
-import sphinx
-import sys
-
-sys.path.insert(0, os.path.pardir)
-import sorl
-
-for j in xrange(0, len(sphinx.__version__)):
-    try:
-        version = float(sphinx.__version__[:-j])
-        break
-    except ValueError:
-        pass
-    version = 0
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
+import pkg_resources
 
 # -- General configuration -----------------------------------------------------
 
@@ -37,10 +20,7 @@
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-if version < 1.0:
-    extensions = ['sphinx.ext.autodoc', 'sphinx.ext.coverage']
-else:
-    extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.viewcode']
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.viewcode']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -55,17 +35,17 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'sorl-thumbnail'
-copyright = u'2010, Mikko Hellsing'
+project = 'sorl-thumbnail'
+copyright = '2010, Mikko Hellsing'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = sorl.__version__
+version = pkg_resources.get_distribution('sorl-thumbnail').version
 # The full version, including alpha/beta/rc tags.
-release = sorl.__version__
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -193,8 +173,8 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'sorlthumbnail.tex', u'sorl-thumbnail Documentation',
-   u'Mikko Hellsing', 'manual'),
+  ('index', 'sorlthumbnail.tex', 'sorl-thumbnail Documentation',
+   'Mikko Hellsing', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -226,6 +206,6 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'sorlthumbnail', u'sorl-thumbnail Documentation',
-     [u'Mikko Hellsing'], 1)
+    ('index', 'sorlthumbnail', 'sorl-thumbnail Documentation',
+     ['Mikko Hellsing'], 1)
 ]

docs/reference/settings.rst

@@ -160,7 +160,7 @@ The storage class to use for the generated thumbnails.
 
 
 ``THUMBNAIL_REDIS_URL``
-======================
+=======================
 
 The Redis database URL to connect as used by `redis-py <https://redis-py.readthedocs.io/en/latest/#redis.Redis.from_url>`_
 

setup.py

@@ -1,8 +1,7 @@
-# -*- encoding: utf8 -*-
 from setuptools import setup, find_packages
 from setuptools.command.test import test
 
-from sorl import __version__, __author__, __maintainer__, __email__, __license__
+from sorl import __author__, __maintainer__, __email__, __license__
 
 
 class TestCommand(test):
@@ -14,7 +13,7 @@ def run(self):
 
 setup(
     name='sorl-thumbnail',
-    version=__version__,
+    use_scm_version=True,
     description='Thumbnails for Django',
     long_description=open('README.rst').read(),
     author=__author__,
@@ -33,19 +32,16 @@ def run(self):
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
         'Topic :: Multimedia :: Graphics',
         'Framework :: Django',
         'Framework :: Django :: 1.11',
-        'Framework :: Django :: 2.0',
-        'Framework :: Django :: 2.1',
         'Framework :: Django :: 2.2',
         'Framework :: Django :: 3.0',
     ],
     cmdclass={"test": TestCommand},
+    setup_requires=['setuptools_scm'],
 )

sorl/__init__.py

@@ -5,7 +5,6 @@
 
 __author__ = "Mikko Hellsing"
 __license__ = "BSD"
-__version__ = '12.6.0'
 __maintainer__ = "Jazzband"
 __email__ = "mariocesar@humanzilla.com"
 

sorl/thumbnail/__init__.py

@@ -1,4 +1,3 @@
 from sorl.thumbnail.fields import ImageField
 from sorl.thumbnail.shortcuts import get_thumbnail, delete
-from sorl import __version__
 

sorl/thumbnail/engines/pil_engine.py

@@ -277,7 +277,7 @@ def _get_raw_data(self, image, format_, quality, image_info=None, progressive=Fa
             # Do not save unnecessary exif data for smaller thumbnail size
             params.pop('exif', {})
             image.save(bf, **params)
-        except (IOError, OSError):
+        except OSError:
             # Try without optimization.
             params.pop('optimize')
             image.save(bf, **params)