Skip to content

Commit

Permalink
Merge branch 'release/1.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Yamboy1 committed Dec 15, 2022
2 parents 79903fd + 96a0132 commit 3a87867
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Set up Python 3
uses: actions/setup-python@v2.2.2
with:
python-version: '3.x'
python-version: '3.9'

- name: Install dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Set up Python 3
uses: actions/setup-python@v2.2.2
with:
python-version: '3.x'
python-version: '3.9'

- name: Install build dependencies
run: |
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/test-suite.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
# Quotes are neccesary otherwise it tries to get Python 3.1
python-version: [3.8, 3.9, '3.10', 3.11]

steps:
- name: Checkout
Expand Down
8 changes: 8 additions & 0 deletions docs/source/changelog.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
Changelog
#######################################

1.1.0
=======================================

- Update documentation to say that alt tags are required for images.
- Update old examples in the documentation
- Update minimum Python version to 3.8, as 3.7 was causing issues with our linter.
- Update sphinx from 4.0.2 to 4.2.0.

1.0.1
=======================================

Expand Down
3 changes: 2 additions & 1 deletion docs/source/processors/image-inline.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@ Required Tag Parameters

- Each file-path provided is added to the ``images`` set in required files stored by Verto. The set of filepaths can be accessed after conversion, see :ref:`accessing_verto_data`.
- **Note:** If the given link is a relative (a link that doesn't start with ``http:``), the link will be rendered with a Django static command. For example, the link ``images/example.png`` would be rendered as ``{% static 'images/example.png' %}`` This can be overriden, see the override section below.

- ``alt`` - Description text of the image used when an image is not displayed, or can be read when using a screen reader (for those with reading difficulties).

Optional Tag Parameters
***************************************

- ``alt`` - Description text of the image used when an image is not displayed, or can be read when using a screen reader (for those with reading difficulties).
- ``caption`` - Lists the given text as a caption under the image.
- ``caption-link`` (requires caption parameter) - Converts the caption text into a link to the given caption link URL.
- ``source`` (optional) - Adds the text 'Source' under the image with a link to the given source URL. Displays after the caption if a caption is given.
Expand Down
8 changes: 4 additions & 4 deletions docs/source/processors/image.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ You can include an image using the following text tag:

.. code-block:: none
{image file-path="http://placehold.it/350x150" caption="true"}
{image file-path="https://via.placeholder.com/350x150" caption="true" alt="placeholder 350x150"}
This is the caption text.
Expand All @@ -20,7 +20,7 @@ If a caption is not needed, an end tag is not required (see example below).

.. code-block:: none
{image file-path="http://placehold.it/350x150" caption="false"}
{image file-path="http://via.placeholder.com/350x150" caption="false" alt="placeholder 350x150"}
Required Tag Parameters
Expand All @@ -31,11 +31,11 @@ Required Tag Parameters
- Each file-path provided is added to the ``images`` set in required files stored by Verto. The set of filepaths can be accessed after conversion, see :ref:`accessing_verto_data`.
- **Note:** If the given link is a relative (a link that doesn't start with ``http:``), the link will be rendered with a Django static command. For example, the link ``images/example.png`` would be rendered as ``{% static 'images/example.png' %}`` This can be overriden, see the override section below.

- ``alt`` - Description text of the image used when an image is not displayed, or can be read when using a screen reader (for those with reading difficulties).

Optional Tag Parameters
***************************************

- ``alt`` - Description text of the image used when an image is not displayed, or can be read when using a screen reader (for those with reading difficulties).

- ``caption`` - Boolean flag to indicate whether the image should display a caption.

- If given as ``true``, the the subtitle is the first block of text with the image block.
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
setuptools==56.2.0
sphinx==4.0.2
sphinx==4.2.0
sphinx_rtd_theme==0.5.2
coverage==5.5
flake8==3.9.2
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ project_urls =

[options]
packages = find:
python_requires = >=3.6
python_requires = >=3.8
include_package_data = True
install_requires =
markdown==2.6.11
Expand Down
2 changes: 1 addition & 1 deletion verto/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# flake8: noqa
from .Verto import Verto

__version__ = '1.0.1'
__version__ = '1.1.0'

0 comments on commit 3a87867

Please sign in to comment.