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.

Sign up for GitHub

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

Jump to bottom

Release 1.1.0b3 #1361

Merged
merged 6 commits into from Oct 14, 2022
Merged

Release 1.1.0b3 #1361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f17ec2b
Update __init__.py because it wasn't updated by previous bump2version
benjaoming Oct 13, 2022
858dd5c
Add some comments about docker mechanisms that are disturbing release…
benjaoming Oct 13, 2022
e0e8866
Bump to version 1.1.0b3
benjaoming Oct 13, 2022
f193a86
Revert "Bump to 1.1.0b2, rebuild assets"
benjaoming Oct 13, 2022
d5bb9c3
Add changelog entry for #1073
benjaoming Oct 14, 2022
221f396
Changelog entry for #1193
benjaoming Oct 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions Dockerfile
View file
Open in desktop
Expand Up @@ -33,6 +33,8 @@ RUN cd /project

# It matters that the node environment is installed into the same
# folder, i.e. /project where we will run the environment from
# TODO: We don't want to update package-lock.json here, we
# should use npm ci instead
RUN npm install --package-lock-only &&\
npm audit fix &&\
npm install
Expand Down
3 changes: 3 additions & 0 deletions docker-entrypoint.sh
View file
Open in desktop
Expand Up @@ -11,6 +11,9 @@ pip install --upgrade -e ".[dev]"
# npm install

cd /project

# TODO: This is a bad approach, it copies from the image which
# may be outdated to the current git tree
cp -r /project-readonly/sphinx_rtd_theme .

echo "Going to invoke: npm run $@"
Expand Down
8 changes: 5 additions & 3 deletions docs/changelog.rst
View file
Open in desktop
Expand Up @@ -5,11 +5,11 @@ Changelog
Development version (|development_version|)
===========================================

.. |development_version| replace:: 1.1.0b2
.. |development_version| replace:: 1.1.0b3

.. _release-1.1.0b2:
.. _release-1.1.0b3:

1.1.0b2
1.1.0b3
=======

Dependency Changes
Expand All @@ -28,6 +28,7 @@ Features
--------

* Nicer styles for <kbd> (#967)
* New styling for breadcrumbs (#1073)


Fixes
Expand All @@ -37,6 +38,7 @@ Fixes
* Table cells with multiple paragraphs gets wrong formatting (#289)
* Definition lists rendered wrongly in api docs (#1052)
* Citation not styled properly (#1078)
* Long URLs did not wrap (#1193)


Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
@@ -1,7 +1,7 @@
{
"name": "sphinx_rtd_theme",
"main": "js/theme.js",
"version": "1.1.0b2",
"version": "1.1.0b3",
"scripts": {
"dev": "webpack-dev-server --open --config webpack.dev.js",
"build": "webpack --config webpack.prod.js",
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.1.0b2
current_version = 1.1.0b3
commit = false
tag = false
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+)(?P<dev>\d+))?
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Expand Up @@ -86,7 +86,7 @@ def run(self):


setup(
version='1.1.0b2',
version='1.1.0b3',
cmdclass={
'update_translations': UpdateTranslationsCommand,
'transifex': TransifexCommand,
Expand Down
2 changes: 1 addition & 1 deletion sphinx_rtd_theme/__init__.py
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
from sphinx.util.logging import getLogger


__version__ = '1.0.1alpha1'
__version__ = '1.1.0b3'
__version_full__ = __version__

logger = getLogger(__name__)
Expand Down
4 changes: 4 additions & 0 deletions sphinx_rtd_theme/layout.html
View file
Open in desktop
Expand Up @@ -9,6 +9,10 @@
{%- set lang_attr = 'en' if language == None else (language | replace('_', '-')) %}
{%- set sphinx_writer = 'writer-html5' if html5_doctype else 'writer-html4' -%}

{# Build sphinx_version_info tuple from sphinx_version string in pure Jinja #}
{%- set (_ver_major, _ver_minor) = (sphinx_version.split('.') | list)[:2] | map('int') -%}
{%- set sphinx_version_info = (_ver_major, _ver_minor, -1) -%}

<!DOCTYPE html>
<html class="{{ sphinx_writer }}" lang="{{ lang_attr }}" >
<head>
Expand Down
Binary file modified sphinx_rtd_theme/locale/de/LC_MESSAGES/sphinx.mo
View file
Open in desktop
Binary file not shown.
16 changes: 8 additions & 8 deletions sphinx_rtd_theme/locale/de/LC_MESSAGES/sphinx.po
View file
Open in desktop
Expand Up @@ -11,14 +11,14 @@ msgid ""
msgstr ""
"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2021-09-13 13:35-0600\n"
"POT-Creation-Date: 2022-10-06 17:05+0200\n"
"PO-Revision-Date: 2019-07-16 21:44+0000\n"
"Last-Translator: Tom Kunze <transifex.com@tomabrafix.de>, 2019\n"
"Language-Team: German (https://www.transifex.com/readthedocs/teams/101354/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.8.0\n"
"Generated-By: Babel 2.10.3\n"
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

Expand Down Expand Up @@ -71,28 +71,28 @@ msgstr "Erstellt mit %(sphinx_web)s mit einem"
msgid "provided by %(readthedocs_web)s"
msgstr "bereitgestellt von %(readthedocs_web)s"

#: sphinx_rtd_theme/layout.html:97
#: sphinx_rtd_theme/layout.html:93
#, python-format
msgid "Search within %(docstitle)s"
msgstr "%(docstitle)s durchsuchen"

#: sphinx_rtd_theme/layout.html:105
#: sphinx_rtd_theme/layout.html:101
msgid "About these documents"
msgstr "Über diese Dokumentation"

#: sphinx_rtd_theme/layout.html:108
#: sphinx_rtd_theme/layout.html:104
msgid "Index"
msgstr "Index"

#: sphinx_rtd_theme/layout.html:111 sphinx_rtd_theme/search.html:11
#: sphinx_rtd_theme/layout.html:107 sphinx_rtd_theme/search.html:11
msgid "Search"
msgstr "Suche"

#: sphinx_rtd_theme/layout.html:114
#: sphinx_rtd_theme/layout.html:110
msgid "Copyright"
msgstr "Copyright"

#: sphinx_rtd_theme/layout.html:147 sphinx_rtd_theme/layout.html:149
#: sphinx_rtd_theme/layout.html:143 sphinx_rtd_theme/layout.html:145
msgid "Logo"
msgstr "Logo"

Expand Down
Binary file modified sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.mo
View file
Open in desktop
Binary file not shown.
22 changes: 11 additions & 11 deletions sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.po
View file
Open in desktop
Expand Up @@ -8,16 +8,16 @@ msgid ""
msgstr ""
"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2021-09-13 13:35-0600\n"
"POT-Creation-Date: 2022-10-06 17:05+0200\n"
"PO-Revision-Date: 2019-07-16 15:43-0600\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: en\n"
"Language-Team: en <LL@li.org>\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.8.0\n"
"Generated-By: Babel 2.10.3\n"

#. This is an ARIA section label for page links, including previous/next page
#. link and links to GitHub/GitLab/etc.
Expand Down Expand Up @@ -105,39 +105,39 @@ msgstr ""
msgid "provided by %(readthedocs_web)s"
msgstr ""

#: sphinx_rtd_theme/layout.html:97
#: sphinx_rtd_theme/layout.html:93
#, python-format
msgid "Search within %(docstitle)s"
msgstr ""

#: sphinx_rtd_theme/layout.html:105
#: sphinx_rtd_theme/layout.html:101
msgid "About these documents"
msgstr ""

#: sphinx_rtd_theme/layout.html:108
#: sphinx_rtd_theme/layout.html:104
msgid "Index"
msgstr ""

#: sphinx_rtd_theme/layout.html:111 sphinx_rtd_theme/search.html:11
#: sphinx_rtd_theme/layout.html:107 sphinx_rtd_theme/search.html:11
msgid "Search"
msgstr ""

#: sphinx_rtd_theme/layout.html:114
#: sphinx_rtd_theme/layout.html:110
msgid "Copyright"
msgstr ""

#: sphinx_rtd_theme/layout.html:147 sphinx_rtd_theme/layout.html:149
#: sphinx_rtd_theme/layout.html:143 sphinx_rtd_theme/layout.html:145
msgid "Logo"
msgstr ""

#. This is an ARIA section label for the main navigation menu
#: sphinx_rtd_theme/layout.html:173
#: sphinx_rtd_theme/layout.html:169
msgid "Navigation menu"
msgstr ""

#. This is an ARIA section label for the navigation menu that is visible when
#. viewing the page on mobile devices
#: sphinx_rtd_theme/layout.html:195
#: sphinx_rtd_theme/layout.html:191
msgid "Mobile navigation menu"
msgstr ""

Expand Down
Binary file modified sphinx_rtd_theme/locale/es/LC_MESSAGES/sphinx.mo
View file
Open in desktop
Binary file not shown.
21 changes: 11 additions & 10 deletions sphinx_rtd_theme/locale/es/LC_MESSAGES/sphinx.po
View file
Open in desktop
Expand Up @@ -7,21 +7,22 @@
# Translators:
# Anthony <aj@ohess.org>, 2019
# Radina Matic <radina.matic@gmail.com>, 2021
# Leonardo J. Caballero G. <leonardocaballero@gmail.com>, 2022
#
msgid ""
msgstr ""
"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2021-09-13 13:35-0600\n"
"POT-Creation-Date: 2022-10-06 17:05+0200\n"
"PO-Revision-Date: 2019-07-16 21:44+0000\n"
"Last-Translator: Radina Matic <radina.matic@gmail.com>, 2021\n"
"Last-Translator: Leonardo J. Caballero G. <leonardocaballero@gmail.com>, 2022\n"
"Language-Team: Spanish (https://www.transifex.com/readthedocs/teams/101354/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.8.0\n"
"Generated-By: Babel 2.10.3\n"
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"

#: sphinx_rtd_theme/breadcrumbs.html:37 sphinx_rtd_theme/breadcrumbs.html:39
msgid "Edit on GitHub"
Expand Down Expand Up @@ -98,28 +99,28 @@ msgstr "tema"
msgid "provided by %(readthedocs_web)s"
msgstr "proporcionado por %(readthedocs_web)s"

#: sphinx_rtd_theme/layout.html:97
#: sphinx_rtd_theme/layout.html:93
#, python-format
msgid "Search within %(docstitle)s"
msgstr "Buscar en %(docstitle)s"

#: sphinx_rtd_theme/layout.html:105
#: sphinx_rtd_theme/layout.html:101
msgid "About these documents"
msgstr "Sobre esta documentación"

#: sphinx_rtd_theme/layout.html:108
#: sphinx_rtd_theme/layout.html:104
msgid "Index"
msgstr "Índice"

#: sphinx_rtd_theme/layout.html:111 sphinx_rtd_theme/search.html:11
#: sphinx_rtd_theme/layout.html:107 sphinx_rtd_theme/search.html:11
msgid "Search"
msgstr "Búsqueda"

#: sphinx_rtd_theme/layout.html:114
#: sphinx_rtd_theme/layout.html:110
msgid "Copyright"
msgstr "Derechos de autor"

#: sphinx_rtd_theme/layout.html:147 sphinx_rtd_theme/layout.html:149
#: sphinx_rtd_theme/layout.html:143 sphinx_rtd_theme/layout.html:145
msgid "Logo"
msgstr "Logotipo"

Expand Down
Binary file modified sphinx_rtd_theme/locale/et/LC_MESSAGES/sphinx.mo
View file
Open in desktop
Binary file not shown.
18 changes: 9 additions & 9 deletions sphinx_rtd_theme/locale/et/LC_MESSAGES/sphinx.po
View file
Open in desktop
Expand Up @@ -12,14 +12,14 @@ msgid ""
msgstr ""
"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2021-09-13 13:35-0600\n"
"POT-Creation-Date: 2022-10-06 17:05+0200\n"
"PO-Revision-Date: 2019-07-16 21:44+0000\n"
"Last-Translator: Ivar Smolin <okul@linux.ee>, 2021\n"
"Language-Team: Estonian (https://www.transifex.com/readthedocs/teams/101354/et/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.8.0\n"
"Generated-By: Babel 2.10.3\n"
"Language: et\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

Expand Down Expand Up @@ -86,7 +86,7 @@ msgid "Built with %(sphinx_web)s using a"
msgstr "Ehitatud %(sphinx_web)s'iga,"

#. "theme" refers to a theme for Sphinx, which alters the appearance of the
#. generated documenation
#. generated documentation
#: sphinx_rtd_theme/footer.html:55
msgid "theme"
msgstr "kujundusteema"
Expand All @@ -98,28 +98,28 @@ msgstr "kujundusteema"
msgid "provided by %(readthedocs_web)s"
msgstr "on loonud %(readthedocs_web)s"

#: sphinx_rtd_theme/layout.html:97
#: sphinx_rtd_theme/layout.html:93
#, python-format
msgid "Search within %(docstitle)s"
msgstr "Otsi dokumendist %(docstitle)s"

#: sphinx_rtd_theme/layout.html:105
#: sphinx_rtd_theme/layout.html:101
msgid "About these documents"
msgstr "Nende dokumentide kirjeldused"

#: sphinx_rtd_theme/layout.html:108
#: sphinx_rtd_theme/layout.html:104
msgid "Index"
msgstr "Indeks"

#: sphinx_rtd_theme/layout.html:111 sphinx_rtd_theme/search.html:11
#: sphinx_rtd_theme/layout.html:107 sphinx_rtd_theme/search.html:11
msgid "Search"
msgstr "Otsing"

#: sphinx_rtd_theme/layout.html:114
#: sphinx_rtd_theme/layout.html:110
msgid "Copyright"
msgstr "Autoriõigus"

#: sphinx_rtd_theme/layout.html:147 sphinx_rtd_theme/layout.html:149
#: sphinx_rtd_theme/layout.html:143 sphinx_rtd_theme/layout.html:145
msgid "Logo"
msgstr "Logo"

Expand Down
Binary file modified sphinx_rtd_theme/locale/fa_IR/LC_MESSAGES/sphinx.mo
View file
Open in desktop
Binary file not shown.