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

Additional MAST docs test update #2315

Merged
merged 2 commits into from
Mar 18, 2022
Merged

Conversation

ceb8
Copy link
Member

@ceb8 ceb8 commented Mar 1, 2022

Follow-on to #1975.

@bsipocz I made a mistake last night when re-basing and failed to commit/push my additional changes, so that is what this PR is. Mainly fixing up the Missions MAST docs, but also addressing your comments on the last PR. I realize I've now undone some of your line breaks and other fix ups so I will put those back in.

@codecov
Copy link

codecov bot commented Mar 1, 2022

Codecov Report

Merging #2315 (494212e) into main (af6b41b) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #2315   +/-   ##
=======================================
  Coverage   62.98%   62.98%           
=======================================
  Files         131      131           
  Lines       17067    17067           
=======================================
  Hits        10749    10749           
  Misses       6318     6318           

📣 Codecov can now indicate which changes are the most critical in Pull Requests. Learn more

@ceb8 ceb8 force-pushed the mast_docs_update branch from e6ba595 to 0f8bf20 Compare March 1, 2022 12:50
@ceb8
Copy link
Member Author

ceb8 commented Mar 1, 2022

@bsipocz I think this is done now, except for the failing docs build. Can you take a look at that? It doesn't seem to be related to the MAST documentation, but I could be reading the output wrong.

@ceb8
Copy link
Member Author

ceb8 commented Mar 15, 2022

@bsipocz OK I think this really is ready for merge now.

@ceb8 ceb8 added this to the v0.4.6 milestone Mar 15, 2022
@bsipocz bsipocz added the mast label Mar 15, 2022
@@ -175,124 +174,6 @@ To get a table of metadata associated with observation or product lists use the
obs_collection Mission ... HST, HLA, SWIFT, GALEX, Kepler, K2...



Mission Searches
Copy link
Member

Choose a reason for hiding this comment

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

One last thing, why did you move this section around? I'm only asking as this will certainly introduce a conflict with another PR once merged (maybe there'll be a conflict in either case).

Copy link
Member Author

Choose a reason for hiding this comment

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

Because it was in between the Mast Observations section and the Downloading Data section, which are related because you download data from the observations queries, whereas the Missions interface is completely different and does not yet hook into the download data functionality.

Copy link
Member

Choose a reason for hiding this comment

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

OK. Let's merge #2321 then first (it's almost there) and then do this reorder.

@bsipocz
Copy link
Member

bsipocz commented Mar 15, 2022

OK, so the other PR is merged, could you please rebase this? That only contained a very small number of changes to the narrative docs, so I expect this to be a trivial conflict resolution.

@ceb8 ceb8 force-pushed the mast_docs_update branch from fd49cd8 to 7789785 Compare March 15, 2022 22:43
@ceb8
Copy link
Member Author

ceb8 commented Mar 15, 2022

@bsipocz rebased!

@ceb8 ceb8 force-pushed the mast_docs_update branch from 7789785 to 5ebc764 Compare March 17, 2022 20:31
@bsipocz
Copy link
Member

bsipocz commented Mar 18, 2022

@ceb8 - I've added back the deleted example, as well as the use of the topmost namespace.

@bsipocz bsipocz merged commit d17805e into astropy:main Mar 18, 2022
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.

2 participants