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

Update sphinxify usage #13503

Merged
merged 5 commits into from Feb 1, 2022
Merged

Update sphinxify usage #13503

merged 5 commits into from Feb 1, 2022

Conversation

martinRenou
Copy link
Contributor

@martinRenou martinRenou commented Jan 31, 2022

Docrepr 0.2.0 is out, with compatibility updates with "new" sphinx versions (it was not working with sphinx>=2). This PR uses that latest docrepr versions for generating the HTML doc representation.

@martinRenou
Copy link
Contributor Author

cc. @fasiha @CAM-Gerlach @SylvainCorlay

Copy link
Contributor

@CAM-Gerlach CAM-Gerlach left a comment

Choose a reason for hiding this comment

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

Thanks @martinRenou ; this should fix what Darker is complaining about.

IPython/core/interactiveshell.py Outdated Show resolved Hide resolved
IPython/core/interactiveshell.py Outdated Show resolved Hide resolved
IPython/core/interactiveshell.py Outdated Show resolved Hide resolved
@martinRenou
Copy link
Contributor Author

martinRenou commented Feb 1, 2022

Darker is actually not being run, there seems to be an issue with darker itself.

Traceback (most recent call last):
  File "/opt/hostedtoolcache/Python/3.8.12/x64/bin/darker", line 8, in <module>
    sys.exit(main_with_error_handling())
  File "/opt/hostedtoolcache/Python/3.8.12/x64/lib/python3.8/site-packages/darker/__main__.py", line 421, in main_with_error_handling
    return main()
  File "/opt/hostedtoolcache/Python/3.8.12/x64/lib/python3.8/site-packages/darker/__main__.py", line 312, in main
    args, config, config_nondefault = parse_command_line(argv)
  File "/opt/hostedtoolcache/Python/3.8.12/x64/lib/python3.8/site-packages/darker/command_line.py", line 107, in parse_command_line
    config = load_config(args.src)
  File "/opt/hostedtoolcache/Python/3.8.12/x64/lib/python3.8/site-packages/darker/config.py", line 107, in load_config
    path = find_project_root(tuple(srcs or ["."])) / "pyproject.toml"
TypeError: unsupported operand type(s) for /: 'tuple' and 'str'

This has been reported here akaihola/darker#264

EDIT: This should be a workaround #13504

@Carreau
Copy link
Member

Carreau commented Feb 1, 2022

SHould this need to be backported to 7.x ?

martinRenou and others added 4 commits February 1, 2022 13:27
Co-authored-by: CAM Gerlach <CAM.Gerlach@Gerlach.CAM>
Co-authored-by: CAM Gerlach <CAM.Gerlach@Gerlach.CAM>
Co-authored-by: CAM Gerlach <CAM.Gerlach@Gerlach.CAM>
@martinRenou
Copy link
Contributor Author

@Carreau yes it would be nice to backport it :) Thanks!

@martinRenou
Copy link
Contributor Author

How do you backport? Do you not use the meeseeks command? I tried looking at an example of backporting like #13427, does adding to the right milestone trigger the bot?

@Carreau Carreau added this to the 7.32 milestone Feb 1, 2022
@Carreau
Copy link
Member

Carreau commented Feb 1, 2022

yes, the milestone descriptions have commands to be ran by the bot,
so the milestone 7.32 has "on-merge: backport to 7.x".

@martinRenou
Copy link
Contributor Author

Really nice

@Carreau Carreau merged commit 8520f30 into ipython:master Feb 1, 2022
meeseeksmachine pushed a commit to meeseeksmachine/ipython that referenced this pull request Feb 1, 2022
@martinRenou martinRenou deleted the sphinxify branch February 2, 2022 08:34
Carreau added a commit that referenced this pull request Feb 7, 2022
…503-on-7.x

Backport PR #13503 on branch 7.x (Update sphinxify usage)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants