Skip to content

Fix package building with Sphinx >= 7.0.0 #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ycedres wants to merge 1 commit into
base: uyuni/master
Choose a base branch
from
Open

Fix package building with Sphinx >= 7.0.0 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ doc: ## Creates the documentation with sphinx in html form.
@echo "creating: documentation"
@cd docs; make html > /dev/null 2>&1

man: ## Creates documentation and man pages using Sphinx
@${PYTHON} -m sphinx -b man -j auto ./docs ./build/sphinx/man

qa: ## If pyflakes and/or pycodestyle is found then they are run.
ifeq ($(strip $(PYFLAKES)),)
@echo "No pyflakes found"
Expand Down
1 change: 1 addition & 0 deletions cobbler.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,7 @@ sed -e "s|/var/lib/tftpboot|%{tftpboot_dir}|g" -i config/cobbler/settings.yaml
[ "${TFTPROOT}" != %{tftpboot_dir} ] && echo "ERROR: TFTPROOT: ${TFTPROOT} does not match %{tftpboot_dir}"

%py3_build
make man

%install
. distro_build_configs.sh
Expand Down
14 changes: 1 addition & 13 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
from distutils.command.build import build as _build
from configparser import ConfigParser
from setuptools import find_packages
from sphinx.setup_command import BuildDoc

import codecs
from coverage import Coverage
Expand Down Expand Up @@ -151,15 +150,6 @@ class build(_build):
def run(self):
_build.run(self)

#####################################################################
# # Build man pages using Sphinx ###################################
#####################################################################


class build_man(BuildDoc):
def initialize_options(self):
BuildDoc.initialize_options(self)
self.builder = 'man'

#####################################################################
# # Configure files ##################################################
Expand Down Expand Up @@ -293,8 +283,7 @@ def has_man_pages(build):


build.sub_commands.extend((
('build_man', has_man_pages),
('build_cfg', has_configure_files)
('build_cfg', has_configure_files),
))


Expand Down Expand Up @@ -478,7 +467,6 @@ def run(self):
'savestate': savestate,
'restorestate': restorestate,
'build_cfg': build_cfg,
'build_man': build_man
},
name="cobbler",
version=VERSION,
Expand Down