From cf3a52f9fd88d8dacdfd6e20f4aa2b2ec0f8d2af Mon Sep 17 00:00:00 2001 From: Patrick Kranzlmueller Date: Wed, 20 Dec 2023 13:55:16 +0100 Subject: [PATCH] pushed dev version of 2.15.x to 2.15.8 --- docs/conf.py | 129 +++++++++++++++++++++++------------------- docs/index.rst | 2 +- docs/quickstart.rst | 2 +- grappelli/__init__.py | 4 +- package.json | 2 +- setup.py | 42 +++++++------- 6 files changed, 96 insertions(+), 85 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 7ab13b770..1d05b6fb4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -14,202 +14,207 @@ import os import sys -on_rtd = os.environ.get('READTHEDOCS', None) == 'True' +on_rtd = os.environ.get("READTHEDOCS", None) == "True" # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. -#sys.path.insert(0, os.path.abspath('.')) +# sys.path.insert(0, os.path.abspath('.')) # -- General configuration ----------------------------------------------------- # If your documentation needs a minimal Sphinx version, state it here. -#needs_sphinx = '1.0' +# needs_sphinx = '1.0' # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo'] +extensions = ["sphinx.ext.autodoc", "sphinx.ext.todo"] todo_include_todos = True # Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] +templates_path = ["_templates"] # The suffix of source filenames. -source_suffix = '.rst' +source_suffix = ".rst" # The encoding of source files. -#source_encoding = 'utf-8-sig' +# source_encoding = 'utf-8-sig' # The master toctree document. -master_doc = 'index' +master_doc = "index" # General information about the project. -project = u'Django Grappelli' -copyright = u'2021, Patrick Kranzlmueller' +project = "Django Grappelli" +copyright = "2021, Patrick Kranzlmueller" # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '2.15.7' +version = "2.15.8" # The full version, including alpha/beta/rc tags. -release = '2.15.7' +release = "2.15.8" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. -#language = None +# language = None # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: -#today = '' +# today = '' # Else, today_fmt is used as the format for a strftime call. -#today_fmt = '%B %d, %Y' +# today_fmt = '%B %d, %Y' # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. -exclude_patterns = ['_build'] +exclude_patterns = ["_build"] # The reST default role (used for this markup: `text`) to use for all documents. -#default_role = None +# default_role = None # If true, '()' will be appended to :func: etc. cross-reference text. -#add_function_parentheses = True +# add_function_parentheses = True # If true, the current module name will be prepended to all description # unit titles (such as .. function::). -#add_module_names = True +# add_module_names = True # If true, sectionauthor and moduleauthor directives will be shown in the # output. They are ignored by default. -#show_authors = False +# show_authors = False # The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' +pygments_style = "sphinx" # A list of ignored prefixes for module index sorting. -#modindex_common_prefix = [] +# modindex_common_prefix = [] # -- Options for HTML output --------------------------------------------------- # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -html_theme = 'default' -#html_theme = 'sphinx_grappelli' +html_theme = "default" +# html_theme = 'sphinx_grappelli' # 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 # documentation. -#html_theme_options = {} +# html_theme_options = {} # Add any paths that contain custom themes here, relative to this directory. -#html_theme_path = ['.'] -#html_theme_path = ["_themes",] +# html_theme_path = ['.'] +# html_theme_path = ["_themes",] # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". -#html_title = None +# html_title = None # A shorter title for the navigation bar. Default is the same as html_title. -#html_short_title = None +# html_short_title = None # The name of an image file (relative to this directory) to place at the top # of the sidebar. -#html_logo = None +# html_logo = None # The name of an image file (within the static path) to use as favicon of the # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 # pixels large. -#html_favicon = None +# html_favicon = None # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] +html_static_path = ["_static"] # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. -#html_last_updated_fmt = '%b %d, %Y' +# html_last_updated_fmt = '%b %d, %Y' # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities. -#html_use_smartypants = True +# html_use_smartypants = True # Custom sidebar templates, maps document names to template names. -#html_sidebars = {} +# html_sidebars = {} # Additional templates that should be rendered to pages, maps page names to # template names. -#html_additional_pages = {} +# html_additional_pages = {} # If false, no module index is generated. -#html_domain_indices = True +# html_domain_indices = True # If false, no index is generated. -#html_use_index = True +# html_use_index = True # If true, the index is split into individual pages for each letter. -#html_split_index = False +# html_split_index = False # If true, links to the reST sources are added to the pages. -#html_show_sourcelink = True +# html_show_sourcelink = True # If true, "Created using Sphinx" is shown in the HTML footer. Default is True. -#html_show_sphinx = True +# html_show_sphinx = True # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -#html_show_copyright = True +# html_show_copyright = True # If true, an OpenSearch description file will be output, and all pages will # contain a tag referring to it. The value of this option must be the # base URL from which the finished HTML is served. -#html_use_opensearch = '' +# html_use_opensearch = '' # This is the file name suffix for HTML files (e.g. ".xhtml"). -#html_file_suffix = None +# html_file_suffix = None # Output file base name for HTML help builder. -htmlhelp_basename = 'DjangoGrappellidoc' +htmlhelp_basename = "DjangoGrappellidoc" # -- Options for LaTeX output -------------------------------------------------- # The paper size ('letter' or 'a4'). -#latex_paper_size = 'letter' +# latex_paper_size = 'letter' # The font size ('10pt', '11pt' or '12pt'). -#latex_font_size = '10pt' +# latex_font_size = '10pt' # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ - ('index', 'DjangoGrappelli.tex', u'Django Grappelli Documentation', - u'Patrick Kranzlmueller', 'manual'), + ( + "index", + "DjangoGrappelli.tex", + "Django Grappelli Documentation", + "Patrick Kranzlmueller", + "manual", + ), ] # The name of an image file (relative to this directory) to place at the top of # the title page. -#latex_logo = None +# latex_logo = None # For "manual" documents, if this is true, then toplevel headings are parts, # not chapters. -#latex_use_parts = False +# latex_use_parts = False # If true, show page references after internal links. -#latex_show_pagerefs = False +# latex_show_pagerefs = False # If true, show URL addresses after external links. -#latex_show_urls = False +# latex_show_urls = False # Additional stuff for the LaTeX preamble. -#latex_preamble = '' +# latex_preamble = '' # Documents to append as an appendix to all manuals. -#latex_appendices = [] +# latex_appendices = [] # If false, no module index is generated. -#latex_domain_indices = True +# latex_domain_indices = True # -- Options for manual page output -------------------------------------------- @@ -217,11 +222,17 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'djangograppelli', u'Django Grappelli Documentation', - [u'Patrick Kranzlmueller'], 1) + ( + "index", + "djangograppelli", + "Django Grappelli Documentation", + ["Patrick Kranzlmueller"], + 1, + ) ] 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 = "sphinx_rtd_theme" html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] diff --git a/docs/index.rst b/docs/index.rst index 15cfcc550..7b008a55a 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -4,7 +4,7 @@ contain the root `toctree` directive. .. |grappelli| replace:: Grappelli .. |filebrowser| replace:: FileBrowser -.. |grappelliversion| replace:: 2.15.7 +.. |grappelliversion| replace:: 2.15.8 .. _index: diff --git a/docs/quickstart.rst b/docs/quickstart.rst index bc811e782..715c84c92 100644 --- a/docs/quickstart.rst +++ b/docs/quickstart.rst @@ -1,6 +1,6 @@ .. |grappelli| replace:: Grappelli .. |filebrowser| replace:: FileBrowser -.. |grappelliversion| replace:: 2.15.7 +.. |grappelliversion| replace:: 2.15.8 .. _quickstart: diff --git a/grappelli/__init__.py b/grappelli/__init__.py index 578f3990d..ee76c6042 100644 --- a/grappelli/__init__.py +++ b/grappelli/__init__.py @@ -1,6 +1,6 @@ import django -VERSION = '2.15.7' +VERSION = "2.15.8" if django.VERSION < (3, 2): - default_app_config = 'grappelli.apps.GrappelliConfig' + default_app_config = "grappelli.apps.GrappelliConfig" diff --git a/package.json b/package.json index abaebe486..9d2fda4d7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Grappelli", - "version": "2.15.7", + "version": "2.15.8", "description": "A jazzy skin for the Django admin interface", "author": "Patrick Kranzlmueller, Axel Swoboda", "license": "New BSD", diff --git a/setup.py b/setup.py index 923e2b04c..776b1fb48 100644 --- a/setup.py +++ b/setup.py @@ -8,30 +8,30 @@ def read(fname): setup( - name='django-grappelli', - version='2.15.7', - description='A jazzy skin for the Django Admin-Interface.', - long_description=read('README.rst'), - url='http://django-grappelli.readthedocs.org', - download_url='', - author='Patrick Kranzlmueller, Axel Swoboda (vonautomatisch)', - author_email='office@vonautomatisch.at', - license='BSD', - packages=find_packages(exclude=['test_project']), + name="django-grappelli", + version="2.15.8", + description="A jazzy skin for the Django Admin-Interface.", + long_description=read("README.rst"), + url="http://django-grappelli.readthedocs.org", + download_url="", + author="Patrick Kranzlmueller, Axel Swoboda (vonautomatisch)", + author_email="office@vonautomatisch.at", + license="BSD", + packages=find_packages(exclude=["test_project"]), include_package_data=True, install_requires=[], classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Web Environment', - 'Framework :: Django', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: BSD License', - 'Operating System :: OS Independent', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', + "Development Status :: 5 - Production/Stable", + "Environment :: Web Environment", + "Framework :: Django", + "Intended Audience :: Developers", + "License :: OSI Approved :: BSD License", + "Operating System :: OS Independent", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", ], zip_safe=False, )