-
-
Notifications
You must be signed in to change notification settings - Fork 497
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Use setuptools_scm for deployment version number inference. - Only run deployment once after all tests have passed. - Skip deployment on existing packages on PyPI mirror. - Deprecate EOL Python versions from the codebase. - Utilize tox-travis and Travis test matrices. - Clean up test scripts and definitions. Fixes jazzband/help#182
- Loading branch information
1 parent
13bedfb
commit 8673a91
Showing
9 changed files
with
119 additions
and
215 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,6 +16,7 @@ sdist/ | |
| var/ | ||
| *.egg-info/ | ||
| *.egg | ||
| .eggs | ||
| .installed.cfg | ||
|
|
||
| # Installer logs | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,6 @@ | ||
| # -*- encoding: utf8 -*- | ||
| from setuptools import setup, find_packages | ||
| from setuptools.command.test import test | ||
|
|
||
| from sorl import __version__, __author__, __maintainer__, __email__, __license__ | ||
|
|
||
|
|
||
| class TestCommand(test): | ||
| def run(self): | ||
|
|
@@ -14,17 +11,18 @@ 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__, | ||
| author="Mikko Hellsing", | ||
| author_email='[email protected]', | ||
| maintainer=__maintainer__, | ||
| maintainer_email=__email__, | ||
| license=__license__, | ||
| maintainer="Jazzband", | ||
| maintainer_email="[email protected]", | ||
| license="BSD", | ||
| url='https://github.com/jazzband/sorl-thumbnail', | ||
| packages=find_packages(exclude=['tests', 'tests.*']), | ||
| platforms='any', | ||
| python_requires='>=3.6', | ||
| zip_safe=False, | ||
| classifiers=[ | ||
| 'Development Status :: 2 - Pre-Alpha', | ||
|
|
@@ -33,19 +31,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'], | ||
| ) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,6 @@ | ||
| # encoding=utf-8 | ||
| from __future__ import unicode_literals | ||
| from pkg_resources import get_distribution, DistributionNotFound | ||
|
|
||
| import logging | ||
|
|
||
| __author__ = "Mikko Hellsing" | ||
| __license__ = "BSD" | ||
| __version__ = '12.6.0' | ||
| __maintainer__ = "Jazzband" | ||
| __email__ = "[email protected]" | ||
|
|
||
|
|
||
| class NullHandler(logging.Handler): | ||
| def emit(self, record): | ||
| pass | ||
|
|
||
|
|
||
| # Add a logging handler that does nothing to silence messages with no logger | ||
| # configured | ||
| logging.getLogger('sorl').addHandler(NullHandler()) | ||
| try: | ||
| __version__ = get_distribution("sorl-thumbnail").version | ||
| except DistributionNotFound: | ||
| pass |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| from sorl.thumbnail.fields import ImageField | ||
| from sorl.thumbnail.shortcuts import get_thumbnail, delete | ||
| from sorl import __version__ | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.