Skip to content
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.

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

Upgrade ubuntu #6

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ on:

jobs:
build_job:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
name: Build documentation
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Install native dependencies
run: sudo apt-get update -y && sudo apt-get install -y ditaa graphviz
run: sudo apt-get update -y && sudo apt-get install -y ditaa graphviz && sudo apt-get install -y python3-sphinx
- name: Install pip dependencies
run: sudo pip install Sphinx==1.6.7 sphinx_rtd_theme hieroglyph==1.0
- name: Build documentation
Expand Down
5 changes: 2 additions & 3 deletions Documentation/sphinx/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# jinja2>=3.1 is not compatible with Sphinx<4.0
jinja2<3.1
sphinx_rtd_theme
docutils
Sphinx==2.4.4
sphinx_rtd_theme
43 changes: 42 additions & 1 deletion scripts/sphinx-pre-install
Original file line number Diff line number Diff line change
Expand Up @@ -964,22 +964,52 @@ sub check_needs()
}
}


print "need (1) $need\n";
# Check for needed programs/tools
check_perl_module("Pod::Usage", 0);

print "need (2) $need\n";
# Check for needed programs/tools
check_program("make", 0);

print "need (3) $need\n";
# Check for needed programs/tools
check_program("gcc", 0);

print "need (4) $need\n";
# Check for needed programs/tools
check_python_module("sphinx_rtd_theme", 1) if (!$virtualenv);

print "need (5) $need\n";
# Check for needed programs/tools
check_program("dot", 1);

print "need (6) $need\n";
# Check for needed programs/tools
check_program("convert", 1);

print "need (7) $need\n";
# Check for needed programs/tools
# Extra PDF files - should use 2 for is_optional
check_program("xelatex", 2) if ($pdf);

print "need (8) $need\n";
# Check for needed programs/tools
check_program("rsvg-convert", 2) if ($pdf);

print "need (9) $need\n";
# Check for needed programs/tools
check_program("latexmk", 2) if ($pdf);

print "need (10) $need\n";
# Check for needed programs/tools
# Do distro-specific checks and output distro-install commands
check_distros();


print "need (11) $need\n";
# Check for needed programs/tools
if (!$python_cmd) {
if ($need == 1) {
die "Can't build as $need mandatory dependency is missing";
Expand All @@ -988,20 +1018,31 @@ sub check_needs()
}
}




print "need (12) $need\n";
# Check if sphinx-build is called sphinx-build-3
if ($need_symlink) {
printf "\tsudo ln -sf %s /usr/bin/sphinx-build\n\n",
which("sphinx-build-3");
}


print "need (13) $need\n";
recommend_sphinx_version($virtualenv_cmd);

print "need (14) $need\n";
printf "\n";

print "need: $need\n";
printf "\n";

printf "Hello\n";
printf "---- %s -----", which("sphinx-build-3");
printf "python: ---- %s -----\n", which("python");
printf "python3: ---- %s -----\n", which("python3-sphinx");
print "list files --- %s ----\n", system("ls -al /usr/bin/python");
printf "sphinx-build-3---- %s -----\n", which("sphinx-build-3");
printf "hello\n";

print "All optional dependencies are met.\n" if (!$optional);
Expand Down