Skip to content

Commit

Permalink
Release 1.2.2 (#1484)
Browse files Browse the repository at this point in the history
* Changelog for 1.2.2

* 1.2.2rc1

* Build: Fix bug that reads out container id from previous run

* Update package-lock to match release

* Bump to 1.2.2 final
  • Loading branch information
benjaoming committed Jun 7, 2023
1 parent 2442ab9 commit 9899ee4
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 35 deletions.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ docker-images:
docker-npm-build:
rm -f .container_id
docker-compose run -d sphinx_rtd_theme build > .container_id
sleep 1s
docker container wait "$(shell cat .container_id)"
docker cp "$(shell cat .container_id):/project/sphinx_rtd_theme" .
docker cp "$(shell cat .container_id):/project/package-lock.json" .
@echo "Done building"

docker-npm-dev:
docker-compose run sphinx_rtd_theme dev

docker-build-all: docker-images docker-npm-build
25 changes: 21 additions & 4 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,29 @@ Changelog

.. seealso:: :ref:`howto_upgrade`

.. _release-1.2.1:
.. |theme_version| replace:: 1.2.2


.. _release-1.2.2:

1.2.2
=====

Fixes
-----

|theme_version|
===============
* Require `sphinxcontrib-jquery>=4,<5` (#1446)

.. |theme_version| replace:: 1.2.1
Added
-----

* Styling for `:menuselection:` (#1426)


.. _release-1.2.1:

1.2.1
=====

Fixes
-----
Expand Down
52 changes: 26 additions & 26 deletions package-lock.json

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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "sphinx_rtd_theme",
"main": "js/theme.js",
"version": "1.2.1",
"version": "1.2.2",
"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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.2.1
current_version = 1.2.2
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
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def run(self):


setup(
version='1.2.1',
version='1.2.2',
cmdclass={
'update_translations': UpdateTranslationsCommand,
'transifex': TransifexCommand,
Expand Down
2 changes: 1 addition & 1 deletion sphinx_rtd_theme/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from sphinx.util.logging import getLogger


__version__ = '1.2.1'
__version__ = '1.2.2'
__version_full__ = __version__

logger = getLogger(__name__)
Expand Down

0 comments on commit 9899ee4

Please sign in to comment.