Skip to content

Commit

Permalink
Merge branch 'main' into timeseries-tutorial-refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
dstansby committed May 15, 2023
2 parents 68bb9e7 + 1ef3a5c commit 58cfdee
Show file tree
Hide file tree
Showing 35 changed files with 1,128 additions and 1,101 deletions.
7 changes: 6 additions & 1 deletion .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Abhijeet Manhas <abhijeetmanhas720@gmail.com> abhijeetmanhas <abhijeetmanhas720@
Abijith Bahuleyan <abijithbahuleyan@gmail.com> abijith-bahuleyan <abijithbahuleyan@gmail.com>
Akash Verma <shivamvermashs@gmail.com> akash5100 <shivamvermashs@gmail.com>
Akash Verma <shivamvermashs@gmail.com> Akash Verma <akashzsh08@gmail.com>
Akshit Tyagi <tyagiakshit833@gmail.com> Akshit Tyagi <37214399+exitflynn@users.noreply.github.com>
Alasdair Wilson <alasdair.wlsn@gmail.com> alasdairwilson <60351846+alasdairwilson@users.noreply.github.com>
Alasdair Wilson <alasdair.wlsn@gmail.com> Alasdair Wilson <60351846+alasdairwilson@users.noreply.github.com>
Albert Y. Shih <ayshih@gmail.com> Albert Shih <ayshih@gmail.com>
Expand Down Expand Up @@ -111,6 +112,7 @@ Naman9639 <naman9639224290@gmail.com> Naman <31286078+Naman9639@users.noreply.gi
Naman9639 <naman9639224290@gmail.com> Naman <naman9639224290@gmail.com>
Naman9639 <naman9639224290@gmail.com> Naman9639 <31286078+Naman9639@users.noreply.github.com>
Naveen Srinivasan <172697+naveensrinivasan@users.noreply.github.com>naveen <172697+naveensrinivasan@users.noreply.github.com>
Nischal Singh <32027279+davnish@users.noreply.github.com> Nischal Singh <nischalsingh@Nischals-MacBook-Air.local>
Norbert G Gyenge <gyenge.norbert@hotmail.com> Norbert Gyenge <gyenge.norbert@hotmail.com>
Ole Streicher <ole@aip.de> Ole Streicher <olebole@debian.org>
Pritish Chakraborty <chakrabortypritish@gmail.com> PritishC <pritishc@pritishc-HP-Mini-210-1100.(none)>
Expand Down Expand Up @@ -157,10 +159,13 @@ Stuart Mumford <stuart@cadair.com> U-Cadair-Core\stuart <stuart@Cadair-Core.(non
Sudarshan Konge <sudk1896@gmail.com> sudarshan <ssudk1896@gmail.com>
Sudarshan Konge <sudk1896@gmail.com> sudarshan <sudk1896@gmail.com>
Sudeep Sidhu <sudeepmanilsidhu@gmail.com> sidhu1012 <sudeepmanilsidhu@gmail.com>
Suleiman Farah <116139540+SuleimanFarah@users.noreply.github.com> SuleimanFarah <116139540+SuleimanFarah@users.noreply.github.com>
Swapnil Kannojia <swapnilkannojia123@gmail.com> swapnil99007 <swapnilkannojia123@gmail.com>
Tan Jia Qing <jiaqing2303@gmail.com> jiaqing23 <jiaqing2303@gmail.com>
Tannmay Yadav <tanmayy98@gmail.com> tannmay <tanmayy98@gmail.com>
Tathagata Paul <tathagatapaul7@gmail.com> 4molybdenum2 <tathagatapaul7@gmail.com>
Tiago Pereira <tiago.pereira@astro.uio.no> tiagopereira <tiago@1x-193-157-254-255.uio.no>
Tiago Pereira <tiago.pereira@astro.uio.no> tiagopereira <tiago@1x-193-157-254-255.uio.no>
Aryan Shukla <shuklas2002@gmail.com> Telomelonia <shuklas2002@gmail.com>
Timo Laitinen <tlml@users.noreply.github.com> tlml <tlml@users.noreply.github.com>
Trung Kien Dang <kiendang@users.noreply.github.com> Dang Trung Kien <kiendang@users.noreply.github.com>
Utkarsh Parkhi <uparkhi@ph.iitr.ac.in> utkarsh <uparkhi@ph.iitr.ac.in>
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
repos:
# This should be before any formatting hooks like isort
- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: "v0.0.263"
rev: "v0.0.265"
hooks:
- id: ruff
args: ["--fix"]
Expand Down
96 changes: 79 additions & 17 deletions .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
"orcid": "0000-0002-2019-8881",
"affiliation": "NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA"
},
{
"name": "Florian Mayer"
},
{
"name": "Albert Y. Shih",
"orcid": "0000-0001-6874-2594",
"affiliation": "NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA"
},
{
"name": "Florian Mayer"
},
{
"name": "V. Keith Hughitt",
"orcid": "0000-0003-0787-9559",
Expand Down Expand Up @@ -153,19 +153,23 @@
{
"name": "Sudarshan Konge"
},
{
"name": "Rajul Srivastava"
},
{
"name": "Matt Wentzel-Long",
"orcid": "0000-0002-3106-4598",
"affiliation": "Stark State College"
},
{
"name": "Rajul Srivastava"
},
{
"name": "Yash Jain",
"orcid": "0000-0001-5347-4734",
"affiliation": "Indian Institute of Technology, Kharagpur, 721302, India"
},
{
"name": "Lazar Zivadinovic",
"orcid": "0000-0003-1349-1606"
},
{
"name": "Samuel Bennett"
},
Expand Down Expand Up @@ -202,6 +206,11 @@
"orcid": "0000-0002-2747-2716",
"affiliation": "Centre for Fusion, Space and Astrophysics, Physics Department, University of Warwick, Coventry CV4 7AL, United Kingdom"
},
{
"name": "Alasdair Wilson",
"orcid": "0000-0003-0820-8159",
"affiliation": "Trinity College Dublin / Dublin Institute for Advanced Studies"
},
{
"name": "Aryan Chouhan",
"orcid": "0000-0001-8004-7586",
Expand All @@ -215,10 +224,6 @@
"orcid": "0000-0002-3783-5509",
"affiliation": "Laboratory for Atmospheric and Space Physics, University of Colorado Boulder"
},
{
"name": "Lazar Zivadinovic",
"orcid": "0000-0003-1349-1606"
},
{
"name": "Sanskar Modi"
},
Expand All @@ -235,6 +240,11 @@
"affiliation": "W.W. Hansen Experimental Physics Laboratory, Stanford University, Stanford, CA 94305, USA",
"orcid": "0000-0002-5662-9604"
},
{
"name": "Akshit Tyagi",
"orcid": "0009-0005-4804-9035",
"affiliation": "Jaypee Institute of Information Technology, Noida, India"
},
{
"name": "Jose Ivan Campos Rozo",
"orcid": "0000-0001-8883-6790",
Expand Down Expand Up @@ -271,6 +281,11 @@
"orcid": "0000-0003-1613-8947",
"affiliation": " University of Hong Kong (Hong Kong SAR), University of London (Great Britain)"
},
{
"name": "Aryan Shukla",
"orcid": "0009-0001-9467-4836",
"affiliation": "Indian Institute of Technology, Roorkee, India"
},
{
"name": "Jan Gieseler"
},
Expand Down Expand Up @@ -343,9 +358,9 @@
"name": "Matt Bates"
},
{
"name": "Alasdair Wilson",
"orcid": "0000-0003-0820-8159",
"affiliation": "Trinity College Dublin / Dublin Institute for Advanced Studies"
"name": "ryuusama",
"orcid": "0009-0000-0795-8471",
"affiliation": "Dwarkadas J Sanghvi college of engineering"
},
{
"name": "Devansh Shukla",
Expand Down Expand Up @@ -398,6 +413,11 @@
{
"name": "Erik M. Bray"
},
{
"name": "Nick Murphy",
"affiliation": "Center for Astrophysics | Harvard & Smithsonian",
"orcid": "0000-0001-6628-8033"
},
{
"name": "Rutuja Surve"
},
Expand Down Expand Up @@ -463,9 +483,9 @@
"name": "Krish Agrawal"
},
{
"name": "Nick Murphy",
"affiliation": "Center for Astrophysics | Harvard & Smithsonian",
"orcid": "0000-0001-6628-8033"
"name": "Nischal Singh",
"orcid": "0009-0007-2165-052X",
"affiliation": "Madhav Institute of Technology and Science, Gwalior, India"
},
{
"name": "Priyank Lodha"
Expand Down Expand Up @@ -498,6 +518,11 @@
{
"name": "Andrew Hill"
},
{
"name": "Ansh Dixit",
"orcid": "0009-0004-7872-0419",
"affiliation": "GEU"
},
{
"name": "Benjamin Mampaey",
"orcid": "0000-0001-6541-4966",
Expand Down Expand Up @@ -569,6 +594,11 @@
{
"name": "Abijith Bahuleyan"
},
{
"name": "Akhoury Shauryam",
"orcid": "0009-0005-8038-8301",
"affiliation": "Chennai Mathematical Institute"
},
{
"name": "Alex Kaszynski"
},
Expand All @@ -587,6 +617,11 @@
{
"name": "Arfon Smith"
},
{
"name": "Aritra Sinha",
"orcid": "0009-0008-2531-1012",
"affiliation": "National Institute of Technology Karnataka, Surathkal, India"
},
{
"name": "Arseniy Kustov"
},
Expand All @@ -596,6 +631,9 @@
{
"name": "Chris Bard"
},
{
"name": "Ed Behn"
},
{
"name": "Emmanuel Arias"
},
Expand Down Expand Up @@ -686,6 +724,9 @@
"orcid": "0000-0003-0464-1537",
"affiliation": "SP2RC, School of Mathematics and Statistics, University of Sheffield, Sheffield, S3 7RH, UK"
},
{
"name": "OussCHE"
},
{
"name": "Rajasekhar Reddy Mekala"
},
Expand All @@ -707,11 +748,26 @@
{
"name": "Shubham Jain"
},
{
"name": "Suleiman Farah",
"orcid": "0009-0001-3304-2923",
"affiliation": "University of Toronto"
},
{
"name": "Swapnil Kannojia",
"orcid": "0000-0002-4233-774X",
"affiliation": "Maulana Azad National Institute of Technology, Bhopal"
},
{
"name": "Syed Md Mihan Chistie",
"orcid": "0009-0007-5883-2749",
"affiliation": "Dayananda Sagar University, Bangalore"
},
{
"name": "Tan Jia Qing",
"orcid": "0009-0003-6749-982X",
"affiliation": "Nanyang Technological University"
},
{
"name": "Tannmay Yadav",
"orcid": "0000-0002-3143-5635",
Expand Down Expand Up @@ -755,9 +811,15 @@
"orcid": "0000-0003-3827-6857",
"affiliation": "International Institute of Information Technology, Hyderabad 500 032, India"
},
{
"name": "ejm4567"
},
{
"name": "platipo"
},
{
"name": "pradeep"
},
{
"name": "resakra"
},
Expand All @@ -777,4 +839,4 @@
}
],
"access_right": "open"
}
}
2 changes: 1 addition & 1 deletion changelog/6743.deprecation.rst
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Using `~sunpy.map.header_helper.meta_keywords` is deprecated.
Using `sunpy.map.header_helper.meta_keywords` is deprecated.
Please see :ref:`Meta Keywords Table` for the list of metadata keywords used by `~sunpy.map.Map`.
1 change: 1 addition & 0 deletions changelog/6853.doc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Changed the reprojecting images to different observers example (:ref:`sphx_glr_generated_gallery_map_transformations_reprojection_different_observers.py`) to avoid using custom wcs headers where possible.
2 changes: 2 additions & 0 deletions changelog/6944.doc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Significantly revised and improved the :ref:`map_guide` part of the tutorial.
This included moving the section on custom maps to the :ref:`how_to_guide` section.
1 change: 1 addition & 0 deletions changelog/6954.doc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Reorganized some parts of the coordinates topic guide into multiple how-to guides.
1 change: 1 addition & 0 deletions changelog/6977.doc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Move examples of how to create a Map from reference pages to a how-to guide.
3 changes: 3 additions & 0 deletions changelog/6995.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
When converting an `astropy.wcs.WCS` object to a solar coordinate frame the
``DATE-AVG`` key will be used before the ``DATE-OBS`` key, previously only
``DATE-OBS`` was checked.
1 change: 1 addition & 0 deletions changelog/7004.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
`sunpy.map.GenericMap.rotation_matrix` now applies the default values if any FITS rotation matrix keywords are missing from the header.
1 change: 0 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,6 @@
'../examples/saving_and_loading_data',
'../examples/computer_vision_techniques',
'../examples/showcase',
'../examples/developer_tools'
]),
'within_subsection_order': ExampleTitleSortKey,
'gallery_dirs': os.path.join('generated', 'gallery'),
Expand Down
2 changes: 1 addition & 1 deletion docs/dev_guide/contents/example_gallery.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ Contribution Guidelines

* If you need to use ``astropy.visualization.{quantity_support, time_support}``, import these functions at the top of the example, and call them directly before the first plot that needs them.

.. note:: We have an example template located at :file:`sunpy/examples/example_template/example_template.py`.
We recommend checking the other examples in the gallery to see how they are structured and what they contain.
Loading

0 comments on commit 58cfdee

Please sign in to comment.