Skip to content

fix w0wz de_density_scale#14991

Merged
pllim merged 1 commit into
astropy:mainfrom
nstarman:cosmo-fix-w0wz
Jun 30, 2023
Merged

fix w0wz de_density_scale#14991
pllim merged 1 commit into
astropy:mainfrom
nstarman:cosmo-fix-w0wz

Conversation

@nstarman

@nstarman nstarman commented Jun 27, 2023

Copy link
Copy Markdown
Member

EDIT: Fix #14975

TODO:

  • changelog

@nstarman nstarman added this to the v5.0.7 milestone Jun 27, 2023
@github-actions

Copy link
Copy Markdown
Contributor

Thank you for your contribution to Astropy! 🌌 This checklist is meant to remind the package maintainers who will review this pull request of some common things to look for.

  • Do the proposed changes actually accomplish desired goals?
  • Do the proposed changes follow the Astropy coding guidelines?
  • Are tests added/updated as required? If so, do they follow the Astropy testing guidelines?
  • Are docs added/updated as required? If so, do they follow the Astropy documentation guidelines?
  • Is rebase and/or squash necessary? If so, please provide the author with appropriate instructions. Also see "When to rebase and squash commits".
  • Did the CI pass? If no, are the failures related? If you need to run daily and weekly cron jobs as part of the PR, please apply the "Extra CI" label. Codestyle issues can be fixed by the bot.
  • Is a change log needed? If yes, did the change log check pass? If no, add the "no-changelog-entry-needed" label. If this is a manual backport, use the "skip-changelog-checks" label unless special changelog handling is necessary.
  • Is this a big PR that makes a "What's new?" entry worthwhile and if so, is (1) a "what's new" entry included in this PR and (2) the "whatsnew-needed" label applied?
  • Is a milestone set? Milestone must be set but we cannot check for it on Actions; do not let the green checkmark fool you.
  • At the time of adding the milestone, if the milestone set requires a backport to release branch(es), apply the appropriate "backport-X.Y.x" label(s) before merge.

@github-actions

Copy link
Copy Markdown
Contributor

👋 Thank you for your draft pull request! Do you know that you can use [ci skip] or [skip ci] in your commit messages to skip running continuous integration tests until you are ready?

Signed-off-by: Nathaniel Starkman <nstarman@users.noreply.github.com>
@nstarman nstarman marked this pull request as ready for review June 29, 2023 06:10
@nstarman nstarman requested a review from a team as a code owner June 29, 2023 06:10
@nstarman nstarman requested review from aconley and pllim June 29, 2023 16:29

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

LGTM at a glance but someone who actually use cosmology stuff should approve. Thanks!

@pllim

pllim commented Jun 29, 2023

Copy link
Copy Markdown
Member

devdeps failures appear unrelated. I restarted the other jobs. 🤞

@pllim

pllim commented Jun 30, 2023

Copy link
Copy Markdown
Member

@RyanCamo , if you are okay with this fix, please approve. Thanks!

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

aconley approved so I am approving by proxy. Thanks, everyone!

@pllim pllim merged commit 7c30252 into astropy:main Jun 30, 2023
@lumberbot-app

lumberbot-app Bot commented Jun 30, 2023

Copy link
Copy Markdown

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout v5.0.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 7c3025269e1ea911019e40a60a9eb85f4e2c3218
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #14991: fix w0wz de_density_scale'
  1. Push to a named branch:
git push YOURFORK v5.0.x:auto-backport-of-pr-14991-on-v5.0.x
  1. Create a PR against branch v5.0.x, I would have named this PR:

"Backport PR #14991 on branch v5.0.x (fix w0wz de_density_scale)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

@pllim

pllim commented Jun 30, 2023

Copy link
Copy Markdown
Member

@nstarman , any chance you can manually backport this to v5.0.x or is that not applicable?

pllim added a commit that referenced this pull request Jun 30, 2023
…991-on-v5.3.x

Backport PR #14991 on branch v5.3.x (fix w0wz de_density_scale)
@nstarman nstarman deleted the cosmo-fix-w0wz branch July 1, 2023 16:36
@pllim

pllim commented Jul 2, 2023

Copy link
Copy Markdown
Member

Too much refactoring, making backport to v5.0.x too confusing for me. But this bug is so subtle that I think we should still try to fix up v5.0.x. @nstarman , please do a manual patch to v5.0.x. Thanks! 🙏

You are currently cherry-picking commit 7c3025269.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

        new file:   docs/changes/cosmology/14991.bugfix.rst

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)

        deleted by us:   astropy/cosmology/flrw/tests/test_w0wzcdm.py
        deleted by us:   astropy/cosmology/flrw/w0wzcdm.py
        both modified:   astropy/cosmology/tests/test_core.py
        both modified:   astropy/cosmology/tests/test_utils.py

@nstarman

nstarman commented Jul 3, 2023

Copy link
Copy Markdown
Member Author

Will do. I have a dev branch for this, but the tests are quite different.

nstarman pushed a commit to nstarman/astropy that referenced this pull request Jul 3, 2023
(cherry picked from commit 7c30252)
Signed-off-by: nstarman <nstarman@users.noreply.github.com>

# Conflicts:
#	astropy/cosmology/flrw/tests/test_w0wzcdm.py
#	astropy/cosmology/flrw/w0wzcdm.py
#	astropy/cosmology/tests/test_core.py
#	astropy/cosmology/tests/test_utils.py
nstarman pushed a commit to nstarman/astropy that referenced this pull request Jul 3, 2023
(cherry picked from commit 7c30252)
Signed-off-by: nstarman <nstarman@users.noreply.github.com>

# Conflicts:
#	astropy/cosmology/flrw/tests/test_w0wzcdm.py
#	astropy/cosmology/flrw/w0wzcdm.py
#	astropy/cosmology/tests/test_core.py
#	astropy/cosmology/tests/test_utils.py
nstarman pushed a commit to nstarman/astropy that referenced this pull request Jul 3, 2023
(cherry picked from commit 7c30252)
Signed-off-by: nstarman <nstarman@users.noreply.github.com>

# Conflicts:
#	astropy/cosmology/flrw/tests/test_w0wzcdm.py
#	astropy/cosmology/flrw/w0wzcdm.py
#	astropy/cosmology/tests/test_core.py
#	astropy/cosmology/tests/test_utils.py
nstarman pushed a commit to nstarman/astropy that referenced this pull request Jul 5, 2023
(cherry picked from commit 7c30252)
Signed-off-by: nstarman <nstarman@users.noreply.github.com>

# Conflicts:
#	astropy/cosmology/flrw/tests/test_w0wzcdm.py
#	astropy/cosmology/flrw/w0wzcdm.py
#	astropy/cosmology/tests/test_core.py
#	astropy/cosmology/tests/test_utils.py
pllim added a commit that referenced this pull request Jul 24, 2023
Backport PR #14991 on branch v5.0.x (fix w0wz de_density_scale)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Error in distance calculations for w0wz Cosmologies

3 participants