Skip to content
This repository was archived by the owner on Aug 24, 2023. It is now read-only.

Commit b22eb10

Browse files
authored
Merge pull request #354 from dstansby/project-status
Add project status to docs
2 parents 32d2a26 + 0e521bd commit b22eb10

File tree

10 files changed

+41
-69
lines changed

10 files changed

+41
-69
lines changed

.github/workflows/python-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: linux py38-mindeps
2020
os: ubuntu-20.04
2121
python-version: '3.8'
22-
pip-extras: '"sunpy<3.1" "astropy<4.2"'
22+
pip-extras: '"sunpy<3.1" "astropy<5.1"'
2323
- name: linux py39
2424
os: ubuntu-20.04
2525
python-version: '3.9'

doc/source/changes.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
Changelog
44
=========
55

6+
1.1.2
7+
-----
8+
- Added project status documentation.
9+
- Bumped the minimum version of astropy to 5.0.
10+
- Fixed ADAPT map reading with sunpy >= 4.0.
11+
612
1.1.1
713
-----
814
Fixed imports so pfsspy does not depend on ``sympy`` as a runtime dependency.

doc/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@
199199
# A list of files that should not be packed into the epub file.
200200
epub_exclude_files = ['search.html']
201201

202-
os.environ["JSOC_EMAIL"] = 'jsoc@cadair.com'
202+
os.environ["JSOC_EMAIL"] = 'jsoc@sunpy.org'
203203

204204

205205
# -- Extension configuration -------------------------------------------------

doc/source/contributing.rst

Lines changed: 0 additions & 48 deletions
This file was deleted.

doc/source/index.rst

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@
22

33
pfsspy documentation
44
====================
5-
pfsspy is a python package for carrying out Potential Field Source Surface
6-
modelling, a commonly used magnetic field model of the Sun and other stars.
5+
pfsspy is a python package for carrying out Potential Field Source Surface modelling, a commonly used magnetic field model of the Sun and other stars.
76

87
.. note::
9-
If you find any bugs or have any suggestions for improvement, please raise
10-
an issue here: https://github.com/dstansby/pfsspy/issues
11-
12-
8+
If you find any bugs or have any suggestions for improvement, please raise an issue here: https://github.com/dstansby/pfsspy/issues
139

1410
Contents
1511
--------
@@ -22,7 +18,7 @@ Contents
2218
pfsspy
2319
performance
2420
changes
25-
contributing
21+
project_status
2622
numerical_method
2723
synoptic_fits
2824

doc/source/installing.rst

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
Installing
22
----------
3-
4-
pfsspy requires
5-
6-
- python >= 3.8
7-
- sunpy >= 3.0
8-
9-
and can be installed from PyPi using
3+
pfsspy can be installed from PyPi using
104

115
.. code::
126

doc/source/project_status.rst

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
History, status, and future
2+
===========================
3+
The `original PFSS implementation in Python <https://doi.org/10.5281/zenodo.1472183>`__ was written by `Anthony Yeates <https://www.maths.dur.ac.uk/users/anthony.yeates/>`__.
4+
I (David Stansby) then took this and added tests, documentation, and integrated it with the SunPy project ecosystem to create the pfsspy package.
5+
Most of the package was written by myself, with some community contributions.
6+
7+
I am the sole maintainer of the package, which is currently feature complete (providing a spherical PFSS solver in Python that integrates well with the SunPy package ecosystem).
8+
9+
Going forward the only changes to the package will be:
10+
- Fixing `identified bugs <https://github.com/dstansby/pfsspy/issues?q=is%3Aopen+is%3Aissue+label%3ABug>`__
11+
- Adding tightly scoped `new features <https://github.com/dstansby/pfsspy/issues?q=is%3Aopen+is%3Aissue+label%3AEnhancement>`__ to improve usability or integrate better with other SunPy packages.
12+
- Improving the documentation.
13+
- Retaining compatibility with future versions of the package dependencies (e.g. sunpy, Matplotlib...)
14+
I intend to remain the sole maintainer of the package, but since I'm not currently active in solar physics research don't have lots of time to work on pfsspy.
15+
As a priority I will maintain the issue list with well scoped pieces of work that others can contribute to fixing.
16+
17+
Community contributions
18+
-----------------------
19+
The `pfsspy issue tracker <https://github.com/dstansby/pfsspy/issues>`__ maintains a list of items that need working on.
20+
Please open a new issue if you find a problem or want to see a new feature added!
21+
If you want to fix any of the issues yourself, please open a pull request.
22+
I will try my best to review and merge pull requests, but **please keep them as small as possible** to make my life easier!
23+
General guidelines for contributing to open source can be found in the `sunpy developers guide <https://docs.sunpy.org/en/latest/dev_guide/index.html>`__

pfsspy/tests/test_map.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ def test_gong_source(gong_map):
2424

2525

2626
def test_adapt_map(adapt_map):
27-
import sunpy.io
28-
adapt_fits = sunpy.io.fits.read(adapt_map)
27+
import astropy.io
28+
adapt_fits = astropy.io.fits.open(adapt_map)
2929
for map_slice in adapt_fits[0].data:
3030
m = sunpy.map.Map((map_slice, adapt_fits[0].header))
3131
assert isinstance(m, pfsspy.map.ADAPTMap)

pfsspy/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import astropy.constants as const
44
import astropy.coordinates as coord
5+
import astropy.io
56
import astropy.time
67
import numpy as np
7-
import sunpy.io
88
import sunpy.map
99
import sunpy.time
1010
from astropy import units as u
@@ -76,7 +76,7 @@ def load_adapt(adapt_path):
7676
-------
7777
adaptMapSequence : `sunpy.map.MapSequence`
7878
"""
79-
adapt_fits = sunpy.io.fits.read(adapt_path)
79+
adapt_fits = astropy.io.fits.open(adapt_path)
8080
header = adapt_fits[0].header
8181
if header['MODEL'] != 'ADAPT':
8282
raise ValueError(f"{os.path.basename(adapt_path)} header['MODEL'] "

setup.cfg

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ python_requires = >=3.8
3232
packages = pfsspy
3333
include_package_data = True
3434
install_requires =
35-
astropy>=4.1
35+
astropy>=5.0
3636
numpy
3737
scikit-image
3838
scipy
@@ -54,6 +54,7 @@ docs =
5454

5555
test =
5656
numpy
57+
parfive<2
5758
pytest
5859
pytest-cov
5960
reproject

0 commit comments

Comments
 (0)