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

docs: update readthedocs config to new options - v2 #9566

Closed
wants to merge 2 commits into from

Conversation

jufajardini
Copy link
Contributor

Previous PR: #9564

Link to redmine ticket: none

Describe changes from last PR:

  • (re)add requirements.txt file for our userguide, as that seems to be one of the ways to pass extra dependencies to read the docs, now
  • add sphinx configurations to readthedocs.yaml

Checked with my own instance of rtd and seems to work, this time: https://suri-rtd-test.readthedocs.io/en/rtd-yaml-update-v2/

Leaving this as draft, as I don't know if this is the style we want to follow...

Our documentation was failing to build, seems connected to the new way
of indicating build options (cf
https://readthedocs.org/projects/suricata/builds/22112658/,
https://docs.readthedocs.io/en/stable/config-file/v2.html#build,
and https://docs.readthedocs.io/en/stable/config-file/v2.html#build-os).

Added the build.os required new field, and adjusted the way python
version is passed.
Apparently, for the new configuration style for read the docs, one of
the ways to pass extra configuration for python is having a requirements
file.
@codecov
Copy link

codecov bot commented Oct 5, 2023

Codecov Report

Merging #9566 (52f8ddf) into master (9157070) will decrease coverage by 0.02%.
The diff coverage is n/a.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #9566      +/-   ##
==========================================
- Coverage   82.20%   82.19%   -0.02%     
==========================================
  Files         968      968              
  Lines      274275   274275              
==========================================
- Hits       225461   225430      -31     
- Misses      48814    48845      +31     
Flag Coverage Δ
fuzzcorpus 64.05% <ø> (+<0.01%) ⬆️
suricata-verify 60.92% <ø> (-0.04%) ⬇️
unittests 62.87% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

@jufajardini jufajardini marked this pull request as ready for review October 6, 2023 14:35
@jufajardini jufajardini requested a review from a team as a code owner October 6, 2023 14:35
@jufajardini jufajardini mentioned this pull request Oct 6, 2023
build:
os: ubuntu-22.04
tools:
python: "3.8"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets go to Python 3.11 as well, 3.8 is close to EOL, at 3.11 appears to work OK.

Comment on lines +10 to +11
install:
- requirements: doc/userguide/requirements.txt
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was, this (the second commit) required to make things work? Or a stylistic change?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Answered my own question, it does not build without this change. I'd squash these 2 commits since they both appear required to fix RTD.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Required. RtD was failing to find the correct sphinx theme without this. There seem to be some ways of making this work, this was the one I was able to understand and follow.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jufajardini
Copy link
Contributor Author

Replaced by: #9572

@jufajardini jufajardini closed this Oct 6, 2023
@jufajardini jufajardini deleted the rtd-yaml-update/v2 branch October 8, 2023 16:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
2 participants