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

Re-enable the JPL HORIZONS consistency unit test #5314

Merged
merged 4 commits into from
May 7, 2021
Merged

Conversation

ayshih
Copy link
Member

@ayshih ayshih commented May 6, 2021

Now that astropy/astropy#11601 has made the JPL DE440s ephemeris available, we can re-enable the JPL HORIZONS consistency unit test that was disabled in #5203. The test will be skipped if the installed version of Astropy is not aware of DE440s.

@ayshih ayshih added coordinates Affects the coordinates submodule [CodeFix] Tests Affects tests in some measure. labels May 6, 2021
@ayshih ayshih marked this pull request as ready for review May 6, 2021 17:10
@ayshih ayshih requested a review from a team as a code owner May 6, 2021 17:10
@Cadair
Copy link
Member

Cadair commented May 7, 2021

I opened a PR to your fork as I have a desire to see all test classes in existence burnt and replaced with pytest fixtures.

@ayshih
Copy link
Member Author

ayshih commented May 7, 2021

PR merged, with a small fix

@Cadair
Copy link
Member

Cadair commented May 7, 2021

I thought putting the mark on the fixture means that all tests which use the fixture have the mark?

@ayshih
Copy link
Member Author

ayshih commented May 7, 2021

No: xref pytest-dev/pytest#1368

@Cadair
Copy link
Member

Cadair commented May 7, 2021

well now I know.

@Cadair Cadair merged commit 6e32458 into sunpy:main May 7, 2021
@sunpy-backport
Copy link

sunpy-backport bot commented May 7, 2021

The backport to 2.0 failed:

Commits ["e1b856c55a864a255225624fbc26cbc64701293d","d234c38b3d559040d7239ac41da49522d35e94b0","75d3228944fc567ee9e358233d965c96a4d1b97a","303d719120ac127ba2efef2b5b20090dcf0214b2"] could not be cherry-picked on top of 2.0

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport 2.0
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick e1b856c55a864a255225624fbc26cbc64701293d d234c38b3d559040d7239ac41da49522d35e94b0 75d3228944fc567ee9e358233d965c96a4d1b97a 303d719120ac127ba2efef2b5b20090dcf0214b2
# Create a new branch with these backported commits.
git checkout -b backport-5314-to-2.0
# Push it to GitHub.
git push --set-upstream origin backport-5314-to-2.0
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is 2.0 and the compare/head branch is backport-5314-to-2.0.

@sunpy-backport
Copy link

sunpy-backport bot commented May 7, 2021

The backport to 2.1 failed:

Commits ["e1b856c55a864a255225624fbc26cbc64701293d","d234c38b3d559040d7239ac41da49522d35e94b0","75d3228944fc567ee9e358233d965c96a4d1b97a","303d719120ac127ba2efef2b5b20090dcf0214b2"] could not be cherry-picked on top of 2.1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport 2.1
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick e1b856c55a864a255225624fbc26cbc64701293d d234c38b3d559040d7239ac41da49522d35e94b0 75d3228944fc567ee9e358233d965c96a4d1b97a 303d719120ac127ba2efef2b5b20090dcf0214b2
# Create a new branch with these backported commits.
git checkout -b backport-5314-to-2.1
# Push it to GitHub.
git push --set-upstream origin backport-5314-to-2.1
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is 2.1 and the compare/head branch is backport-5314-to-2.1.

@sunpy-backport
Copy link

sunpy-backport bot commented May 7, 2021

The backport to 3.0 failed:

Commits ["e1b856c55a864a255225624fbc26cbc64701293d","d234c38b3d559040d7239ac41da49522d35e94b0","75d3228944fc567ee9e358233d965c96a4d1b97a","303d719120ac127ba2efef2b5b20090dcf0214b2"] could not be cherry-picked on top of 3.0

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport 3.0
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick e1b856c55a864a255225624fbc26cbc64701293d d234c38b3d559040d7239ac41da49522d35e94b0 75d3228944fc567ee9e358233d965c96a4d1b97a 303d719120ac127ba2efef2b5b20090dcf0214b2
# Create a new branch with these backported commits.
git checkout -b backport-5314-to-3.0
# Push it to GitHub.
git push --set-upstream origin backport-5314-to-3.0
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is 3.0 and the compare/head branch is backport-5314-to-3.0.

@ayshih ayshih added the Still Needs Manual Backport This PR needs manually backporting. label May 7, 2021
@ayshih
Copy link
Member Author

ayshih commented May 7, 2021

well now I know.

Heh, I didn't know either until I tested it today. It isn't caught by our CI because we don't have astroquery installed except on remote-data=any builds, so the pytest.importorskip() call skips the test before any online access.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
coordinates Affects the coordinates submodule Tests Affects tests in some measure.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants