Skip to content

Commit c3ea48d

Browse files
authored
Finalising for 0.1 release (#30)
* Bump version to 0.1.0 ready for release * Small fix for older matplotlib versions * Update package metadata and README * Add docstrings for from_vires andfrom_hapi * Fix formatting * More tweaks for docs * Allow numpy 1.21
1 parent 285a119 commit c3ea48d

File tree

11 files changed

+54
-18
lines changed

11 files changed

+54
-18
lines changed

CITATION.cff

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ authors:
1717
orcid: 'https://orcid.org/0000-0001-7212-5791'
1818
- given-names: Theresa
1919
family-names: Hoppe
20+
orcid: 'https://orcid.org/0009-0000-7108-5468'
2021
- given-names: Heikki
2122
family-names: Vanhamäki
2223
orcid: 'https://orcid.org/0000-0002-3454-0350'

README.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
# SwarmPAL
22

33
---
4+
[![Swarm-VRE](https://img.shields.io/badge/%F0%9F%9A%80%20launch-Swarm--VRE-blue)](https://vre.vires.services/hub/user-redirect/git-pull?repo=https%3A%2F%2Fgithub.com%2Fsmithara%2Fswarmpal-demo&urlpath=lab%2Ftree%2Fswarmpal-demo%2FREADME.ipynb&branch=main)
5+
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/smithara/swarmpal-demo/HEAD)
6+
7+
[![PyPI](https://img.shields.io/pypi/v/swarmpal)]( https://pypi.org/project/swarmpal/)
48
[![Documentation](https://img.shields.io/badge/docs-online-success)][rtd-link]
59
[![GitHub Discussion][github-discussions-badge]][github-discussions-link]
10+
611
[![Actions Status][actions-badge]][actions-link]
712
[![Code style: black][black-badge]][black-link]
813
[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
@@ -25,4 +30,7 @@
2530
[rtd-badge]: https://img.shields.io/badge/docs-online-success
2631
[rtd-link]: https://swarmpal.readthedocs.io/
2732

28-
See the [SwarmPAL development guide on HackMD](https://hackmd.io/@swarm/dev/%2Ff6YIHfqxT9yL0giWJzhr_Q)
33+
![SwarmPAL diagram](https://swarmpal-benchmarks.netlify.app/swarmpal-diagram.png)
34+
35+
For more information see:
36+
- <https://swarmdisc.org/lab/>

docs/acknowledgements.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
If you make use of this package in a publication, please cite the following:
44

55
```raw
6-
[Pending Zenodo link and update of https://github.com/Swarm-DISC/SwarmPAL/blob/main/CITATION.cff]
6+
[Pending Zenodo link - for now, just reference the GitHub repo]
77
```
88

99
## Funding

docs/changelog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Changelog
22

3-
## 0.1
3+
## 0.1 (2023-04-13)
44

55
- First release ✨
66
- Reasonable implementation of using `DataTree` and `PalProcess` base class

docs/conf.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,10 @@
8080
"use_repository_button": True,
8181
"use_issues_button": True,
8282
"use_edit_page_button": True,
83-
"announcement": "WARNING! THIS PACKAGE IS IN ACTIVE DEVELOPMENT AND IS NOT YET STABLE!",
83+
"announcement": (
84+
"WARNING! THIS PACKAGE IS IN ACTIVE DEVELOPMENT AND IS NOT YET STABLE!<br>"
85+
"<button><a href='https://vre.vires.services/hub/user-redirect/git-pull?repo=https%3A%2F%2Fgithub.com%2Fsmithara%2Fswarmpal-demo&amp;urlpath=lab%2Ftree%2Fswarmpal-demo%2FREADME.ipynb&amp;branch=main'>Click here to try SwarmPAL in the Virtual Research Environment</a></button>"
86+
),
8487
}
8588

8689
# Add any paths that contain custom static files (such as style sheets) here,

docs/contributing.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
1. Join the mailing list at <https://groups.io/g/swarm-dev>
77
1. Join a meeting at <https://hackmd.io/@swarm/meetings>
88
1. Found something to improve? [Open an Issue on GitHub](https://github.com/Swarm-DISC/SwarmPAL/issues) or get in touch otherwise
9+
1. Have other ideas / requests for help? [Start a Discussion on GitHub](https://github.com/Swarm-DISC/SwarmPAL/discussions)
910

1011
## Development
1112

docs/installation.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
# Installation
22

3-
## ESA Virtual Research Environment
3+
## Swarm Virtual Research Environment
44

5-
> To be updated
5+
The easiest way to use SwarmPAL is in the Swarm Virtual Research Environment (read more [here](https://notebooks.vires.services/)). To get started with the SwarmPAL demo tool (which includes the examples given on these pages, as interactive notebooks), follow this link: [![Swarm-VRE](https://img.shields.io/badge/%F0%9F%9A%80%20launch-Swarm--VRE-blue)](https://vre.vires.services/hub/user-redirect/git-pull?repo=https%3A%2F%2Fgithub.com%2Fsmithara%2Fswarmpal-demo&urlpath=lab%2Ftree%2Fswarmpal-demo%2FREADME.ipynb&branch=main)
66

77
## Install latest release
88

9-
> To be updated
10-
11-
<!-- The package is available from PyPI:
9+
The package is available from PyPI:
1210

1311
```bash
1412
pip install swarmpal
15-
``` -->
13+
```
1614

1715
:::{admonition} New to Python?
1816
:class: note

pyproject.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ build-backend = "flit_core.buildapi"
66
[project]
77
name = "swarmpal"
88
authors = [
9-
{ name = "Ashley Smith", email = "ashley.smith@magneticearth.org" },
9+
{ name = "Ashley Smith", email = "ashley.smith@ed.ac.uk" },
1010
]
1111
maintainers = [
12-
{ name = "Ashley Smith", email = "ashley.smith@magneticearth.org" },
12+
{ name = "Ashley Smith", email = "ashley.smith@ed.ac.uk" },
1313
]
1414
license = { file = "LICENSE" }
1515

@@ -30,14 +30,14 @@ classifiers = [
3030
"Programming Language :: Python :: 3.8",
3131
"Programming Language :: Python :: 3.9",
3232
"Programming Language :: Python :: 3.10",
33-
"Development Status :: 1 - Planning",
33+
"Development Status :: 4 - Beta",
3434
]
3535

3636
dynamic = ["version"]
3737

3838
dependencies = [
3939
"hapiclient >= 0.2.3",
40-
"numpy >= 1.22",
40+
"numpy >= 1.21",
4141
"matplotlib >= 3.5",
4242
"scipy >= 1.8",
4343
"viresclient >= 0.11",

src/swarmpal/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from swarmpal import io, toolboxes
22

3-
__version__ = "0.1.0-a4"
3+
__version__ = "0.1.0"
44

55
__all__ = ("__version__", "io", "toolboxes")

src/swarmpal/io/_paldata.py

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,21 @@ def _pad_times(params: dict) -> tuple[dict, tuple[datetime]]:
191191
def from_vires(**params) -> PalDataItem:
192192
"""Create PalDataItem from VirES source
193193
194-
TODO: Detail params given by swarmpal.io.datafetchers.ViresParameters
194+
Parameters
195+
----------
196+
collection : str
197+
measurements : list[str]
198+
start_time : str | datetime
199+
end_time : str | datetime
200+
models : list[str]
201+
auxiliaries : list[str]
202+
sampling_step : str
203+
filters : list[str]
204+
options : dict
205+
server_url : str
206+
defaults to "https://vires.services/ows"
207+
pad_times : tuple[timedelta]
208+
This is handled specially by SwarmPAL and not passed to viresclient
195209
"""
196210
params, analysis_window = PalDataItem._pad_times(params)
197211
fetcher = get_fetcher("vires")(**params)
@@ -204,7 +218,16 @@ def from_vires(**params) -> PalDataItem:
204218
def from_hapi(**params) -> PalDataItem:
205219
"""Create PalDataItem from HAPI source
206220
207-
TODO: Detail params given by swarmpal.io.datafetchers.HapiParameters
221+
Parameters
222+
----------
223+
server : str
224+
dataset : str
225+
parameters : str
226+
start : str
227+
stop : str
228+
options : dict
229+
pad_times : tuple[timedelta]
230+
This is handled specially by SwarmPAL and not passed to hapiclient
208231
"""
209232
params, analysis_window = PalDataItem._pad_times(params)
210233
fetcher = get_fetcher("hapi")(**params)

0 commit comments

Comments
 (0)