Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated URLs in various locations. #706

Merged
merged 1 commit into from
Aug 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
; This file is for unifying the coding style for different editors and IDEs.
; More information at http://EditorConfig.org
; More information at https://EditorConfig.org

root = true

Expand Down
24 changes: 12 additions & 12 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Features at a glance
- Margin calculation for vertical positioning
- Alternative resolutions versions of a thumbnail

Read more in `the documentation (latest version) <http://sorl-thumbnail.rtfd.org/>`_
Read more in `the documentation (latest version) <https://sorl-thumbnail.readthedocs.io/>`_

Developers
==========
Expand Down Expand Up @@ -53,7 +53,7 @@ Vagrantfile in the repo.
User Support
============

If you need help using sorl-thumbnail browse http://stackoverflow.com/questions/tagged/sorl-thumbnail
If you need help using sorl-thumbnail browse https://stackoverflow.com/questions/tagged/sorl-thumbnail
and posts your questions with the `sorl-thumbnail` tag.


Expand Down Expand Up @@ -165,7 +165,7 @@ So it will avoid to overly query the S3 API.
:target: https://github.com/jazzband/sorl-thumbnail/actions
.. |docs| image:: https://readthedocs.org/projects/pip/badge/?version=latest
:alt: Documentation for latest version
:target: http://sorl-thumbnail.rtfd.org/en/latest/
:target: https://sorl-thumbnail.readthedocs.io/en/latest/
.. |pypi| image:: https://img.shields.io/pypi/v/sorl-thumbnail.svg
:target: https://pypi.python.org/pypi/sorl-thumbnail
:alt: sorl-thumbnail on PyPI
Expand All @@ -185,15 +185,15 @@ So it will avoid to overly query the S3 API.
:target: https://jazzband.co/
:alt: Jazzband

.. _`Pillow`: http://pillow.readthedocs.org/en/latest/
.. _`ImageMagick`: http://www.imagemagick.org/script/index.php
.. _`PIL`: http://www.pythonware.com/products/pil/
.. _`Wand`: http://docs.wand-py.org/
.. _`pgmagick`: http://pgmagick.readthedocs.org/en/latest/
.. _`vipsthumbnail`: http://www.vips.ecs.soton.ac.uk/index.php?title=VIPS
.. _`Pillow`: https://pillow.readthedocs.io/
.. _`ImageMagick`: https://imagemagick.org/
.. _`PIL`: https://python-pillow.org/
.. _`Wand`: https://docs.wand-py.org/
.. _`pgmagick`: https://pgmagick.readthedocs.io/
.. _`vipsthumbnail`: https://www.libvips.org/API/current/Using-vipsthumbnail.html

.. _`Template examples`: http://sorl-thumbnail.readthedocs.org/en/latest/examples.html#template-examples
.. _`Model examples`: http://sorl-thumbnail.readthedocs.org/en/latest/examples.html#model-examples
.. _`Low level API examples`: http://sorl-thumbnail.readthedocs.org/en/latest/examples.html#low-level-api-examples
.. _`Template examples`: https://sorl-thumbnail.readthedocs.io/en/latest/examples.html#template-examples
.. _`Model examples`: https://sorl-thumbnail.readthedocs.io/en/latest/examples.html#model-examples
.. _`Low level API examples`: https://sorl-thumbnail.readthedocs.io/en/latest/examples.html#low-level-api-examples
.. _`issue #351`: https://github.com/jazzband/sorl-thumbnail/issues/351
.. _`Django supported versions policy`: https://www.djangoproject.com/download/#supported-versions
8 changes: 4 additions & 4 deletions docs/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ You can get away without using Vagrant if you install all packages locally yours
however, this is not recommended.

.. _GitHub Actions: https://github.com/jazzband/sorl-thumbnail/actions
.. _Vagrant: http://www.vagrantup.com/
.. _tox: https://testrun.org/tox/latest/
.. _Install Vagrant: http://docs.vagrantup.com/v2/installation/index.html
.. _Vagrant file: https://docs.vagrantup.com/v2/virtualbox/configuration.html
.. _Vagrant: https://www.vagrantup.com/
.. _tox: https://tox.wiki/
.. _Install Vagrant: https://www.vagrantup.com/docs/installation
.. _Vagrant file: https://www.vagrantup.com/docs/providers/virtualbox/configuration
.. _vagrant-faster: https://github.com/rdsubhas/vagrant-faster

Sending pull requests
Expand Down
6 changes: 3 additions & 3 deletions docs/reference/settings.rst
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ ImageMagick ``convert`` or GraphicsMagic ``gm convert`` command. Features:
Wand
----------------------------
``'sorl.thumbnail.engines.wand_engine.Engine'``. This engine uses `Wand
<http://wand-py.org>`_, a ctypes-based simple ImageMagick binding for Python.
<https://docs.wand-py.org/>`_, a ctypes-based simple ImageMagick binding for Python.
Features:

* Easy to install
Expand Down Expand Up @@ -338,12 +338,12 @@ missing input source.
``THUMBNAIL_DUMMY_SOURCE``
==========================

- Default ``http://dummyimage.com/%(width)sx%(height)s``
- Default ``https://dummyimage.com/%(width)sx%(height)s``

This is the generated thumbnail whensource of the presented thumbnail. Width and
Height is passed to the string for formatting. Other options are for example:

- ``http://placehold.it/%(width)sx%(height)s``
- ``https://via.placeholder.com/%(width)sx%(height)s
- ``http://placekitten.com/%(width)s/%(height)s``


Expand Down
24 changes: 12 additions & 12 deletions docs/requirements.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ setup **redis** which requires a little bit more work.
Cached DB
---------
All you need to use the cached database key value store is a database and `cache
<http://docs.djangoproject.com/en/dev/topics/cache/>`_ setup properly using
<https://docs.djangoproject.com/en/dev/topics/cache/>`_ setup properly using
memcached. This cache needs to be really fast so **using anything else than
memcached is not recomended**.
memcached is not recommended**.

Redis
-----
Redis is a fast key value store also suited for the job. To use the `redis`_ key
value store you first need to install the `redis server
<http://code.google.com/p/redis/>`_. After that install the `redis client
<https://github.com/andymccurdy/redis-py/>`_::
<https://redis.io/>`_. After that install the `redis client
<https://github.com/redis/redis-py/>`_::

pip install redis

Expand Down Expand Up @@ -111,12 +111,12 @@ Ubuntu installation::
pip install Wand


.. _Python Imaging Library: http://www.pythonware.com/products/pil/
.. _ImageMagick: http://imagemagick.com/
.. _Python Imaging Library: https://python-pillow.org/
.. _ImageMagick: https://imagemagick.org/
.. _GraphicsMagick: http://www.graphicsmagick.org/
.. _redis: http://code.google.com/p/redis/
.. _redis-py: https://github.com/andymccurdy/redis-py/
.. _Django: http://www.djangoproject.com/
.. _Python: http://www.python.org/
.. _pgmagick: http://bitbucket.org/hhatto/pgmagick/src
.. _wand: http://wand-py.org
.. _redis: https://redis.io/
.. _redis-py: https://github.com/redis/redis-py
.. _Django: https://www.djangoproject.com/
.. _Python: https://www.python.org/
.. _pgmagick: https://pgmagick.readthedocs.io/
.. _wand: https://docs.wand-py.org
2 changes: 1 addition & 1 deletion docs/template.rst
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ boxes of images of a certain size but you do not want to crop them::
The more problematic is to get the top margin, however the margin filter
outputs all values.

.. _css background-position: http://www.w3.org/TR/CSS2/colors.html#propdef-background-position
.. _css background-position: https://www.w3.org/TR/CSS2/colors.html#propdef-background-position

resolution
==========
Expand Down
2 changes: 1 addition & 1 deletion sorl/thumbnail/conf/defaults.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
# http://placekitten.com/%(width)s/%(height)s
# http://placekitten.com/g/%(width)s/%(height)s
# http://placehold.it/%(width)sx%(height)s
THUMBNAIL_DUMMY_SOURCE = 'http://dummyimage.com/%(width)sx%(height)s'
THUMBNAIL_DUMMY_SOURCE = 'https://dummyimage.com/%(width)sx%(height)s'

# Sets the source image ratio for dummy generation of images with only width
# or height given
Expand Down
2 changes: 1 addition & 1 deletion tests/thumbnail_tests/templates/thumbnail3.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% load thumbnail %}{% spaceless %}
{% thumbnail "http://dummyimage.com/100x100/" "20x20" crop="center" as im %}
{% thumbnail "https://dummyimage.com/100x100/" "20x20" crop="center" as im %}
<img style="margin:{{ im|margin:"20x20" }}" width="{{ im.x }}" height="{{ im.y }}">
{% endthumbnail %}
{% endspaceless %}
12 changes: 6 additions & 6 deletions tests/thumbnail_tests/test_engines.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ def test_image_file_deserialize(self):
default.kvstore.get(im).serialize_storage(),
'tests.thumbnail_tests.storage.TestStorage',
)
im = ImageFile('http://dummyimage.com/300x300/')
im = ImageFile('https://dummyimage.com/300x300/')
default.kvstore.set(im)
self.assertEqual(
default.kvstore.get(im).serialize_storage(),
Expand Down Expand Up @@ -550,10 +550,10 @@ def test_dummy_tags(self):
val = render_to_string('thumbnaild2.html', {'anything': None, }).strip()
self.assertEqual(
val,
'<img src="http://dummyimage.com/300x200" width="300" height="200"><p>NOT</p>'
'<img src="https://dummyimage.com/300x200" width="300" height="200"><p>NOT</p>'
)
val = render_to_string('thumbnaild3.html', {}).strip()
self.assertEqual(val, '<img src="http://dummyimage.com/600x400" width="600" height="400">')
self.assertEqual(val, '<img src="https://dummyimage.com/600x400" width="600" height="400">')

settings.THUMBNAIL_DUMMY = False

Expand All @@ -563,9 +563,9 @@ def test_alternative_resolutions(self):
val = render_to_string('thumbnaild4.html', {}).strip()
self.assertEqual(
val,
'<img src="http://dummyimage.com/600x400" width="600" '
'height="400" srcset="http://dummyimage.com/1200x800 2x; '
'http://dummyimage.com/900x600 1.5x">'
'<img src="https://dummyimage.com/600x400" width="600" '
'height="400" srcset="https://dummyimage.com/1200x800 2x; '
'https://dummyimage.com/900x600 1.5x">'
)


Expand Down
8 changes: 4 additions & 4 deletions tests/thumbnail_tests/test_filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@

class FilterTestCase(BaseTestCase):
def test_html_filter(self):
text = '<img alt="A image!" src="http://dummyimage.com/800x800" />'
text = '<img alt="A image!" src="https://dummyimage.com/800x800" />'
val = render_to_string('htmlfilter.html', {'text': text, }).strip()

self.assertEqual(
'<img alt="A image!" '
'src="/media/test/cache/2e/35/2e3517d8aa949728b1ee8b26c5a7bbc4.jpg" />',
'src="/media/test/cache/91/87/9187bfc1d52b271db9730ee0377547b9.jpg" />',
val
)

Expand All @@ -29,11 +29,11 @@ def test_html_filter_local_url(self):
)

def test_markdown_filter(self):
text = '![A image!](http://dummyimage.com/800x800)'
text = '![A image!](https://dummyimage.com/800x800)'
val = render_to_string('markdownfilter.html', {'text': text, }).strip()

self.assertEqual(
'![A image!](/media/test/cache/2e/35/2e3517d8aa949728b1ee8b26c5a7bbc4.jpg)',
'![A image!](/media/test/cache/91/87/9187bfc1d52b271db9730ee0377547b9.jpg)',
val
)

Expand Down
4 changes: 2 additions & 2 deletions tests/thumbnail_tests/test_templatetags.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,11 @@ def test_url(self):

def test_portrait(self):
val = render_to_string('thumbnail4.html', {
'source': 'http://dummyimage.com/120x100/',
'source': 'https://dummyimage.com/120x100/',
'dims': 'x66',
}).strip()
self.assertEqual(val,
'<img src="/media/test/cache/7b/cd/7bcd20922c6750649f431df7c3cdbc5e.jpg" '
'<img src="/media/test/cache/82/62/8262858c5f95f2bd7715d7aaa3e52b11.jpg" '
'width="79" height="66" class="landscape">')

def test_empty(self):
Expand Down