Skip to content

Commit 53ec9f8

Browse files
benjaomingbenjaoming
authored
Release 1.1.0b3 (#1361)
* Update __init__.py because it wasn't updated by previous bump2version * Add some comments about docker mechanisms that are disturbing release workflow * Bump to version 1.1.0b3 * Revert "Bump to 1.1.0b2, rebuild assets" This reverts commit 615eb52. * Add changelog entry for #1073 * Changelog entry for #1193
1 parent 7771d05 commit 53ec9f8

File tree

42 files changed

+246
-189
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+246
-189
lines changed

‎Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ RUN cd /project
3333

3434
# It matters that the node environment is installed into the same
3535
# folder, i.e. /project where we will run the environment from
36+
# TODO: We don't want to update package-lock.json here, we
37+
# should use npm ci instead
3638
RUN npm install --package-lock-only &&\
3739
npm audit fix &&\
3840
npm install

‎docker-entrypoint.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ pip install --upgrade -e ".[dev]"
1111
# npm install
1212

1313
cd /project
14+
15+
# TODO: This is a bad approach, it copies from the image which
16+
# may be outdated to the current git tree
1417
cp -r /project-readonly/sphinx_rtd_theme .
1518

1619
echo "Going to invoke: npm run $@"

‎docs/changelog.rst

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ Changelog
55
Development version (|development_version|)
66
===========================================
77

8-
.. |development_version| replace:: 1.1.0b2
8+
.. |development_version| replace:: 1.1.0b3
99

10-
.. _release-1.1.0b2:
10+
.. _release-1.1.0b3:
1111

12-
1.1.0b2
12+
1.1.0b3
1313
=======
1414

1515
Dependency Changes
@@ -28,6 +28,7 @@ Features
2828
--------
2929

3030
* Nicer styles for <kbd> (#967)
31+
* New styling for breadcrumbs (#1073)
3132

3233

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

4143

4244
Minor Changes

‎package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "sphinx_rtd_theme",
33
"main": "js/theme.js",
4-
"version": "1.1.0b2",
4+
"version": "1.1.0b3",
55
"scripts": {
66
"dev": "webpack-dev-server --open --config webpack.dev.js",
77
"build": "webpack --config webpack.prod.js",

‎setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 1.1.0b2
2+
current_version = 1.1.0b3
33
commit = false
44
tag = false
55
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+)(?P<dev>\d+))?

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def run(self):
8686

8787

8888
setup(
89-
version='1.1.0b2',
89+
version='1.1.0b3',
9090
cmdclass={
9191
'update_translations': UpdateTranslationsCommand,
9292
'transifex': TransifexCommand,

‎sphinx_rtd_theme/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from sphinx.util.logging import getLogger
1313

1414

15-
__version__ = '1.0.1alpha1'
15+
__version__ = '1.1.0b3'
1616
__version_full__ = __version__
1717

1818
logger = getLogger(__name__)

‎sphinx_rtd_theme/layout.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
{%- set lang_attr = 'en' if language == None else (language | replace('_', '-')) %}
1010
{%- set sphinx_writer = 'writer-html5' if html5_doctype else 'writer-html4' -%}
1111

12+
{# Build sphinx_version_info tuple from sphinx_version string in pure Jinja #}
13+
{%- set (_ver_major, _ver_minor) = (sphinx_version.split('.') | list)[:2] | map('int') -%}
14+
{%- set sphinx_version_info = (_ver_major, _ver_minor, -1) -%}
15+
1216
<!DOCTYPE html>
1317
<html class="{{ sphinx_writer }}" lang="{{ lang_attr }}" >
1418
<head>

‎sphinx_rtd_theme/locale/de/LC_MESSAGES/sphinx.mo

2 Bytes
Binary file not shown.

‎sphinx_rtd_theme/locale/de/LC_MESSAGES/sphinx.po

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ msgid ""
1111
msgstr ""
1212
"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
1313
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
14-
"POT-Creation-Date: 2021-09-13 13:35-0600\n"
14+
"POT-Creation-Date: 2022-10-06 17:05+0200\n"
1515
"PO-Revision-Date: 2019-07-16 21:44+0000\n"
1616
"Last-Translator: Tom Kunze <transifex.com@tomabrafix.de>, 2019\n"
1717
"Language-Team: German (https://www.transifex.com/readthedocs/teams/101354/de/)\n"
1818
"MIME-Version: 1.0\n"
1919
"Content-Type: text/plain; charset=UTF-8\n"
2020
"Content-Transfer-Encoding: 8bit\n"
21-
"Generated-By: Babel 2.8.0\n"
21+
"Generated-By: Babel 2.10.3\n"
2222
"Language: de\n"
2323
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
2424

@@ -71,28 +71,28 @@ msgstr "Erstellt mit %(sphinx_web)s mit einem"
7171
msgid "provided by %(readthedocs_web)s"
7272
msgstr "bereitgestellt von %(readthedocs_web)s"
7373

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

79-
#: sphinx_rtd_theme/layout.html:105
79+
#: sphinx_rtd_theme/layout.html:101
8080
msgid "About these documents"
8181
msgstr "Über diese Dokumentation"
8282

83-
#: sphinx_rtd_theme/layout.html:108
83+
#: sphinx_rtd_theme/layout.html:104
8484
msgid "Index"
8585
msgstr "Index"
8686

87-
#: sphinx_rtd_theme/layout.html:111 sphinx_rtd_theme/search.html:11
87+
#: sphinx_rtd_theme/layout.html:107 sphinx_rtd_theme/search.html:11
8888
msgid "Search"
8989
msgstr "Suche"
9090

91-
#: sphinx_rtd_theme/layout.html:114
91+
#: sphinx_rtd_theme/layout.html:110
9292
msgid "Copyright"
9393
msgstr "Copyright"
9494

95-
#: sphinx_rtd_theme/layout.html:147 sphinx_rtd_theme/layout.html:149
95+
#: sphinx_rtd_theme/layout.html:143 sphinx_rtd_theme/layout.html:145
9696
msgid "Logo"
9797
msgstr "Logo"
9898

‎sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.mo

2 Bytes
Binary file not shown.

‎sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.po

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
1010
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
11-
"POT-Creation-Date: 2021-09-13 13:35-0600\n"
11+
"POT-Creation-Date: 2022-10-06 17:05+0200\n"
1212
"PO-Revision-Date: 2019-07-16 15:43-0600\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language: en\n"
1515
"Language-Team: en <LL@li.org>\n"
16-
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
16+
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
1717
"MIME-Version: 1.0\n"
1818
"Content-Type: text/plain; charset=utf-8\n"
1919
"Content-Transfer-Encoding: 8bit\n"
20-
"Generated-By: Babel 2.8.0\n"
20+
"Generated-By: Babel 2.10.3\n"
2121

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

108-
#: sphinx_rtd_theme/layout.html:97
108+
#: sphinx_rtd_theme/layout.html:93
109109
#, python-format
110110
msgid "Search within %(docstitle)s"
111111
msgstr ""
112112

113-
#: sphinx_rtd_theme/layout.html:105
113+
#: sphinx_rtd_theme/layout.html:101
114114
msgid "About these documents"
115115
msgstr ""
116116

117-
#: sphinx_rtd_theme/layout.html:108
117+
#: sphinx_rtd_theme/layout.html:104
118118
msgid "Index"
119119
msgstr ""
120120

121-
#: sphinx_rtd_theme/layout.html:111 sphinx_rtd_theme/search.html:11
121+
#: sphinx_rtd_theme/layout.html:107 sphinx_rtd_theme/search.html:11
122122
msgid "Search"
123123
msgstr ""
124124

125-
#: sphinx_rtd_theme/layout.html:114
125+
#: sphinx_rtd_theme/layout.html:110
126126
msgid "Copyright"
127127
msgstr ""
128128

129-
#: sphinx_rtd_theme/layout.html:147 sphinx_rtd_theme/layout.html:149
129+
#: sphinx_rtd_theme/layout.html:143 sphinx_rtd_theme/layout.html:145
130130
msgid "Logo"
131131
msgstr ""
132132

133133
#. This is an ARIA section label for the main navigation menu
134-
#: sphinx_rtd_theme/layout.html:173
134+
#: sphinx_rtd_theme/layout.html:169
135135
msgid "Navigation menu"
136136
msgstr ""
137137

138138
#. This is an ARIA section label for the navigation menu that is visible when
139139
#. viewing the page on mobile devices
140-
#: sphinx_rtd_theme/layout.html:195
140+
#: sphinx_rtd_theme/layout.html:191
141141
msgid "Mobile navigation menu"
142142
msgstr ""
143143

‎sphinx_rtd_theme/locale/es/LC_MESSAGES/sphinx.mo

58 Bytes
Binary file not shown.

‎sphinx_rtd_theme/locale/es/LC_MESSAGES/sphinx.po

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,22 @@
77
# Translators:
88
# Anthony <aj@ohess.org>, 2019
99
# Radina Matic <radina.matic@gmail.com>, 2021
10+
# Leonardo J. Caballero G. <leonardocaballero@gmail.com>, 2022
1011
#
1112
msgid ""
1213
msgstr ""
1314
"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
1415
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
15-
"POT-Creation-Date: 2021-09-13 13:35-0600\n"
16+
"POT-Creation-Date: 2022-10-06 17:05+0200\n"
1617
"PO-Revision-Date: 2019-07-16 21:44+0000\n"
17-
"Last-Translator: Radina Matic <radina.matic@gmail.com>, 2021\n"
18+
"Last-Translator: Leonardo J. Caballero G. <leonardocaballero@gmail.com>, 2022\n"
1819
"Language-Team: Spanish (https://www.transifex.com/readthedocs/teams/101354/es/)\n"
1920
"MIME-Version: 1.0\n"
2021
"Content-Type: text/plain; charset=UTF-8\n"
2122
"Content-Transfer-Encoding: 8bit\n"
22-
"Generated-By: Babel 2.8.0\n"
23+
"Generated-By: Babel 2.10.3\n"
2324
"Language: es\n"
24-
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
25+
"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
2526

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

101-
#: sphinx_rtd_theme/layout.html:97
102+
#: sphinx_rtd_theme/layout.html:93
102103
#, python-format
103104
msgid "Search within %(docstitle)s"
104105
msgstr "Buscar en %(docstitle)s"
105106

106-
#: sphinx_rtd_theme/layout.html:105
107+
#: sphinx_rtd_theme/layout.html:101
107108
msgid "About these documents"
108109
msgstr "Sobre esta documentación"
109110

110-
#: sphinx_rtd_theme/layout.html:108
111+
#: sphinx_rtd_theme/layout.html:104
111112
msgid "Index"
112113
msgstr "Índice"
113114

114-
#: sphinx_rtd_theme/layout.html:111 sphinx_rtd_theme/search.html:11
115+
#: sphinx_rtd_theme/layout.html:107 sphinx_rtd_theme/search.html:11
115116
msgid "Search"
116117
msgstr "Búsqueda"
117118

118-
#: sphinx_rtd_theme/layout.html:114
119+
#: sphinx_rtd_theme/layout.html:110
119120
msgid "Copyright"
120121
msgstr "Derechos de autor"
121122

122-
#: sphinx_rtd_theme/layout.html:147 sphinx_rtd_theme/layout.html:149
123+
#: sphinx_rtd_theme/layout.html:143 sphinx_rtd_theme/layout.html:145
123124
msgid "Logo"
124125
msgstr "Logotipo"
125126

‎sphinx_rtd_theme/locale/et/LC_MESSAGES/sphinx.mo

2 Bytes
Binary file not shown.

‎sphinx_rtd_theme/locale/et/LC_MESSAGES/sphinx.po

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ msgid ""
1212
msgstr ""
1313
"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
1414
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
15-
"POT-Creation-Date: 2021-09-13 13:35-0600\n"
15+
"POT-Creation-Date: 2022-10-06 17:05+0200\n"
1616
"PO-Revision-Date: 2019-07-16 21:44+0000\n"
1717
"Last-Translator: Ivar Smolin <okul@linux.ee>, 2021\n"
1818
"Language-Team: Estonian (https://www.transifex.com/readthedocs/teams/101354/et/)\n"
1919
"MIME-Version: 1.0\n"
2020
"Content-Type: text/plain; charset=UTF-8\n"
2121
"Content-Transfer-Encoding: 8bit\n"
22-
"Generated-By: Babel 2.8.0\n"
22+
"Generated-By: Babel 2.10.3\n"
2323
"Language: et\n"
2424
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
2525

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

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

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

106-
#: sphinx_rtd_theme/layout.html:105
106+
#: sphinx_rtd_theme/layout.html:101
107107
msgid "About these documents"
108108
msgstr "Nende dokumentide kirjeldused"
109109

110-
#: sphinx_rtd_theme/layout.html:108
110+
#: sphinx_rtd_theme/layout.html:104
111111
msgid "Index"
112112
msgstr "Indeks"
113113

114-
#: sphinx_rtd_theme/layout.html:111 sphinx_rtd_theme/search.html:11
114+
#: sphinx_rtd_theme/layout.html:107 sphinx_rtd_theme/search.html:11
115115
msgid "Search"
116116
msgstr "Otsing"
117117

118-
#: sphinx_rtd_theme/layout.html:114
118+
#: sphinx_rtd_theme/layout.html:110
119119
msgid "Copyright"
120120
msgstr "Autoriõigus"
121121

122-
#: sphinx_rtd_theme/layout.html:147 sphinx_rtd_theme/layout.html:149
122+
#: sphinx_rtd_theme/layout.html:143 sphinx_rtd_theme/layout.html:145
123123
msgid "Logo"
124124
msgstr "Logo"
125125

‎sphinx_rtd_theme/locale/fa_IR/LC_MESSAGES/sphinx.mo

-11 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)