Skip to content

Commit a13d639

Browse files
jdknightjdknight
authored
Merge pull request #638 from sphinx-contrib/maintenance-2022-03-27
maintenance (2022-03-27)
2 parents 947e203 + de41257 commit a13d639

File tree

8 files changed

+29
-16
lines changed

8 files changed

+29
-16
lines changed

‎.github/workflows/build.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -32,29 +32,30 @@ jobs:
3232
include:
3333
- { os: ubuntu-latest, python: "2.7", toxenv: py27-sphinx18, cache: ~/.cache/pip }
3434
- { os: ubuntu-latest, python: "3.7", toxenv: py37-sphinx18, cache: ~/.cache/pip }
35-
- { os: ubuntu-latest, python: "3.7", toxenv: py37-sphinx40, cache: ~/.cache/pip }
3635
- { os: ubuntu-latest, python: "3.7", toxenv: py37-sphinx41, cache: ~/.cache/pip }
3736
- { os: ubuntu-latest, python: "3.7", toxenv: py37-sphinx42, cache: ~/.cache/pip }
3837
- { os: ubuntu-latest, python: "3.7", toxenv: py37-sphinx43, cache: ~/.cache/pip }
3938
- { os: ubuntu-latest, python: "3.7", toxenv: py37-sphinx44, cache: ~/.cache/pip }
39+
- { os: ubuntu-latest, python: "3.7", toxenv: py37-sphinx45, cache: ~/.cache/pip }
4040
- { os: ubuntu-latest, python: "3.8", toxenv: py38-sphinx18, cache: ~/.cache/pip }
41-
- { os: ubuntu-latest, python: "3.8", toxenv: py38-sphinx40, cache: ~/.cache/pip }
4241
- { os: ubuntu-latest, python: "3.8", toxenv: py38-sphinx41, cache: ~/.cache/pip }
4342
- { os: ubuntu-latest, python: "3.8", toxenv: py38-sphinx42, cache: ~/.cache/pip }
4443
- { os: ubuntu-latest, python: "3.8", toxenv: py38-sphinx43, cache: ~/.cache/pip }
4544
- { os: ubuntu-latest, python: "3.8", toxenv: py38-sphinx44, cache: ~/.cache/pip }
45+
- { os: ubuntu-latest, python: "3.8", toxenv: py38-sphinx45, cache: ~/.cache/pip }
4646
- { os: ubuntu-latest, python: "3.9", toxenv: py39-sphinx18, cache: ~/.cache/pip }
47-
- { os: ubuntu-latest, python: "3.9", toxenv: py39-sphinx40, cache: ~/.cache/pip }
4847
- { os: ubuntu-latest, python: "3.9", toxenv: py39-sphinx41, cache: ~/.cache/pip }
4948
- { os: ubuntu-latest, python: "3.9", toxenv: py39-sphinx42, cache: ~/.cache/pip }
5049
- { os: ubuntu-latest, python: "3.9", toxenv: py39-sphinx43, cache: ~/.cache/pip }
5150
- { os: ubuntu-latest, python: "3.9", toxenv: py39-sphinx44, cache: ~/.cache/pip }
51+
- { os: ubuntu-latest, python: "3.9", toxenv: py39-sphinx45, cache: ~/.cache/pip }
5252
- { os: ubuntu-latest, python: "3.10", toxenv: py310-sphinx18, cache: ~/.cache/pip }
5353
- { os: ubuntu-latest, python: "3.10", toxenv: py310-sphinx44, cache: ~/.cache/pip }
54+
- { os: ubuntu-latest, python: "3.10", toxenv: py310-sphinx45, cache: ~/.cache/pip }
5455
- { os: macos-latest, python: "2.7", toxenv: py27-sphinx18, cache: ~/Library/Caches/pip }
55-
- { os: macos-latest, python: "3.10", toxenv: py310-sphinx44, cache: ~/Library/Caches/pip }
56+
- { os: macos-latest, python: "3.10", toxenv: py310-sphinx45, cache: ~/Library/Caches/pip }
5657
- { os: windows-latest, python: "2.7", toxenv: py27-sphinx18, cache: ~\AppData\Local\pip\Cache }
57-
- { os: windows-latest, python: "3.10", toxenv: py310-sphinx44, cache: ~\AppData\Local\pip\Cache }
58+
- { os: windows-latest, python: "3.10", toxenv: py310-sphinx45, cache: ~\AppData\Local\pip\Cache }
5859
- { os: ubuntu-latest, python: "3.10", toxenv: flake8, cache: ~/.cache/pip }
5960
- { os: ubuntu-latest, python: "3.10", toxenv: pylint, cache: ~/.cache/pip }
6061

‎AUTHORS

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ Anthony Shaw <[email protected]>
22
Chugunov Denis <[email protected]>
33
Colin Starner <[email protected]>
44
Daniel Gray <[email protected]>
5+
Felix Sherrington-Kendall <[email protected]>
56
Fernando Gargiulo <[email protected]>
67
Freek Dijkstra <[email protected]>
78
James Bungard <[email protected]>
@@ -13,12 +14,14 @@ John Teasdale <[email protected]>
1314
Juan J. Caballero <[email protected]>
1415
Logan Jones <[email protected]>
1516
Marius van Niekerk <[email protected]>
17+
Mateusz Kostyła <[email protected]>
1618
Michael Kunzmann <[email protected]>
1719
Michał Sochoń <[email protected]>
1820
Paul D.Smith <[email protected]>
1921
Pawel Limanowka <[email protected]>
2022
Thomas Malcher <[email protected]>
2123
Toni Ruža <[email protected]>
24+
Tsvi Mostovicz <[email protected]>
2225
Zed Tan <[email protected]>
2326
pyracode <[email protected]>
2427
sumau <[email protected]>

‎CHANGES.rst

+6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
Development
22
===========
33

4+
* **(note)** ``confluence_max_doc_depth`` support is deprecated (reminder)
5+
* **(note)** (advanced mode) macro disabling is deprecated
46
* add configuration for personal access tokens (to avoid header entry changes)
57
* fixed issue where confluence cloud did not update homepage on a personal space
8+
* fixed issue where inline internal targets would create an empty link label
69
* fixed issue where jira directives/role could not be substituted
10+
* improve formatting when processing autodoc content (containers)
711
* improve support when using the sphinx-diagrams extension
12+
* improve table-alignment for markdown
813
* introduce the latex directive/role
914
* removed informational macro styling on figures
1015
* support rate limiting for publish requests
16+
* support setting the comment field in page update events
1117
* support users to render math through available marketplace latex macros
1218

1319
1.7.1 (2021-11-30)

‎README.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ Requirements
2828

2929
* Python_ 2.7 or 3.7+
3030
* Requests_ 2.14.0+
31-
* Sphinx_ 1.8 or 4.0+
31+
* Sphinx_ 1.8 or 4.1+
3232

3333
If publishing:
3434

35-
* Confluence_ Cloud or Data Center / Server 7.3+
35+
* Confluence_ Cloud or Data Center / Server 7.4+
3636

3737
Installing
3838
==========

‎doc/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
version = sphinxcontrib.confluencebuilder.__version__
1515
release = sphinxcontrib.confluencebuilder.__version__
1616

17-
supported_confluence_ver = '7.3+'
17+
supported_confluence_ver = '7.4+'
1818
supported_python_ver = '2.7 or 3.7+'
19-
supported_sphinx_ver = '1.8 or 4.0+'
19+
supported_sphinx_ver = '1.8 or 4.1+'
2020

2121
root_doc = 'contents'
2222

‎setup.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
# -*- coding: utf-8 -*-
22
"""
3-
:copyright: Copyright 2016-2021 Sphinx Confluence Builder Contributors (AUTHORS)
3+
:copyright: Copyright 2016-2022 Sphinx Confluence Builder Contributors (AUTHORS)
44
:license: BSD-2-Clause (LICENSE)
55
"""
66

77
from distutils.command.clean import clean
88
from distutils import dir_util
99
from setuptools import find_packages
1010
from setuptools import setup
11+
import io
1112
import os
1213

1314
try:
1415
from babel.messages import frontend as babel
1516
except ImportError:
1617
babel = None
1718

18-
with open('README.rst', 'r') as readme_rst:
19+
20+
with io.open('README.rst', 'r', encoding='utf-8') as readme_rst:
1921
long_desc = readme_rst.read()
2022

2123

@@ -43,6 +45,7 @@ def run(self):
4345

4446
requires = [
4547
'docutils<0.18;python_version<"3.0"', # legacy docutils for older sphinx
48+
'jinja2<=3.0.3;python_version<"3.0"', # legacy jinja2 for older sphinx
4649
'requests>=2.14.0',
4750
'sphinx>=1.8',
4851
]

‎sphinxcontrib/confluencebuilder/locale/sphinxcontrib.confluencebuilder.pot

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ msgstr ""
99
#: sphinxcontrib/confluencebuilder/storage/templates/domainindex.html:11
1010
#: sphinxcontrib/confluencebuilder/storage/templates/genindex.html:37
1111
#: sphinxcontrib/confluencebuilder/storage/templates/search.html:10
12-
#: sphinxcontrib/confluencebuilder/storage/translator.py:1953
12+
#: sphinxcontrib/confluencebuilder/storage/translator.py:1853
1313
msgid "This page has been automatically generated."
1414
msgstr ""
1515

16-
#: sphinxcontrib/confluencebuilder/storage/translator.py:1968
16+
#: sphinxcontrib/confluencebuilder/storage/translator.py:1868
1717
msgid "Edit Source"
1818
msgstr ""
1919

‎tox.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ envlist =
33
flake8
44
pylint
55
py{27,37,38,39,310}-sphinx{18}
6-
py{37,38,39}-sphinx{40,41,42,43,44}
7-
py{310}-sphinx{42,43,44}
6+
py{37,38,39}-sphinx{41,42,43,44}
7+
py{310}-sphinx{42,43,44,45}
88

99
[testenv]
1010
deps =
1111
-r{toxinidir}/requirements_dev.txt
1212
sphinx18: docutils<0.18
1313
sphinx18: jinja2<=3.0.3
1414
sphinx18: sphinx>=1.8,<2.0
15-
sphinx40: sphinx>=4.0,<4.1
1615
sphinx41: sphinx>=4.1,<4.2
1716
sphinx42: sphinx>=4.2,<4.3
1817
sphinx43: sphinx>=4.3,<4.4
1918
sphinx44: sphinx>=4.4,<4.5
19+
sphinx45: sphinx>=4.5,<4.6
2020
commands =
2121
{envpython} -m tests {posargs}
2222
setenv =

0 commit comments

Comments
 (0)