Skip to content

Commit

Permalink
Merge pull request #5 from Cadair/pfsspy
Browse files Browse the repository at this point in the history
Merge in pfsspy repo
  • Loading branch information
Cadair committed Feb 28, 2024
2 parents 8fdaf6f + 0582b2e commit 86b7cf8
Show file tree
Hide file tree
Showing 94 changed files with 5,213 additions and 29 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ jobs:
submodules: false
coverage: codecov
toxdeps: tox-pypi-filter
posargs: -n auto
envs: |
- linux: py312
secrets:
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ instance/

# Sphinx documentation
docs/_build/
docs/generated/
# automodapi
docs/api

Expand Down Expand Up @@ -259,3 +260,7 @@ package.json

# Log files generated by 'vagrant up'
*.log

# repo specific
examples/using_pfsspy/aia_map.fits
docs/sg_execution_times.rst
5 changes: 5 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Samuel Badman <samuel.badman@cfa.harvard.edu> sam.badman <sam.badman@ssl.berkeley.edu>
Samuel Badman <samuel.badman@cfa.harvard.edu> Samuel Badman <54911235+STBadman@users.noreply.github.com>
Samuel Badman <samuel.badman@cfa.harvard.edu> STBadman <samuel_badman@berkeley.edu>
Stuart Mumford <stuart@cadair.com> Cadair <1391051+Cadair@users.noreply.github.com>
Matthieu Ancellin <31126826+mancellin@users.noreply.github.com>
5 changes: 5 additions & 0 deletions .ruff.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ extend-ignore = [
"PT007", # Parametrize should be lists of tuples # TODO! fix
"PT011", # Too broad exception assert # TODO! fix
"PT023", # Always use () on pytest decorators

# pfsspy
# TODO: Fix these
"E741",
"F811",
]

[lint.flake8-tidy-imports]
Expand Down
56 changes: 36 additions & 20 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# full list see the documentation:
# http://www.sphinx-doc.org/en/master/config

import os

# -- Project information -----------------------------------------------------

Expand All @@ -12,7 +13,7 @@
release = __version__

project = "sunkit-magex"
copyright = "2022, The SunPy Community"
copyright = "2024, The SunPy Community"
author = "The SunPy Community"

# -- General configuration ---------------------------------------------------
Expand All @@ -32,6 +33,7 @@
"sphinx.ext.mathjax",
"sphinx_automodapi.automodapi",
"sphinx_automodapi.smart_resolver",
'sphinx_gallery.gen_gallery',
]

# Add any paths that contain templates here, relative to this directory.
Expand All @@ -51,25 +53,39 @@

# -- Options for intersphinx extension ---------------------------------------

# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {"python": ("https://docs.python.org/", None)}
intersphinx_mapping = {
"python": ("https://docs.python.org/", None),
"astropy": ("https://docs.astropy.org/en/stable", None),
"sunpy": ("https://docs.sunpy.org/en/stable", None),
"numpy": ("https://numpy.org/doc/stable", None),
"streamtracer": ("https://streamtracer.readthedocs.io/en/stable", None),
"scipy": ("https://docs.scipy.org/doc/scipy/", None),
"reproject": ("https://reproject.readthedocs.io/en/stable/", None),
}

# -- Options for HTML output -------------------------------------------------

# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
html_theme = "alabaster"

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
# html_static_path = ["_static"]

# By default, when rendering docstrings for classes, sphinx.ext.autodoc will
# make docs with the class-level docstring and the class-method docstrings,
# but not the __init__ docstring, which often contains the parameters to
# class constructors across the scientific Python ecosystem. The option below
# will append the __init__ docstring to the class-level docstring when rendering
# the docs. For more options, see:
# https://www.sphinx-doc.org/en/master/usage/extensions/autodoc.html#confval-autoclass_content
autoclass_content = "both"
html_theme = "sunpy"

# -- Sphinx Gallery ----------------------------------------------------------

from sphinx_gallery.sorting import ExplicitOrder # noqa

sphinx_gallery_conf = {
"ignore_pattern": ".*helpers.py",
"examples_dirs": "../examples",
"gallery_dirs": os.path.join("generated", "gallery"),
"subsection_order": ExplicitOrder(["../examples/using_pfsspy",
"../examples/finding_data",
"../examples/utils",
"../examples/pfsspy_info",
"../examples/testing"]),
"reference_url": {"sphinx_gallery": None}
}

# -- Other options ----------------------------------------------------------
default_role = 'py:obj'

os.environ["JSOC_EMAIL"] = 'jsoc@sunpy.org'

nitpicky = True
Binary file added docs/example_figures/tracer_performace.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ This is the documentation for sunkit-magex.
:maxdepth: 2
:caption: Contents:

Indices and tables
==================

* :ref:`genindex`
* :ref:`modindex`
* :ref:`search`
installing
generated/gallery/index
pfsspy
performance
numerical_method
synoptic_fits
15 changes: 15 additions & 0 deletions docs/installing.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Installing
----------
sunkit_magex can be installed from PyPI using

.. code::
pip install sunkit-magex
This will install sunkit_magex and all of its dependencies. In addition to the core
dependencies, there are two optional dependencies (numba, streamtracer) that
improve code performance. These can be installed with

.. code::
pip install sunkit-magex[performance]
Binary file added docs/manual/numerical_methods.pdf
Binary file not shown.
Binary file added docs/manual/source/Q.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/manual/source/grid.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/manual/source/grid3d.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 86b7cf8

Please sign in to comment.