Skip to content

DOC: Only show developer docs in latest#11342

Merged
pllim merged 2 commits into
astropy:masterfrom
pllim:dev-docs-noshow
Feb 25, 2021
Merged

DOC: Only show developer docs in latest#11342
pllim merged 2 commits into
astropy:masterfrom
pllim:dev-docs-noshow

Conversation

@pllim

@pllim pllim commented Feb 22, 2021

Copy link
Copy Markdown
Member

Description

This pull request is to hide dev docs unless it is in latest doc. For this to take effect, probably needs backport.

Stable view at #11344 .

Fixes #10443

  • Squash out temporary commit

Dev

https://astropy--11342.org.readthedocs.build/en/11342/install.html

Stable

From #11344

https://astropy--11344.org.readthedocs.build/en/11344/install.html

@pllim

This comment has been minimized.

Comment thread docs/install.rst
Alternatively, if you intend to do development on other software that uses
``astropy``, such as an affiliated package, consider installing ``astropy`` into a
:ref:`virtualenv<using-virtualenv>`.
``astropy``, such as an affiliated package, consider installing ``astropy`` into a `virtualenv <https://docs.astropy.org/en/latest/development/workflow/virtualenv_detail.html>`__.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Note: This gives the exact rendered look, except the link when you hover over the text.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is fine to me for now, but it touches on another point I would like to improve in the docs, by including more details (such as how to use virtualenv) in the install docs. Having this link is maybe ok for now, since even with installation docs improvements there still might be a link like "see here for more details on virtualenv".

OTOH it might be good just to remove this link outright--as I have noted in #10508 this page is outdated and misleading.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I see that you have followed up at #11367 . Thanks!

Comment thread docs/index.rst Outdated

{%else%}

The developer documentation contains instructions for how to contribute to

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Dev

doc_01_dev

Stable

doc_01_stable

Comment thread docs/install.rst

{%else%}

See the `latest documentation on how to test your installed version of astropy <https://docs.astropy.org/en/latest/install.html#testing-an-installed-astropy>`__.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Dev

doc_02_dev

Stable

doc_02_stable

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We could also add an intersphinx target for developer docs. I'll try that out.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I see you opened issue #11366 . 👍 It would be very nice if you can get it to work. 😸

Comment thread docs/install.rst

{%else%}

See the `latest documentation on how to run the tests in a source checkout of astropy <https://docs.astropy.org/en/latest/install.html#testing-a-source-code-build-of-astropy>`__.

@pllim pllim Feb 23, 2021

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Dev

doc_03_dev

Stable

doc_03_stable

@pllim pllim marked this pull request as ready for review February 23, 2021 17:55

@mhvk mhvk left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Looks great! Some small organizational comments.

Comment thread docs/index.rst Outdated
warnings
utils/index

{% if is_development %}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I wonder if it makes sense to just move these two items to the developer documentation section?

Comment thread docs/index.rst Outdated

{% if is_development %}

The developer documentation contains instructions for how to contribute to

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

How about keeping this sentence which is the same outside of the if clause? Good to keep everything as much the same as possible.

Comment thread docs/index.rst Outdated
{%else%}

The developer documentation contains instructions for how to contribute to
Astropy or affiliated packages, as well as coding, documentation, and

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Since we are removing the "install the developer version" above, how about adding here:
"...affiliated pacakges, install and test the development version, as well as ..."

@pllim

pllim commented Feb 24, 2021

Copy link
Copy Markdown
Member Author

Thanks for the review, @mhvk ! I believe I have addressed your comments. Just waiting for RTD to render now.

@taldcroft taldcroft left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks good to me, thanks @plim!

@hamogu hamogu removed their request for review February 25, 2021 11:49
@hamogu

hamogu commented Feb 25, 2021

Copy link
Copy Markdown
Member

I don't think my approval is needed (nor do I know enough about this is done to provide meaningful feedback). I merely commented on the thread at some point in time. I've removed myself form the reviewers list.

@pllim pllim merged commit c0b9754 into astropy:master Feb 25, 2021
@pllim pllim deleted the dev-docs-noshow branch February 25, 2021 14:16
@pllim

pllim commented Feb 25, 2021

Copy link
Copy Markdown
Member Author

Thanks, everyone!

@pllim

pllim commented Feb 25, 2021

Copy link
Copy Markdown
Member Author

Hopefully this can get into the next bug fix release, so it lands in stable, @eteq or @astrofrog . 😉

Comment thread docs/conf.py
logger.warning(msg)

# Generate the page from Jinja template
app.connect("source-read", rstjinja)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Nice, I didn't even realize it was possible to do this.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Me neither. Thanks to @Cadair for letting me copy-paste from SunPy!

Comment thread docs/index.rst
{%else%}

To read the developer documentation, you will need to go to the
`latest developer version of the documentation <https://docs.astropy.org/en/latest/#developer-documentation>`__.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I wonder if it wouldn't make sense to move the entire developer docs TOC to its own page, perhaps with a bit of expansion. If you'd like, I can make a quick prototype of what I have in mind in a separate PR, or added to this one. I am planning to do some overhaul of the developer docs anyways so it would be a good opportunity to get my feet wet.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

This PR is already merged last week, so you would need to open a follow-up PR. 😉

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Oh, somehow I didn't realize this was already merged. Ok then, if you think it's a good idea I can make a follow-up.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Yeah, feel free to PR. The dev docs definitely need some TLC.

astrofrog pushed a commit that referenced this pull request Mar 16, 2021
DOC: Only show developer docs in latest
eteq pushed a commit that referenced this pull request Mar 25, 2021
DOC: Only show developer docs in latest
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Don't include developer docs in stable branch

6 participants