search

SNEWS2 / snewpy

A Python package for working with supernova neutrinos
https://snewpy.readthedocs.io
BSD 3-Clause "New" or "Revised" License
26 stars 19 forks source link

Sheshuk/extras require docs fix #136

Closed Sheshuk closed 2 years ago

Sheshuk commented 2 years ago

Closes #133

Sheshuk commented 2 years ago

Oh, now it's conflicting with the snowglobes_interface. I'll try to merge that

JostMigenda commented 2 years ago

This looks good to me; thanks!

Just want to check: Did you mean to target the Sheshuk/snowglobes_interface branch with this PR? It’s fairly unrelated to that one, so maybe targeting it at the main branch would be more appropriate?

Sheshuk commented 2 years ago

Well, it interferes with the dev requirements you added in that target branch, So I decided to merge and resolve the conflicts here, instead of having conflicts merging to main.

JostMigenda commented 2 years ago

I’d prefer merging this into main, then merging main back into Sheshuk/snowglobes_interface and resolving conflicts on that branch. Otherwise, if we merge everything that conflicts with Sheshuk/snowglobes_interface into that branch instead of main, it becomes pretty unmanageable very quickly. But I guess for this small PR, it’s not a big deal.