Skip to content

Manual backport of #11250 (Ensure that the CDS unit parser can deal with '[-]') - #11418

Merged
eteq merged 2 commits into
astropy:v4.2.xfrom
pllim:backport-pr11250
Mar 25, 2021
Merged

eteq merged 2 commits into
astropy:v4.2.xfrom
pllim:backport-pr11250

Conversation

@pllim

@pllim pllim commented Mar 24, 2021

Copy link
Copy Markdown
Member

Ensure that the CDS unit parser can deal with '[-]'

Description

This pull request is to manually backport #11250

Ensure that the CDS unit parser can deal with '[-]'
@pllim pllim added this to the v4.2.1 milestone Mar 24, 2021
@pllim
pllim requested review from eteq and mhvk March 24, 2021 22:18
Comment thread CHANGES.rst
- Ensure ``keepdims`` works for taking ``mean``, ``std``, and ``var`` of
``Quantity``. [#11198]

- For CDS units and tables, recognize ``-`` as indicating dimensionless and

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.

Do I have to move the change log?

@mhvk

mhvk commented Mar 24, 2021

Copy link
Copy Markdown
Contributor

The backport looks good (except this time I think the changelog should be moved as it really won't be in 4.0 any more - in fact, shouldn't it be moved in master if we do not end up backporting to 4.0? let me comment there too)

I don't understand the failures, though... They seem totally unrelated.

@pllim

pllim commented Mar 24, 2021

Copy link
Copy Markdown
Member Author

The failures are from #11305 , I think?

@mhvk

mhvk commented Mar 25, 2021

Copy link
Copy Markdown
Contributor

Darn, reminds me that we need a pyerfa 1.7.3...

@eteq

eteq commented Mar 25, 2021

Copy link
Copy Markdown
Member

Yeah, I agree the failures are unrelated. To finish backporting I'm going to merge this, but I think we need to either xfail or make sure 1.7.3 is out first (and exclude 1.7.2)

@eteq
eteq merged commit b561d41 into astropy:v4.2.x Mar 25, 2021
@pllim
pllim deleted the backport-pr11250 branch March 25, 2021 21:24
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.

3 participants