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

migrate the docs #448

Merged
merged 2 commits into from
May 23, 2024
Merged

migrate the docs #448

merged 2 commits into from
May 23, 2024

Conversation

stan-dot
Copy link
Contributor

@stan-dot stan-dot commented May 1, 2024

  • squash the commits that change the contents - (all except the first one)

@stan-dot stan-dot self-assigned this May 1, 2024
@stan-dot stan-dot linked an issue May 1, 2024 that may be closed by this pull request
Copy link

codecov bot commented May 1, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 91.06%. Comparing base (a476f08) to head (f3ff32e).

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #448   +/-   ##
=======================================
  Coverage   91.06%   91.06%           
=======================================
  Files          40       40           
  Lines        1667     1667           
=======================================
  Hits         1518     1518           
  Misses        149      149           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@stan-dot
Copy link
Contributor Author

stan-dot commented May 1, 2024

/home/runner/work/blueapi/blueapi/docs/reference.md:5: WARNING: toctree contains reference to document 'reference/cli' that doesn't have a title: no link will be generated
one small error with toctree extension - might be rst specific, need equivalent for md

Copy link
Contributor

@callumforrester callumforrester left a comment

Choose a reason for hiding this comment

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

Git appears to see these as deleting old files and creating new ones, rather than renaming. Can we somehow preserve history?

@stan-dot
Copy link
Contributor Author

stan-dot commented May 3, 2024

we cannot preserve that, renaming the file extension makes the change.

@DiamondJoseph
Copy link
Contributor

we cannot preserve that, renaming the file extension makes the change.

Can you try renaming the files, committing, then replacing the contents, committing again?

@joeshannon
Copy link
Contributor

we cannot preserve that, renaming the file extension makes the change.

Identifying renames in git is essentially a guess based on the similarity of the files before and after the rename, the actual names don't matter. According to the git docs the default similarity index is 50%, presumably GitHub uses that too.

Joseph's suggestion is what I would normally recommend as it makes it slightly easier to see what happened in the history and since the rename is separated from the content change git log --follow <file> would work, although as we are squash merging it would result in the same state when merged into main (unless it was split into two PRs or equivalent).

@stan-dot
Copy link
Contributor Author

stan-dot commented May 3, 2024

why do we care about the exact history? this app has only been run on 1 live beamline.

I'll check the history thing on Tuesday if time allows

@callumforrester
Copy link
Contributor

This needs to be two commits:

  1. Changes the file names
  2. Changes the file contents
    It then needs to be merged without squashing

@stan-dot stan-dot force-pushed the 392-convert-all-of-docs-to-markdown branch from 45ba942 to 22bc7ab Compare May 15, 2024 15:05
@stan-dot stan-dot closed this May 15, 2024
@stan-dot stan-dot force-pushed the 392-convert-all-of-docs-to-markdown branch from 22bc7ab to 4f1f44c Compare May 15, 2024 15:15
@stan-dot
Copy link
Contributor Author

that here is quite odd

@stan-dot stan-dot reopened this May 16, 2024
@stan-dot
Copy link
Contributor Author

stan-dot commented May 16, 2024

todo: need to remove the sphinx dependency and the CI jobs: ERROR: InvocationError for command /opt/hostedtoolcache/Python/3.11.9/x64/bin/sphinx-build -EW --keep-going -T docs build/html (exited with code 1)

moving the docs build config to reflect the one in the copier template

@stan-dot stan-dot requested a review from callumforrester May 17, 2024 14:06
Copy link
Contributor

Choose a reason for hiding this comment

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

Don't these files require changes?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok will review those all

Copy link
Contributor Author

Choose a reason for hiding this comment

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

no idea what is this about, :show-nested:, it couldn't be less informative

@stan-dot
Copy link
Contributor Author

what is this???
image

@DiamondJoseph
Copy link
Contributor

what is this???

It appears to be embedding the rst inside the md rather than doing the equivalent md formatting :D

@stan-dot
Copy link
Contributor Author

what is this???

It appears to be embedding the rst inside the md rather than doing the equivalent md formatting :D

I know that , it's an artifact from a fully rst times. But what sorcery did it do behind the scenes to dynamically import version like that? Do we want to support this in md?

@DiamondJoseph
Copy link
Contributor

It's part of the configured tooling.
https://github.com/DiamondLightSource/blueapi/blob/main/pyproject.toml#L72

I think it is correct for it to be there (it is available to call blueapi version after pip installing)

@stan-dot
Copy link
Contributor Author

I am not sure that markdown supports dynamic imports into markdown like this

@stan-dot
Copy link
Contributor Author

I don't think that markdown calls this rightly, this is redundant information that could be deleted from api.md

@DiamondJoseph

@stan-dot stan-dot closed this May 20, 2024
@stan-dot
Copy link
Contributor Author

stan-dot commented May 20, 2024

closed by misclick

@stan-dot stan-dot reopened this May 20, 2024
@stan-dot stan-dot marked this pull request as draft May 21, 2024 16:04
@stan-dot
Copy link
Contributor Author

following this comment to get it to work

@stan-dot stan-dot marked this pull request as ready for review May 22, 2024 13:27
@stan-dot stan-dot force-pushed the 392-convert-all-of-docs-to-markdown branch from 9ff8606 to 20f6911 Compare May 22, 2024 14:54
correct some docs

manually migrate some files

missed one line

correct the file formatting

change to a python block

add index

got the docs to build locally without sphinx warnings
@stan-dot stan-dot force-pushed the 392-convert-all-of-docs-to-markdown branch from 20f6911 to f3ff32e Compare May 22, 2024 15:34
Copy link
Contributor

@callumforrester callumforrester left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@callumforrester callumforrester merged commit a3f023f into main May 23, 2024
24 checks passed
@callumforrester callumforrester deleted the 392-convert-all-of-docs-to-markdown branch May 23, 2024 09:05
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.

Convert all of docs to markdown
4 participants