Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
* master:
  Bump version to 5.0.0
  Update setup.py
  Update advanced_usage.rst
  • Loading branch information
vstoykov committed Sep 28, 2023
2 parents b1ff281 + 697b27f commit 92dff00
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
2 changes: 1 addition & 1 deletion docs/advanced_usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ for getting this information.
@property
def processors(self):
model, field_name = get_field_info(self.source)
return [ResizeToFill(model.thumbnail_width, thumbnail.avatar_height)]
return [ResizeToFill(model.thumbnail_width, model.thumbnail_height)]
register.generator('myapp:profile:avatar_thumbnail', AvatarThumbnail)
Expand Down
2 changes: 1 addition & 1 deletion imagekit/pkgmeta.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
__title__ = 'django-imagekit'
__author__ = 'Matthew Tretter, Venelin Stoykov, Eric Eldredge, Bryan Veloso, Greg Newman, Chris Drackett, Justin Driscoll'
__version__ = '4.1.0'
__version__ = '5.0.0'
__license__ = 'BSD'
__all__ = ['__title__', '__author__', '__version__', '__license__']
17 changes: 12 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@


if 'publish' in sys.argv:
os.system('python setup.py sdist bdist_wheel upload')
os.system('python3 -m build')
os.system('python3 -m twine upload --repository django_imagekit dist/*')
sys.exit()


Expand All @@ -22,8 +23,10 @@ def exec_file(filepath, globalz=None, localz=None):

# Load package meta from the pkgmeta module without loading imagekit.
pkgmeta = {}
exec_file(os.path.join(os.path.dirname(__file__),
'imagekit', 'pkgmeta.py'), pkgmeta)
exec_file(
os.path.join(os.path.dirname(__file__), 'imagekit', 'pkgmeta.py'),
pkgmeta
)


setup(
Expand All @@ -33,8 +36,8 @@ def exec_file(filepath, globalz=None, localz=None):
long_description=read(os.path.join(os.path.dirname(__file__), 'README.rst')),
author='Matthew Tretter',
author_email='m@tthewwithanm.com',
maintainer='Bryan Veloso',
maintainer_email='bryan@revyver.com',
maintainer='Venelin Stoykov',
maintainer_email='venelin.stoykov@industria.tech',
license='BSD',
url='http://github.com/matthewwithanm/django-imagekit/',
packages=find_packages(exclude=['*.tests', '*.tests.*', 'tests.*', 'tests']),
Expand All @@ -56,11 +59,15 @@ def exec_file(filepath, globalz=None, localz=None):
'Intended Audience :: Developers',
'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3 :: Only',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Topic :: Utilities'
],
)

0 comments on commit 92dff00

Please sign in to comment.