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.

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

Jump to bottom

Add compatibility for sphinx4 #1123

Merged
merged 24 commits into from Jul 19, 2021
Merged

Add compatibility for sphinx4 #1123

merged 24 commits into from Jul 19, 2021

Commits on Apr 10, 2021

  1. Add compatibility for sphinx4 

    Sphinx 4.x moves javascript and css declarations to `script_files` and `css_files`. This patch fixes duplicatd link and script tags when using sphinx4

Sphinx 4.x changes the default setting of html_codeblock_linenos_style to 'inline' and deprecates `html_codeblock_linenos_style`. The css for `.hll` to make the hightling span the full line cause the line number and code to be split on seperate lines. I could not get the highlight to span the full line so it was removed completely. I also made line numbers not selectible by the user.

This changes also adds the needed changes to the tox testing enviorment alhough, sphinx4 is not officially released to pypi yet. You will need to test these changes locally using: `pip install git+https://github.com/sphinx-doc/sphinx@master`
    @Blendify
    Blendify committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    836467e View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2021

  1. Test with official beta

    @Blendify
    Blendify committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    db30205 View commit details
    Browse the repository at this point in the history

  2. Revert "Test with official beta" 

    This reverts commit db30205.
    @Blendify
    Blendify committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    b73b67e View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2021

  1. Update layout.html

    @Blendify
    Blendify committed Jun 10, 2021
    Configuration menu
    Copy the full SHA
    bd9010f View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2021

  1. Merge branch 'master' into Blendify/sphinx4

    @Blendify
    Blendify committed Jun 22, 2021
    Configuration menu
    Copy the full SHA
    09e9e10 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2021

  1. Make sphinx version comparison constistent 

    Co-authored-by: Anthony <aj@ohess.org>
    @Blendify @agjohnson
    Blendify and agjohnson committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    e94984c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into Blendify/sphinx4

    @Blendify
    Blendify committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    b47f8b3 View commit details
    Browse the repository at this point in the history

  3. Fix user-select line numbers class name

    @Blendify
    Blendify committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    1f45c11 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2021

  1. Fix api docs css for sphinx4

    @Blendify
    Blendify committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    15d9109 View commit details
    Browse the repository at this point in the history

  2. Tests: run against sphinx 4.1

    @Blendify
    Blendify committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    0ef60e7 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into Blendify/sphinx4

    @Blendify
    Blendify committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    e171657 View commit details
    Browse the repository at this point in the history

  4. Tests: Add missing sphinx version

    @Blendify
    Blendify committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    d93528e View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2021

  1. Compare sphinx version using a tuple

    @Blendify
    Blendify committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    da20dec View commit details
    Browse the repository at this point in the history

  2. Merge branch 'Blendify/sphinx4' of github.com:readthedocs/sphinx_rtd_… 

    …theme into Blendify/sphinx4
    @Blendify
    Blendify committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    037890d View commit details
    Browse the repository at this point in the history

  3. Fix tests, missing theme extension

    @agjohnson
    agjohnson committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    6f95012 View commit details
    Browse the repository at this point in the history

  4. Fix styles on code block line numbers on Sphinx 4+

    @agjohnson
    agjohnson committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    6597b25 View commit details
    Browse the repository at this point in the history

  5. Make font usage conistent with sphinx<4.0 

    This fixes the different spacing issues that were noted.
    @Blendify
    Blendify committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    796e78b View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2021

  1. Rebuild assets

    @agjohnson
    agjohnson committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    c1aa1b2 View commit details
    Browse the repository at this point in the history

  2. Add a CI test for unbuilt assets 

    Many of our PRs have out of date assets, making it hard to test the
latest changes. This will at least throw an error on the PR when build
assets aren't updated.
    @agjohnson
    agjohnson committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    ee32a53 View commit details
    Browse the repository at this point in the history

  3. Don't use extension to add sphinx_version_info tuple to build context

    @agjohnson
    agjohnson committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    e6bd3f0 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2021

  1. Italize keywords

    @Blendify
    Blendify committed Jul 17, 2021
    Configuration menu
    Copy the full SHA
    8d93cde View commit details
    Browse the repository at this point in the history

  2. Restore highlighted code lines span full width

    @Blendify
    Blendify committed Jul 17, 2021
    Configuration menu
    Copy the full SHA
    047169a View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2021

  1. Merge branch 'master' into Blendify/sphinx4

    @agjohnson
    agjohnson committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    09e2a0d View commit details
    Browse the repository at this point in the history

  2. Fix automerge fuck up

    @agjohnson
    agjohnson committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    0207996 View commit details
    Browse the repository at this point in the history