Merge branch 'ellmetha:main' into default_approval_status

docs/conf.py

@@ -65,9 +65,9 @@
 #
 
 # The short X.Y version.
-version = '1.3.1.dev'
+version = '1.3.2.dev'
 # The full version, including alpha/beta/rc tags.
-release = '1.3.1.dev'
+release = '1.3.2.dev'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -112,12 +112,9 @@
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
-
-if not ON_RTD:  # only import and set the theme if we're building docs locally
-    import sphinx_rtd_theme
-    html_theme = 'sphinx_rtd_theme'
-    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+import sphinx_rtd_theme
+html_theme = 'sphinx_rtd_theme'
+html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -194,7 +191,7 @@
 htmlhelp_basename = 'django-machinadoc'
 
 def setup(app):
-    app.add_stylesheet('custom_theme.css')
+    app.add_css_file('custom_theme.css')
 
 
 # -- Options for LaTeX output ---------------------------------------------

docs/release_notes/index.rst

@@ -12,6 +12,7 @@ Django-machina 1.3
 .. toctree::
     :maxdepth: 1
 
+    v1.3.1
     v1.3
 
 Django-machina 1.2

docs/release_notes/v1.3.1.rst

@@ -0,0 +1,13 @@
+###############################################
+Django-machina 1.3.1 release notes (2023-10-16)
+###############################################
+
+Requirements and compatibility
+------------------------------
+
+Python 3.6, 3.7, 3.8, 3.9, 3.10, and 3.11. Django 3.2, 4.0, 4.1, and 4.2.
+
+Minor changes
+-------------
+
+* Fix compatibility with Pillow 10+ (`#311 <https://github.com/ellmetha/django-machina/pull/311>`_)