Merge branch 'release/0.7.1'

* release/0.7.1:
  Bump version to 0.7.1
  Update credits
  Translated using Weblate (Dutch)
  Add master_doc setting for readthedocs
  Update MarkupSafe version
  Move rtd requirements to correct stanza
  Add requirements to readthedocs configuration
  Add configuration for readthedocs
This commit is contained in:
Jan Dittberner 2021-07-03 12:33:24 +02:00
commit 107fd58d81
6 changed files with 63 additions and 52 deletions

8
.readthedocs.yml Normal file
View file

@ -0,0 +1,8 @@
version: 2
sphinx:
configuration: docs/source/conf.py
python:
version: 3
install:
- requirements: requirements.txt

View file

@ -10,15 +10,16 @@ msgstr ""
"Project-Id-Version: Debian Member Portfolio Service 0.3.1\n" "Project-Id-Version: Debian Member Portfolio Service 0.3.1\n"
"Report-Msgid-Bugs-To: jan@dittberner.info\n" "Report-Msgid-Bugs-To: jan@dittberner.info\n"
"POT-Creation-Date: 2021-07-03 11:22+0200\n" "POT-Creation-Date: 2021-07-03 11:22+0200\n"
"PO-Revision-Date: 2021-07-03 11:15+0200\n" "PO-Revision-Date: 2021-07-03 10:30+0000\n"
"Last-Translator: Frans Spiesschaert <frans.spiesschaert@gmail.com>\n" "Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
"Language-Team: Dutch <https://hosted.weblate.org/projects/"
"debian-member-portfolio-service/translations/nl/>\n"
"Language: nl\n" "Language: nl\n"
"Language-Team: Dutch <https://hosted.weblate.org/projects/debian-member-"
"portfolio-service/translations/nl/>\n"
"Plural-Forms: nplurals=2; plural=n != 1\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n" "Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.8-dev\n"
"Generated-By: Babel 2.8.0\n" "Generated-By: Babel 2.8.0\n"
#: debianmemberportfolio/forms.py:64 #: debianmemberportfolio/forms.py:64
@ -56,13 +57,12 @@ msgid ""
"/cgi-bin/bugreport.cgi?bug=430986\">#430986</a>)" "/cgi-bin/bugreport.cgi?bug=430986\">#430986</a>)"
msgstr "" msgstr ""
"ontvangen bugs\n" "ontvangen bugs\n"
"(let op: mede-beheerders staan niet op de lijst, zie\n" "(let op: mede-beheerders staan niet op de lijst, zie <a href=\"https://bugs."
"<a href=\"https://bugs.debian.org/cgi-" "debian.org/cgi-bin/bugreport.cgi?bug=430986\">#430986</a>)"
"bin/bugreport.cgi?bug=430986\">#430986</a>"
#: debianmemberportfolio/views.py:51 #: debianmemberportfolio/views.py:51
msgid "bugs reported" msgid "bugs reported"
msgstr "gerapporteerde bugs" msgstr "gemelde bugs"
#: debianmemberportfolio/views.py:52 #: debianmemberportfolio/views.py:52
msgid "user tags" msgid "user tags"
@ -98,7 +98,7 @@ msgstr "Kwaliteitsverzekering"
#: debianmemberportfolio/views.py:64 #: debianmemberportfolio/views.py:64
msgid "maintainer dashboard" msgid "maintainer dashboard"
msgstr "beheerdersinstrumentenbord" msgstr "beheerpaneel"
#: debianmemberportfolio/views.py:65 #: debianmemberportfolio/views.py:65
msgid "lintian reports" msgid "lintian reports"
@ -107,8 +107,8 @@ msgstr "lintian-rapporten"
#: debianmemberportfolio/views.py:66 #: debianmemberportfolio/views.py:66
msgid "full lintian reports (i.e. including \"info\"-level messages)" msgid "full lintian reports (i.e. including \"info\"-level messages)"
msgstr "" msgstr ""
"volledige lintian-rapporten (d.w.z. inclusief berichten van niveau " "volledige lintian-rapporten (d.w.z. inclusief berichten van het niveau "
"\"info\")" "info)"
#: debianmemberportfolio/views.py:68 #: debianmemberportfolio/views.py:68
msgid "piuparts" msgid "piuparts"
@ -116,7 +116,7 @@ msgstr "piuparts"
#: debianmemberportfolio/views.py:69 #: debianmemberportfolio/views.py:69
msgid "Debian Janitor" msgid "Debian Janitor"
msgstr "" msgstr "Debian-conciërge"
#: debianmemberportfolio/views.py:72 #: debianmemberportfolio/views.py:72
msgid "Mailing Lists" msgid "Mailing Lists"
@ -216,7 +216,7 @@ msgstr "Bijdrage-informatie"
#: debianmemberportfolio/views.py:102 #: debianmemberportfolio/views.py:102
msgid "Repology information" msgid "Repology information"
msgstr "" msgstr "Repology-informatie"
#: debianmemberportfolio/views.py:105 #: debianmemberportfolio/views.py:105
msgid "Information reachable via ssh (for Debian Members)" msgid "Information reachable via ssh (for Debian Members)"
@ -231,8 +231,8 @@ msgid ""
"<a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> " "<a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> "
"database information" "database information"
msgstr "" msgstr ""
"<a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a" "<a href=\"https://wiki.debian.org/qa.debian.org/MIATeam\""
">-database-informatie" ">MIA</a>-databankinformatie"
#: debianmemberportfolio/views.py:109 #: debianmemberportfolio/views.py:109
msgid "Group membership information" msgid "Group membership information"
@ -271,7 +271,7 @@ msgstr "Ontbrekende invoer: %s"
#: debianmemberportfolio/templates/base.html:24 #: debianmemberportfolio/templates/base.html:24
#: debianmemberportfolio/templates/base.html:31 #: debianmemberportfolio/templates/base.html:31
msgid "Debian Member Portfolio Service" msgid "Debian Member Portfolio Service"
msgstr "Portfoliodienst van Debian-leden" msgstr "Portfolio met Debian-leden"
#: debianmemberportfolio/templates/base.html:30 #: debianmemberportfolio/templates/base.html:30
msgid "Debian Logo" msgid "Debian Logo"
@ -329,7 +329,7 @@ msgstr "Voer uw persoonlijke informatie in"
#: debianmemberportfolio/templates/showform.html:29 #: debianmemberportfolio/templates/showform.html:29
msgid "Debian Member Portfolio" msgid "Debian Member Portfolio"
msgstr "Portfolio van een lid van Debian" msgstr "Portfolio van een Debian-lid"
#: debianmemberportfolio/templates/showform.html:31 #: debianmemberportfolio/templates/showform.html:31
msgid "Email address:" msgid "Email address:"
@ -337,7 +337,7 @@ msgstr "E-mailadres:"
#: debianmemberportfolio/templates/showform.html:40 #: debianmemberportfolio/templates/showform.html:40
msgid "Show all form fields" msgid "Show all form fields"
msgstr "Alle velden van het formulier weergeven" msgstr "Alle formuliervelden tonen"
#: debianmemberportfolio/templates/showform.html:43 #: debianmemberportfolio/templates/showform.html:43
msgid "Name:" msgid "Name:"
@ -373,11 +373,11 @@ msgstr "Uitvoerformaat:"
#: debianmemberportfolio/templates/showform.html:99 #: debianmemberportfolio/templates/showform.html:99
msgid "Build Debian Member Portfolio URLs" msgid "Build Debian Member Portfolio URLs"
msgstr "URL's bouwen voor het Debian-lid" msgstr "URL's samenstellen voor het Debian-lid"
#: debianmemberportfolio/templates/showurls.html:21 #: debianmemberportfolio/templates/showurls.html:21
msgid "Your personal links" msgid "Your personal links"
msgstr "Uw persoonlijke links" msgstr "Mijn persoonlijke links"
#: debianmemberportfolio/templates/showurls.html:25 #: debianmemberportfolio/templates/showurls.html:25
msgid "Debian Member Porfolio" msgid "Debian Member Porfolio"
@ -393,9 +393,8 @@ msgstr "URL"
#: debianmemberportfolio/templates/showurls.html:38 #: debianmemberportfolio/templates/showurls.html:38
msgid "Error during URL creation:" msgid "Error during URL creation:"
msgstr "Er is een fout opgetreden tijdens de URL-creatie:" msgstr "Er is een fout opgetreden tijdens het samenstellen van de url:"
#: debianmemberportfolio/templates/showurls.html:59 #: debianmemberportfolio/templates/showurls.html:59
msgid "Restart" msgid "Restart"
msgstr "Herbeginnen" msgstr "Opnieuw beginnen"

View file

@ -22,41 +22,40 @@ import os
# If your extensions are in another directory, add it here. If the directory # If your extensions are in another directory, add it here. If the directory
# is relative to the documentation root, use os.path.abspath to make it # is relative to the documentation root, use os.path.abspath to make it
# absolute, like shown here. # absolute, like shown here.
sys.path.append( sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..")))
os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..')))
# General configuration # General configuration
# --------------------- # ---------------------
# Add any Sphinx extension module names here, as strings. They can be # Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode'] extensions = ["sphinx.ext.autodoc", "sphinx.ext.viewcode"]
# Add any paths that contain templates here, relative to this directory. # Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates'] templates_path = ["_templates"]
# The encoding of source files. # The encoding of source files.
#source_encoding = 'utf-8' # source_encoding = 'utf-8'
# General information about the project. # General information about the project.
project = 'Debian Member Portfolio Service' project = "Debian Member Portfolio Service"
copyright = '2009-2021, Jan Dittberner' copyright = "2009-2021, Jan Dittberner"
# The version info for the project you're documenting, acts as replacement for # The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the # |version| and |release|, also used in various other places throughout the
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '0.7.0' version = "0.7.1"
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = version release = version
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
language = 'en' language = "en"
# The name of the Pygments (syntax highlighting) style to use. # The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx' pygments_style = "sphinx"
# ----------------------- # -----------------------
@ -64,51 +63,55 @@ pygments_style = 'sphinx'
# Add any paths that contain custom static files (such as style sheets) here, # 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, # relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css". # so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static'] html_static_path = ["_static"]
# If false, no module index is generated. # If false, no module index is generated.
html_use_modindex = False html_use_modindex = False
# If false, no index is generated. # If false, no index is generated.
#html_use_index = True # html_use_index = True
html_theme = 'alabaster' html_theme = "alabaster"
# Output file base name for HTML help builder. # Output file base name for HTML help builder.
htmlhelp_basename = 'DebianMemberPortfolioServicedoc' htmlhelp_basename = "DebianMemberPortfolioServicedoc"
# Options for LaTeX output # Options for LaTeX output
# ------------------------ # ------------------------
# The paper size ('letter' or 'a4'). # The paper size ('letter' or 'a4').
#latex_paper_size = 'letter' # latex_paper_size = 'letter'
# The font size ('10pt', '11pt' or '12pt'). # 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 # Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, document class # (source start file, target name, title, author, document class
# [howto/manual]). # [howto/manual]).
latex_documents = [ latex_documents = [
('index', (
'DebianMemberPortfolioService.tex', "index",
'Debian Member Portfolio Service Documentation', "DebianMemberPortfolioService.tex",
'Jan Dittberner', "Debian Member Portfolio Service Documentation",
'manual'), "Jan Dittberner",
"manual",
),
] ]
# The name of an image file (relative to this directory) to place at the top of # The name of an image file (relative to this directory) to place at the top of
# the title page. # the title page.
#latex_logo = None # latex_logo = None
# For "manual" documents, if this is true, then toplevel headings are parts, # For "manual" documents, if this is true, then toplevel headings are parts,
# not chapters. # not chapters.
#latex_use_parts = False # latex_use_parts = False
# Additional stuff for the LaTeX preamble. # Additional stuff for the LaTeX preamble.
#latex_preamble = '' # latex_preamble = ''
# Documents to append as an appendix to all manuals. # Documents to append as an appendix to all manuals.
#latex_appendices = [] # latex_appendices = []
# If false, no module index is generated. # If false, no module index is generated.
#latex_use_modindex = True # latex_use_modindex = True
master_doc = "index"

View file

@ -20,6 +20,7 @@ Translations
* ButterflyOfFire (French, Portuguese (Brazil)) * ButterflyOfFire (French, Portuguese (Brazil))
* Daniel Manzano (Portugues (Brazil)) * Daniel Manzano (Portugues (Brazil))
* Frans Spiesschaert (Dutch) * Frans Spiesschaert (Dutch)
* Heimen Stoffels (Dutch)
* Izharul Haq (Indonesian) * Izharul Haq (Indonesian)
* Jan Dittberner (German, English) * Jan Dittberner (German, English)
* Manuela Silva (Portugues (Portugal)) * Manuela Silva (Portugues (Portugal))

View file

@ -1,6 +1,6 @@
Flask==0.12.2 Flask==0.12.2
Jinja2==2.9.6 Jinja2==2.9.6
MarkupSafe==1.0 MarkupSafe==1.1.0
Werkzeug==0.12.2 Werkzeug==0.12.2
itsdangerous==0.24 itsdangerous==0.24
Babel==2.5.0 Babel==2.5.0

View file

@ -29,7 +29,7 @@ except ImportError:
setup( setup(
name='debianmemberportfolio', name='debianmemberportfolio',
version='0.7.0', version='0.7.1',
description='service to create Debian Member Portfolio URLs', description='service to create Debian Member Portfolio URLs',
long_description="""This is a service implementation that returns a set of long_description="""This is a service implementation that returns a set of
personalized URLs as outlined in https://wiki.debian.org/DDPortfolio. It personalized URLs as outlined in https://wiki.debian.org/DDPortfolio. It