Skip to content

Moved astropy.vo.samp to astropy.samp - #6213

Merged
eteq merged 10 commits into
astropy:masterfrom
astrofrog:move-samp
Jun 16, 2017
Merged

eteq merged 10 commits into
astropy:masterfrom
astrofrog:move-samp

Conversation

@astrofrog

@astrofrog astrofrog commented Jun 15, 2017 •

Copy link
Copy Markdown
Member

@taldcroft and @mhvk agreed to this plan in #6201

@eteq @kelle @pllim - any objections to this?

@pllim - I actually ended up just removing docs/vo and adding the note you had added about astroquery to the what's new instead. Does that seem ok?

@pllim

pllim commented Jun 15, 2017

Copy link
Copy Markdown
Member

Wait a minute... Are you removing astropy.vo without deprecation? I don't plan to remove Cone Search until v3; I just deprecated it for v2...

@bsipocz

bsipocz commented Jun 15, 2017

Copy link
Copy Markdown
Member

@pllim - But conesearch got moved out, not just shuffled around.

@pllim pllim 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.

I think completely removing vo without deprecation period is too drastic. I propose we deprecate vo.samp first in v2; i.e., anyone calling vo.samp will get a deprecation warning and vo.samp is actually a wrapper around samp. Then we can remove the whole vo sub-package in v3. What do you think?

Comment thread astropy/astropy.cfg Outdated
@@ -62,7 +62,7 @@

[vo.samp]

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.

Don't you need a new [samp] section too?

@astrofrog

astrofrog commented Jun 15, 2017 •

Copy link
Copy Markdown
Member Author

@pllim - no I've only removed docs/vo not astropy.vo - that is, the imports will continue to work but the docs will go away. But I'm happy to add back the docs if you'd prefer to remove that section after 2.0.

@pllim

pllim commented Jun 15, 2017

Copy link
Copy Markdown
Member

@astrofrog , moving doc only is probably okay, but the diff also shows you moved the codes and deleted some cone search stuff.

@astrofrog

astrofrog commented Jun 15, 2017 •

Copy link
Copy Markdown
Member Author

@pllim - I just moved the files up one directory, and astropy/vo/samp/__init__.py now imports from astropy.samp so it's backward compatible. I didn't touch any of the cone search stuff as far as I know?

In [2]: from astropy.vo.samp import SAMPClient
WARNING: AstropyDeprecationWarning: The astropy.vo.samp module has now been moved to astropy.samp [astropy.vo.samp]

astropy.vo.client and astropy.vo.validator are still there!

@pllim

pllim commented Jun 15, 2017 •

Copy link
Copy Markdown
Member

@astrofrog , okay, I was just freaking out of all the cone search doc deletion. 😅

It just seems confusing to a user that they can still use astropy.vo but the documentation is gone. Maybe retain a vo/index.rst with the text you put in What's New? Not all users will dig into What's New.

EDIT: Would be nice to also retain the "Other third-party Python packages..." text until we completely get rid of astropy.vo.

Also need to update the "stability" listing.

@pllim pllim added this to the v2.0.0 milestone Jun 15, 2017
@astrofrog

Copy link
Copy Markdown
Member Author

@pllim - I've undeleted the vo docs!

@pllim

pllim commented Jun 15, 2017

Copy link
Copy Markdown
Member

Thanks! Still need a change log and edits to docs/stability.rst.

@astrofrog

Copy link
Copy Markdown
Member Author

@pllim - done!

@astrofrog

Copy link
Copy Markdown
Member Author

Before we merge this, just a reminder that I'd like to make sure @eteq is happy with this

Comment thread CHANGES.rst Outdated

- The `astropy.vo.samp` package no longer supports SSL. [#6201]

- The `astropy.vo.samp` package has been moved to `astropy.samp`. [#6213]

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.

Nitpick: This entry and the one for #6201 above are a bit confusing. Maybe merge them into a single entry and reword in a more coherent manner?

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.

Done

Comment thread docs/stability.rst
<tr>
<td>
astropy.vo.samp
astropy.samp

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.

Maybe it is clearer to state in the description that it was renamed from astropy.vo.samp in v2.0? Other entries have info like that (when added, etc).

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.

Done

@bsipocz
bsipocz requested a review from eteq June 15, 2017 20:23
@bsipocz

bsipocz commented Jun 15, 2017

Copy link
Copy Markdown
Member

Added @eteq as a reviewer, as he needs to be happy with this move :)

@eteq eteq 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.

One very minor comment, which could be changed at merge since it's just a doc change. Once the tests are done I think this is all set.

Comment thread docs/vo/index.rst
The ``astropy.vo`` module has been deprecated and will be removed
in a future version. The SAMP functionality has been moved
to ``astropy.samp``, and the conesearch functionality has been
moved to `Astroquery <http://astroquery.readthedocs.io>`_.

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.

Shouldn't this also mention that this is the "classic" API?

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.

@eteq , are you talking about Cone Search or SAMP's "classic" API?

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.

Oops! Sorry, misunderstanding: I thought the what's new page was saying that there "classic" API is in astropy, but I get now that that's referencing the astroquery version. So no change needed.

@bsipocz bsipocz added the zzz 💤 merge-when-ci-passes Do not use: We have auto-merge option now. label Jun 15, 2017
Comment thread CHANGES.rst Outdated
[#5558, #5904]

- The `astropy.vo.samp` package no longer supports SSL. [#6201]
- The `astropy.vo.samp` package has been moved to `astropy.samp`, and no

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.

use double backticks to make sphinx happy

@eteq

eteq commented Jun 16, 2017

Copy link
Copy Markdown
Member

Looks like the tests passed except for that one backtick issue that I fixed directly in this branch. Merging!

@eteq
eteq merged commit 7b2c9d2 into astropy:master Jun 16, 2017
@MSeifert04 MSeifert04 removed the zzz 💤 merge-when-ci-passes Do not use: We have auto-merge option now. label Oct 17, 2017
@astrofrog
astrofrog deleted the move-samp branch November 14, 2018 15:28
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.

5 participants