Change the dependency list to ensure that: - all docutils versions are covered; - provide an explanation about the dependencies; - set a better minimal requirement for 3.4.3.
Unified · Split
| @@ -37,70 +37,102 @@ PYTHON_VER_CHANGES = {(8, 0, 2): PYTHON} · 36 unmodified lines | ||
| 37 | 37 | |
| 38 | 38 | # Sphinx versions to be installed and their incremental requirements |
| 39 | 39 | SPHINX_REQUIREMENTS = { |
| 40 | + # Oldest versions we support for each package required by Sphinx 3.4.3 | |
| 40 | 41 | (3, 4, 3): { |
| 42 | + "docutils": "0.16", | |
| 43 | + "alabaster": "0.7.12", | |
| 44 | + "babel": "2.8.0", | |
| 45 | + "certifi": "2020.6.20", | |
| 46 | + "docutils": "0.16", | |
| 47 | + "idna": "2.10", | |
| 48 | + "imagesize": "1.2.0", | |
| 49 | + "Jinja2": "2.11.2", | |
| 50 | + "MarkupSafe": "1.1.1", | |
| 51 | + "packaging": "20.4", | |
| 52 | + "Pygments": "2.6.1", | |
| 53 | + "PyYAML": "5.1", | |
| 54 | + "requests": "2.24.0", | |
| 55 | + "snowballstemmer": "2.0.0", | |
| 56 | + "sphinxcontrib-applehelp": "1.0.2", | |
| 57 | + "sphinxcontrib-devhelp": "1.0.2", | |
| 58 | + "sphinxcontrib-htmlhelp": "1.0.3", | |
| 59 | + "sphinxcontrib-jsmath": "1.0.1", | |
| 60 | + "sphinxcontrib-qthelp": "1.0.3", | |
| 61 | + "sphinxcontrib-serializinghtml": "1.1.4", | |
| 62 | + "urllib3": "1.25.9", | |
| 63 | + }, | |
| 64 | + | |
| 65 | + # Update package dependencies to a more modern base. The goal here | |
| 66 | + # is to avoid to many incremental changes for the next entries | |
| 67 | + (3, 5, 4): { | |
| 41 | 68 | "alabaster": "0.7.13", |
| 42 | 69 | "babel": "2.17.0", |
| 43 | 70 | "certifi": "2025.6.15", |
| 44 | − "charset-normalizer": "3.4.2", | |
| 45 | − "docutils": "0.15", | |
| 46 | 71 | "idna": "3.10", |
| 47 | 72 | "imagesize": "1.4.1", |
| 48 | 73 | "Jinja2": "3.0.3", |
| 49 | 74 | "MarkupSafe": "2.0", |
| 50 | 75 | "packaging": "25.0", |
| 51 | 76 | "Pygments": "2.19.1", |
| 52 | − "PyYAML": "5.1", | |
| 53 | 77 | "requests": "2.32.4", |
| 54 | 78 | "snowballstemmer": "3.0.1", |
| 55 | 79 | "sphinxcontrib-applehelp": "1.0.4", |
| 56 | − "sphinxcontrib-devhelp": "1.0.2", | |
| 57 | 80 | "sphinxcontrib-htmlhelp": "2.0.1", |
| 58 | − "sphinxcontrib-jsmath": "1.0.1", | |
| 59 | − "sphinxcontrib-qthelp": "1.0.3", | |
| 60 | 81 | "sphinxcontrib-serializinghtml": "1.1.5", |
| 61 | − "urllib3": "2.4.0", | |
| 62 | 82 | }, |
| 63 | − (3, 5, 4): {}, | |
| 83 | + | |
| 84 | + # Starting from here, ensure all docutils versions are covered with | |
| 85 | + # supported Sphinx versions. Other packages are upgraded only when | |
| 86 | + # required by pip | |
| 64 | 87 | (4, 0, 3): { |
| 65 | − "docutils": "0.17.1", | |
| 88 | + "docutils": "0.17", | |
| 66 | 89 | "PyYAML": "5.1", |
| 67 | 90 | }, |
| 68 | − (4, 1, 2): {}, | |
| 69 | − (4, 3, 2): {}, | |
| 91 | + (4, 1, 2): { | |
| 92 | + }, | |
| 93 | + (4, 3, 2): { | |
| 94 | + }, | |
| 70 | 95 | (4, 4, 0): {}, |
| 71 | 96 | (4, 5, 0): {}, |
| 72 | 97 | (5, 0, 2): {}, |
| 73 | 98 | (5, 1, 1): {}, |
| 74 | 99 | (5, 2, 3): { |
| 100 | + "docutils": "0.17.1", | |
| 75 | 101 | "Jinja2": "3.1.2", |
| 76 | 102 | "MarkupSafe": "2.0", |
| 77 | 103 | "PyYAML": "5.3.1", |
| 78 | 104 | }, |
| 79 | − (5, 3, 0): { | |
| 80 | − "docutils": "0.18.1", | |
| 81 | − "PyYAML": "5.3.1", | |
| 105 | + (5, 3, 0): {}, | |
| 106 | + (6, 0, 1): { | |
| 107 | + "docutils": "0.18", | |
| 82 | 108 | }, |
| 83 | − (6, 0, 1): {}, | |
| 84 | 109 | (6, 1, 3): {}, |
| 85 | 110 | (6, 2, 1): { |
| 111 | + "docutils": "0.18.1", | |
| 86 | 112 | "PyYAML": "5.4.1", |
| 87 | 113 | }, |
| 88 | − (7, 0, 1): {}, | |
| 114 | + (7, 0, 1): { | |
| 115 | + }, | |
| 89 | 116 | (7, 1, 2): {}, |
| 90 | 117 | (7, 2, 3): { |
| 118 | + "docutils": "0.19", | |
| 91 | 119 | "PyYAML": "6.0.1", |
| 92 | 120 | "sphinxcontrib-serializinghtml": "1.1.9", |
| 93 | 121 | }, |
| 94 | 122 | (7, 3, 7): { |
| 123 | + "docutils": "0.20", | |
| 95 | 124 | "alabaster": "0.7.14", |
| 96 | 125 | "PyYAML": "6.0.1", |
| 97 | 126 | }, |
| 98 | 127 | (7, 4, 7): { |
| 99 | − "docutils": "0.20", | |
| 128 | + "docutils": "0.21", | |
| 100 | 129 | "PyYAML": "6.0.1", |
| 101 | 130 | }, |
| 102 | − (8, 0, 2): {}, | |
| 131 | + (8, 0, 2): { | |
| 132 | + "docutils": "0.21.1", | |
| 133 | + }, | |
| 103 | 134 | (8, 1, 3): { |
| 135 | + "docutils": "0.21.2", | |
| 104 | 136 | "PyYAML": "6.0.1", |
| 105 | 137 | "sphinxcontrib-applehelp": "1.0.7", |
| 106 | 138 | "sphinxcontrib-devhelp": "1.0.6", |