Skip to content

Commit 53ec9f8

Browse files
benjaomingbenjaoming
authored
Release 1.1.0b3 (readthedocs#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 readthedocs#1073 * Changelog entry for readthedocs#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.

0 commit comments

Comments
 (0)