Commitd9aff8d

authored

Point to cpython/Doc/requirements.txt instead of duplicating it every time (#3301)

Let's also do some alpha-sorting and small cleanup.Signed-off-by: Rodrigo Tobar <rtobar@icrar.org>

1 parent884379d commitd9aff8dCopy full SHA for d9aff8d

File tree

+17

-24

lines changed

+17

-24

lines changed

Lines changed: 9 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,7 @@ We are currently in branch 3.12, and we want to update the strings from 3.13.`
`23`	`23`
`24`	`24`	`git checkout tags/v3.13.0 -b 3.13.0`
`25`	`25`
`26`		-#. Update the branch on the ``Makefile`` and check the ``requirements.txt`` from
`27`		- ``./cpython/Doc`` directory, to see if upgrades on the modules like sphinx is
`28`		`- needed.`
	`26`	+#. Update the branch on the ``Makefile``
`29`	`27`
`30`	`28`	`#. Commit the update of the submodule change::`
`31`	`29`
`@@ -40,9 +38,14 @@ We are currently in branch 3.12, and we want to update the strings from 3.13.`
`40`	`38`	`python -m venv env`
`41`	`39`	`source env/bin/activate # Windows: env\Scripts\activate.bat`
`42`	`40`	`pip install -r requirements.txt`
`43`		`-`
`44`		`-#. Verify that the docs build with the new versions you changed from`
`45`		- ``requirements.txt`` mainly the sphinx version::
	`41`	`+`
	`42`	`+ .. note::`
	`43`	`+ This might fail if some of our own requirements`
	`44`	`+ conflict with cpython's. If so, find a way to fix`
	`45`	`+ our requirements.`
	`46`	`+`
	`47`	`+#. Verify that the docs build with the new versions of the build requirements,`
	`48`	`+ mainly the sphinx version::`
`46`	`49`
`47`	`50`	`make build`
`48`	`51`

Lines changed: 8 additions & 18 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,28 +1,18 @@`
`1`		`-docutils==0.21.2`
	`1`	`+-rcpython/Doc/requirements.txt`
	`2`	`+`
	`3`	`+# Our own dependencies (alpha-sorted please)`
`2`	`4`	`pip`
`3`		`-Pygments>=2.17.0`
`4`		`-PyICU`
`5`	`5`	`polib`
`6`	`6`	`pospell>=1.1`
`7`	`7`	`potodo`
`8`	`8`	`powrap>=1.0.2`
`9`		`-setuptools`
`10`		`-sphinx-intl>=2.3.0`
`11`	`9`	`pre-commit`
	`10`	`+Pygments>=2.17.0`
	`11`	`+PyICU`
	`12`	`+setuptools`
`12`	`13`	`sphinx-autorun`
`13`	`14`	`sphinxemoji`
`14`		`-sphinx-tabs==3.4.5`
	`15`	`+sphinx-intl>=2.3.0`
`15`	`16`	`sphinx-lint==0.7.0`
	`17`	`+sphinx-tabs==3.4.5`
`16`	`18`	`tabulate`
`17`		`-`
`18`		`-# from cpython/Doc/requirements.txt`
`19`		`-sphinx~=8.0.0`
`20`		`-`
`21`		`-blurb`
`22`		`-`
`23`		`-sphinxext-opengraph~=0.9.0`
`24`		`-sphinx-notfound-page~=1.0.0`
`25`		`-`
`26`		`-# The theme used by the documentation is stored separately, so we need`
`27`		`-# to install that as well.`
`28`		`-python-docs-theme>=2023.3.1,!=2023.7`

Comments

(0)