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.

Sign up for GitHub

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

Jump to bottom

fix sunpy and numpy 2.0 #7556

Merged
merged 21 commits into from
Apr 10, 2024
Merged

fix sunpy and numpy 2.0 #7556

merged 21 commits into from
Apr 10, 2024

Conversation

alasdairwilson
Copy link
Member

@alasdairwilson alasdairwilson commented Apr 5, 2024 •
edited by nabobalis

Fixes #7555

@alasdairwilson alasdairwilson marked this pull request as draft April 5, 2024 14:28
@alasdairwilson alasdairwilson added Affects Dev An issue/bug that affects master No Changelog Entry Needed Infrastructure Issues or PRs that affect the CI or packaging of SunPy labels Apr 5, 2024
@nabobalis nabobalis added the Run cron CI Run cron CI on this PR label Apr 5, 2024
@nabobalis

This comment was marked as outdated.

Sign in to view
@nabobalis nabobalis added backport 5.0 on-merge: backport to 5.0 backport 5.1 on-merge: backport to 5.1 Minor Change PR only needs one approval to merge and removed Affects Dev An issue/bug that affects master labels Apr 5, 2024
@nabobalis nabobalis closed this Apr 5, 2024
@nabobalis nabobalis reopened this Apr 5, 2024
@alasdairwilson
Copy link
Member Author

Is this why devdeps was failing?

I think so, we will see if it passes now

nabobalis
nabobalis reviewed Apr 5, 2024
View reviewed changes
sunpy/map/mapbase.py Outdated Show resolved Hide resolved
nabobalis
nabobalis reviewed Apr 5, 2024
View reviewed changes
pytest.ini Outdated Show resolved Hide resolved
nabobalis
nabobalis reviewed Apr 5, 2024
View reviewed changes
pyproject.toml Outdated Show resolved Hide resolved
alasdairwilson
alasdairwilson commented Apr 5, 2024
View reviewed changes
pyproject.toml Outdated Show resolved Hide resolved
@alasdairwilson
Copy link
Member Author

Naive me of 8 hours ago thinking just change pyerfa and all will be well.

@nabobalis nabobalis force-pushed the devdeps-erfa branch 3 times, most recently from 625e8ea to d03197b Compare April 5, 2024 21:32
nabobalis
nabobalis reviewed Apr 5, 2024
View reviewed changes
sunpy/time/tests/test_time.py
@@ -150,14 +150,6 @@ def test_parse_time_individual_numpy_datetime():
assert dt == Time('2005-02-01', format='isot')


def test_parse_time_numpy_datetime_timezone():
Copy link
Contributor

Choose a reason for hiding this comment

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

I removed this test as numpy plan to remove parsing timezone aware datetimes, so.

@nabobalis nabobalis changed the title add erfa dev to devdeps fix sunpy and numpy 2.0 Apr 6, 2024
@nabobalis
Copy link
Contributor

nabobalis commented Apr 7, 2024 •
edited

I would expect this to not backport nicely.

figure-devdeps is failing on opencv, there seems to be no patching for numpy 2 as it stands.

@nabobalis nabobalis marked this pull request as ready for review April 7, 2024 00:19
@nabobalis nabobalis requested review from a team as code owners April 7, 2024 00:19
@nabobalis nabobalis merged commit c6e2b30 into sunpy:main Apr 10, 2024
33 of 35 checks passed
@lumberbot-app Lumberbot (App)
Copy link

lumberbot-app bot commented Apr 10, 2024

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 5.0
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 c6e2b3048cb3369a277a05271f54ec3e07522dce
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #7556: fix sunpy and numpy 2.0'
  1. Push to a named branch:
git push YOURFORK 5.0:auto-backport-of-pr-7556-on-5.0
  1. Create a PR against branch 5.0, I would have named this PR:

"Backport PR #7556 on branch 5.0 (fix sunpy and numpy 2.0)"

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.

@lumberbot-app lumberbot-app bot added the Still Needs Manual Backport This PR needs manually backporting label Apr 10, 2024
@lumberbot-app Lumberbot (App)
Copy link

lumberbot-app bot commented Apr 10, 2024

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 5.1
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 c6e2b3048cb3369a277a05271f54ec3e07522dce
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #7556: fix sunpy and numpy 2.0'
  1. Push to a named branch:
git push YOURFORK 5.1:auto-backport-of-pr-7556-on-5.1
  1. Create a PR against branch 5.1, I would have named this PR:

"Backport PR #7556 on branch 5.1 (fix sunpy and numpy 2.0)"

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.

nabobalis added a commit to nabobalis/sunpy that referenced this pull request Apr 10, 2024
@nabobalis
Merge pull request sunpy#7556 from alasdairwilson/devdeps-erfa
3f11558 
fix sunpy and numpy 2.0

(cherry picked from commit c6e2b30)
nabobalis added a commit to nabobalis/sunpy that referenced this pull request Apr 10, 2024
@nabobalis
Merge pull request sunpy#7556 from alasdairwilson/devdeps-erfa
f83a736 
fix sunpy and numpy 2.0

(cherry picked from commit c6e2b30)
nabobalis added a commit to nabobalis/sunpy that referenced this pull request Apr 10, 2024
@nabobalis
Merge pull request sunpy#7556 from alasdairwilson/devdeps-erfa
1e3e021 
fix sunpy and numpy 2.0

(cherry picked from commit c6e2b30)
nabobalis added a commit to nabobalis/sunpy that referenced this pull request Apr 10, 2024
@nabobalis
Merge pull request sunpy#7556 from alasdairwilson/devdeps-erfa
1a04911 
fix sunpy and numpy 2.0

(cherry picked from commit c6e2b30)
nabobalis added a commit to nabobalis/sunpy that referenced this pull request Apr 10, 2024
@nabobalis
Merge pull request sunpy#7556 from alasdairwilson/devdeps-erfa
cdd3d16 
fix sunpy and numpy 2.0

(cherry picked from commit c6e2b30)
nabobalis added a commit to nabobalis/sunpy that referenced this pull request Apr 10, 2024
@nabobalis
Merge pull request sunpy#7556 from alasdairwilson/devdeps-erfa
339b3ce 
fix sunpy and numpy 2.0

(cherry picked from commit c6e2b30)
nabobalis added a commit to nabobalis/sunpy that referenced this pull request Apr 10, 2024
@nabobalis
Merge pull request sunpy#7556 from alasdairwilson/devdeps-erfa
b50fd4e 
fix sunpy and numpy 2.0

(cherry picked from commit c6e2b30)
nabobalis added a commit to nabobalis/sunpy that referenced this pull request Apr 10, 2024
@nabobalis
Merge pull request sunpy#7556 from alasdairwilson/devdeps-erfa
2aae902 
fix sunpy and numpy 2.0

(cherry picked from commit c6e2b30)
@nabobalis nabobalis removed the Still Needs Manual Backport This PR needs manually backporting label May 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@braingram braingram braingram left review comments

@Cadair Cadair Cadair approved these changes

@nabobalis nabobalis nabobalis approved these changes

@CyclingNinja CyclingNinja CyclingNinja approved these changes

Assignees
No one assigned
Labels
backport 5.0 on-merge: backport to 5.0 backport 5.1 on-merge: backport to 5.1 Infrastructure Issues or PRs that affect the CI or packaging of SunPy Merge When CI Passes Hit that merge button when it's all green! Minor Change PR only needs one approval to merge No Changelog Entry Needed Run cron CI Run cron CI on this PR Run publish Run publish CI on this PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Build and test against numpy 2.0rc1
6 participants
@alasdairwilson @nabobalis @braingram @Cadair @CyclingNinja @wtbarnes