From 2c86e15e0fbff2bb9c9c2a6a2748826b2a1e229d Mon Sep 17 00:00:00 2001 From: chala2001 Date: Fri, 28 Aug 2026 00:38:47 +0530 Subject: [PATCH] Fix the broken docs tox environment tox -e docs runs "python setup.py build_sphinx", a command that came from sphinx.setup_command. Sphinx removed it in 7.0 and test-requirements.txt pins sphinx>=8.1.3, so the environment fails with: error: invalid command 'build_sphinx' Runs the build documented in doc/README.md instead, and pulls in doc/requirements-docs.txt. doc/source/conf.py imports recommonmark, which none of the four requirements files tox already installs provides, so the environment could not have worked even with the command fixed. setup.cfg held only [build_sphinx] and [upload_sphinx], both settings for that removed command, so it goes with them. Also refreshes envlist, which still named py36 through py39. setup.py has required 3.10 for a while now, and CI tests 3.10 through 3.14. --- setup.cfg | 7 ------- tox.ini | 10 +++++++--- 2 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 setup.cfg diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 40fddba6a8..0000000000 --- a/setup.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[build_sphinx] -source-dir = doc/source -build-dir = doc/build -all_files = 1 - -[upload_sphinx] -upload-dir = doc/build/html \ No newline at end of file diff --git a/tox.ini b/tox.ini index 3be1d4bea3..09763a388b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist = - py3{6,7,8,9} - py3{6,7,8,9}-functional + py3{10,11,12,13,14} + py3{10,11,12,13,14}-functional [testenv] passenv = TOXENV,CI,TRAVIS,TRAVIS_* @@ -20,8 +20,12 @@ setenv = coverage: _TOX_COVERAGE_RUN=--cov=kubernetes/watch --cov=kubernetes/config [testenv:docs] +allowlist_externals = make +deps = + {[testenv]deps} + -r{toxinidir}/doc/requirements-docs.txt commands = - python setup.py build_sphinx + make -C doc html [testenv:update-pycodestyle] commands =