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

Minor fix development docs to prevent deprecation warning #5371

Conversation

gonzalo-bulnes
Copy link
Contributor

@gonzalo-bulnes gonzalo-bulnes commented Jul 14, 2020

Status

Ready for review

Description of Changes

Running tests from the securedrop/securedrop directory prints a deprecation warning:

►►► securedrop/Makefile is deprecated. Run 'make test' in the repo root. ◀◀◀

This PR applies the suggestion of running the tests from the securedrop directory instead.

Considerations

The bin/dev-shell script sets TOPLEVEL from Git output and doesn't depend on the current directory, so there is no need to change directory before running the bin/dev-shell examples.

The lines become longer, but still fit the width of the Read the Docs code block in all orientations of an iPad-sized device, and readability remains unchanged. (Smaller devices already required horizontal scrolling.)

Testing

  • Run the 5 commands in the code block successively. All must succeed.

Deployment

No special considerations for deployment.

Checklist

  • Doc linting (make docs-lint) passed locally

⚠️ I may have a different version of Pygments because I ran into an error (unrelated to the changes in this PR): securedrop/docs/kernel_troubleshooting.rst:110:Cannot analyze code. No Pygments lexer found for "none". (I worked around it.)

Running tests from securedrop/securedrop prints a deprecation warning.

The bin/dev-shell script sets TOPLEVEL from Git output and
doesn't depend on the current directory, so there is no need to
change directory before running the bin/dev-shell examples.

The lines become longer, but still fit the Read the Docs code block
width in all orientations of an iPad-sized device and readability
remains unchanged.
@eloquence
Copy link
Member

LGTM. I've verified that the revised commands work as expected. Thank you, @gonzalo-bulnes!

warning I may have a different version of Pygments

That is indeed likely the cause of the error you're seeing. The docs tooling still depends on a virtualenv, see the instructions here:
https://docs.securedrop.org/en/master/development/documentation_guidelines.html

@conorsch conorsch self-requested a review July 14, 2020 22:16
Copy link
Contributor

@conorsch conorsch left a comment

Choose a reason for hiding this comment

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

Much better! Thanks for taking the time 🙂

@conorsch conorsch merged commit 6db3d9b into freedomofpress:develop Jul 14, 2020
@gonzalo-bulnes
Copy link
Contributor Author

gonzalo-bulnes commented Jul 16, 2020

Thanks for the pointer @eloquence. I had gone through the docs and couldn't install the current requirements. (I'm currently working from an Ubuntu 20.04 LTS machine.) I went back to the installation steps and narrowed down the issue to the specific versions of two dependencies:

Because I guess it can inform #4768, I documented the test bench for future reference.

Also, for what is worth, both currently locked versions can be installed successfully on Ubuntu 18.04 LTS.

@eloquence
Copy link
Member

Excellent flags @gonzalo-bulnes, thanks for the detailed report-back. Are you able to get the docs-build to work if you update those requirements locally?

@gonzalo-bulnes
Copy link
Contributor Author

@eloquence I'll reply in #5384 : )

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.

3 participants