Skip to content

Commit d576a12

Browse files
committed
Merge branch 'master' into Blendify/fix-717
2 parents 4688389 + 61bce4f commit d576a12

Some content is hidden

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

60 files changed

+1741
-485
lines changed

.circleci/config.yml

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,33 @@ commands:
88
type: string
99
sphinx-version:
1010
type: string
11-
default: "16,17,18,20,21,22,23,24,30,31,32,33,34,latest"
11+
default: "16,17,18,20,21,22,23,24,30,31,32,33,34,35,40,41,latest"
1212
steps:
1313
- checkout
1414
- run: pip install --user tox
1515
- run: tox -e "<<parameters.version>>-sphinx{<<parameters.sphinx-version>>}"
16+
run-build:
17+
description: "Ensure built assets are up to date"
18+
steps:
19+
- checkout
20+
- run: npm ci
21+
- run: npm run build
22+
- run:
23+
name: Ensure built assets are up to date
24+
command: |
25+
if [[ `git status sphinx_rtd_theme/ --porcelain` ]]
26+
then
27+
echo "ERROR: assets are out of date. Make sure to run 'npm run build' on your branch."
28+
git status sphinx_rtd_theme/ --porcelain
29+
exit 1
30+
fi
1631
1732
jobs:
33+
build:
34+
docker:
35+
- image: 'cimg/python:3.9-node'
36+
steps:
37+
- run-build: {}
1838
py27:
1939
docker:
2040
- image: 'cimg/python:2.7'
@@ -50,8 +70,19 @@ workflows:
5070
version: 2
5171
tests:
5272
jobs:
53-
- py39
54-
- py38
55-
- py37
56-
- py36
57-
- py27
73+
- build
74+
- py39:
75+
requires:
76+
- build
77+
- py38:
78+
requires:
79+
- build
80+
- py37:
81+
requires:
82+
- build
83+
- py36:
84+
requires:
85+
- build
86+
- py27:
87+
requires:
88+
- build

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @readthedocs/theme

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@ sphinx_rtd_theme/static/fonts/RobotoSlab/
2323
.node-version
2424
sphinx_rtd_theme/static/js/html5shiv.min.js
2525
sphinx_rtd_theme/static/js/html5shiv-printshiv.min.js
26+
.nvmrc

.tx/config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
file_filter = sphinx_rtd_theme/locale/<lang>/LC_MESSAGES/sphinx.po
33
source_file = sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.po
44
source_lang = en
5-
minimum_perc = 90
5+
minimum_perc = 60
66

77
[main]
88
host = https://www.transifex.com

README.rst

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ a working demo of the theme in the `theme documentation`_
2222

2323
.. _Sphinx: http://www.sphinx-doc.org
2424
.. _Read the Docs: http://www.readthedocs.org
25-
.. _theme documentation: https://sphinx-rtd-theme.readthedocs.io/en/latest/
25+
.. _theme documentation: https://sphinx-rtd-theme.readthedocs.io/en/stable/
2626

2727
Installation
2828
============
@@ -33,24 +33,27 @@ This theme is distributed on PyPI_ and can be installed with ``pip``:
3333
3434
$ pip install sphinx-rtd-theme
3535
36-
To use the theme in your Sphinx project, you will need to add the following to
37-
your ``conf.py`` file:
36+
To use the theme in your Sphinx project, you will need to edit
37+
your ``conf.py`` file's ``html_theme`` setting:
3838

3939
.. code:: python
4040
41-
import sphinx_rtd_theme
41+
html_theme = "sphinx_rtd_theme"
4242
43-
extensions = [
44-
...
45-
"sphinx_rtd_theme",
46-
]
43+
.. seealso::
44+
`Supported browsers`_
45+
Officially supported and tested browser/operating system combinations
4746

48-
html_theme = "sphinx_rtd_theme"
47+
`Supported dependencies`_
48+
Supported versions of Python, Sphinx, and other dependencies.
4949

50-
For more information read the full documentation on `installing the theme`_
50+
`Example documentation`_
51+
A full example of this theme output, with localized strings enabled.
5152

5253
.. _PyPI: https://pypi.python.org/pypi/sphinx_rtd_theme
53-
.. _installing the theme: https://sphinx-rtd-theme.readthedocs.io/en/latest/installing.html
54+
.. _Supported browsers: https://sphinx-rtd-theme.readthedocs.io/en/stable/development.html#supported-browsers
55+
.. _Supported dependencies: https://sphinx-rtd-theme.readthedocs.io/en/stable/development.html#supported-dependencies
56+
.. _Example documentation: https://sphinx-rtd-theme.readthedocs.io/en/stable/
5457

5558
Configuration
5659
=============
@@ -59,12 +62,12 @@ This theme is highly customizable on both the page level and on a global level.
5962
To see all the possible configuration options, read the documentation on
6063
`configuring the theme`_.
6164

62-
.. _configuring the theme: https://sphinx-rtd-theme.readthedocs.io/en/latest/configuring.html
65+
.. _configuring the theme: https://sphinx-rtd-theme.readthedocs.io/en/stable/configuring.html
6366

6467
Contributing
6568
============
6669

6770
If you would like to help modify or translate the theme, you'll find more
6871
information on contributing in our `contributing guide`_.
6972

70-
.. _contributing guide: https://sphinx-rtd-theme.readthedocs.io/en/latest/contributing.html
73+
.. _contributing guide: https://sphinx-rtd-theme.readthedocs.io/en/stable/contributing.html

0 commit comments

Comments
 (0)