Skip to content

Commit 6507fe3

Browse files
Merge pull request #1474 from VeckoTheGecko/update-prettier
Add prettier
2 parents a3d90da + 861feca commit 6507fe3

9 files changed

Lines changed: 62 additions & 65 deletions

File tree

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
---
22
name: Parcels feature requests, enhancements, or bug reporting
33
about: Create an Issue about bugs in the Parcels codebase, or required improvements
4-
title: ''
5-
labels: ''
6-
assignees: ''
7-
4+
title: ""
5+
labels: ""
6+
assignees: ""
87
---

.github/workflows/pypi-release.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
- published
66
push:
77
tags:
8-
- 'v*'
8+
- "v*"
99
workflow_dispatch:
1010

1111
jobs:
@@ -79,7 +79,6 @@ jobs:
7979
repository_url: https://test.pypi.org/legacy/
8080
verbose: true
8181

82-
8382
upload-to-pypi:
8483
needs: test-built-dist
8584
if: github.event_name == 'release'

.github/workflows/unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
os: [macos, ubuntu, windows]
25-
include: # TODO check if these can go?
25+
include: # TODO check if these can go?
2626
- os: macos
2727
os-short: osx
2828
- os: ubuntu

.pre-commit-config.yaml

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,34 @@
11
repos:
2-
- repo: https://github.com/pre-commit/pre-commit-hooks
2+
- repo: https://github.com/pre-commit/pre-commit-hooks
33
rev: v4.5.0
44
hooks:
5-
- id: trailing-whitespace
6-
- id: end-of-file-fixer
7-
- id: check-yaml
8-
- id: check-ast
9-
- id: check-json
5+
- id: trailing-whitespace
6+
- id: end-of-file-fixer
7+
- id: check-yaml
8+
- id: check-ast
9+
- id: check-json
1010
types: [text]
1111
files: \.(json|ipynb)$
12-
- repo: https://github.com/pycqa/flake8
13-
rev: '6.1.0'
12+
- repo: https://github.com/pycqa/flake8
13+
rev: "6.1.0"
1414
hooks:
15-
- id: flake8
16-
- repo: https://github.com/pycqa/pydocstyle
17-
rev: 6.3.0 # pick a git hash / tag to point to
15+
- id: flake8
16+
- repo: https://github.com/pycqa/pydocstyle
17+
rev: 6.3.0 # pick a git hash / tag to point to
1818
hooks:
19-
- id: pydocstyle
20-
- repo: https://github.com/nbQA-dev/nbQA
19+
- id: pydocstyle
20+
- repo: https://github.com/nbQA-dev/nbQA
2121
rev: 1.7.1
2222
hooks:
23-
- id: nbqa-black
24-
- id: nbqa-check-ast
25-
- id: nbqa-isort
26-
- repo: https://github.com/pycqa/isort
23+
- id: nbqa-black
24+
- id: nbqa-check-ast
25+
- id: nbqa-isort
26+
- repo: https://github.com/pycqa/isort
2727
rev: 5.13.2
2828
hooks:
29-
- id: isort
29+
- id: isort
3030
name: isort (python)
31+
- repo: https://github.com/pre-commit/mirrors-prettier
32+
rev: "v3.1.0"
33+
hooks:
34+
- id: prettier

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
docs/_templates

CITATION.cff

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
cff-version: 1.2.0
22
message: "If you use this software, please cite it as below."
33
authors:
4-
- family-names: "Van Sebille"
5-
given-names: "Erik"
6-
orcid: "https://orcid.org/0000-0003-2041-0704"
7-
- family-names: "Kehl"
8-
given-names: "Christian"
9-
orcid: "https://orcid.org/0000-0003-4200-1450"
10-
- family-names: "Lange"
11-
given-names: "Michael"
12-
orcid: "https://orcid.org/0000-0002-3232-0127"
13-
- family-names: "Delandmeter"
14-
given-names: "Philippe"
15-
orcid: "https://orcid.org/0000-0003-0100-5834"
16-
- name: "The Parcels contributors"
17-
website: "https://github.com/OceanParcels/parcels/graphs/contributors"
4+
- family-names: "Van Sebille"
5+
given-names: "Erik"
6+
orcid: "https://orcid.org/0000-0003-2041-0704"
7+
- family-names: "Kehl"
8+
given-names: "Christian"
9+
orcid: "https://orcid.org/0000-0003-4200-1450"
10+
- family-names: "Lange"
11+
given-names: "Michael"
12+
orcid: "https://orcid.org/0000-0002-3232-0127"
13+
- family-names: "Delandmeter"
14+
given-names: "Philippe"
15+
orcid: "https://orcid.org/0000-0003-0100-5834"
16+
- name: "The Parcels contributors"
17+
website: "https://github.com/OceanParcels/parcels/graphs/contributors"
1818
title: "Parcels"
1919
version: 2.4.2
2020
doi: 10.5281/zenodo.8010997

CODE_OF_CONDUCT.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ In the interest of fostering an open and welcoming environment, we as contributo
88

99
Examples of behavior that contributes to creating a positive environment include:
1010

11-
* Using welcoming and inclusive language
12-
* Being respectful of differing viewpoints and experiences
13-
* Gracefully accepting constructive criticism
14-
* Focusing on what is best for the community
15-
* Showing empathy towards other community members
11+
- Using welcoming and inclusive language
12+
- Being respectful of differing viewpoints and experiences
13+
- Gracefully accepting constructive criticism
14+
- Focusing on what is best for the community
15+
- Showing empathy towards other community members
1616

1717
Examples of unacceptable behavior by participants include:
1818

19-
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20-
* Trolling, insulting/derogatory comments, and personal or political attacks
21-
* Public or private harassment
22-
* Publishing others' private information, such as a physical or electronic address, without explicit permission
23-
* Other conduct which could reasonably be considered inappropriate in a professional setting
19+
- The use of sexualized language or imagery and unwelcome sexual attention or advances
20+
- Trolling, insulting/derogatory comments, and personal or political attacks
21+
- Public or private harassment
22+
- Publishing others' private information, such as a physical or electronic address, without explicit permission
23+
- Other conduct which could reasonably be considered inappropriate in a professional setting
2424

2525
## Our Responsibilities
2626

README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,26 @@
44

55
![Arctic-SO-medusaParticles](https://github.com/OceanParcels/oceanparcels_website/blob/master/images/homepage.gif)
66

7-
*Animation of virtual particles carried by ocean surface flow in the global oceans. The particles are advected with [Parcels](http://oceanparcels.org/) in data from the [NEMO Ocean Model](https://www.nemo-ocean.eu/).*
7+
_Animation of virtual particles carried by ocean surface flow in the global oceans. The particles are advected with [Parcels](http://oceanparcels.org/) in data from the [NEMO Ocean Model](https://www.nemo-ocean.eu/)._
88

99
### Parcels manuscript and code
1010

1111
The manuscript detailing the first release of Parcels, version 0.9, has been published in [Geoscientific Model Development](https://www.geosci-model-dev.net/10/4175/2017/gmd-10-4175-2017.html) and can be cited as
1212

13-
*Lange, M and E van Sebille (2017) Parcels v0.9: prototyping a Lagrangian Ocean Analysis framework for the petascale age. Geoscientific Model Development, 10, 4175-4186. https://doi.org/10.5194/gmd-2017-167*
13+
_Lange, M and E van Sebille (2017) Parcels v0.9: prototyping a Lagrangian Ocean Analysis framework for the petascale age. Geoscientific Model Development, 10, 4175-4186. https://doi.org/10.5194/gmd-2017-167_
1414

1515
The manuscript detailing version 2.0 of Parcels is available at [Geoscientific Model Development](https://www.geosci-model-dev.net/12/3571/2019/gmd-12-3571-2019-discussion.html) and can be cited as:
1616

17-
*Delandmeter, P and E van Sebille (2019) The Parcels v2.0 Lagrangian framework: new field interpolation schemes. Geoscientific Model Development, 12, 3571-3584. https://doi.org/10.5194/gmd-12-3571-2019*
17+
_Delandmeter, P and E van Sebille (2019) The Parcels v2.0 Lagrangian framework: new field interpolation schemes. Geoscientific Model Development, 12, 3571-3584. https://doi.org/10.5194/gmd-12-3571-2019_
1818

1919
The manuscript detailing the performance of Parcels v2.4 is available at [Computers & Geosciences](https://doi.org/10.1016/j.cageo.2023.105322) and can be cited as:
2020

21-
*Kehl, C, PD Nooteboom, MLA Kaandorp and E van Sebille (2023) Efficiently simulating Lagrangian particles in large-scale ocean flows — Data structures and their impact on geophysical applications, Computers and Geosciences, 175, 105322. https://doi.org/10.1016/j.cageo.2023.105322*
21+
_Kehl, C, PD Nooteboom, MLA Kaandorp and E van Sebille (2023) Efficiently simulating Lagrangian particles in large-scale ocean flows — Data structures and their impact on geophysical applications, Computers and Geosciences, 175, 105322. https://doi.org/10.1016/j.cageo.2023.105322_
2222

2323
### Further information
2424

2525
See [oceanparcels.org](http://oceanparcels.org/) for further information about [installing](https://docs.oceanparcels.org/en/latest/installation.html) and [running](https://docs.oceanparcels.org/en/latest/documentation.html) the Parcels code, as well as extended [documentation](https://docs.oceanparcels.org/en/latest/reference.html) of the methods and classes.
2626

27-
2827
### Launch Parcels Tutorials on [mybinder.org](https://mybinder.org/v2/gh/OceanParcels/parcels/master?labpath=docs%2Fexamples%2Fparcels_tutorial.ipynb)
2928

3029
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/OceanParcels/parcels/master?labpath=docs%2Fexamples%2Fparcels_tutorial.ipynb)

docs/contributing.md

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,41 +5,36 @@ Even if you don't want to contribute directly to the codebase, getting involved
55

66
This document outlines some guidelines for contributing to the parcels codebase. If you have any questions or suggestions for how we can improve this document, please let us know.
77

8-
98
## Getting Started
109

1110
To get started contributing to parcels, you'll need to install the developer version of Parcels following [our installation instructions](installation.rst#installation-for-developers). This will install the latest version of Parcels from the `master` branch of the repository.
1211

1312
**Optional:** Setup `pre-commit` hooks by running `pre-commit install`. This ensures that code is formatted correctly before you commit it.
1413

15-
1614
## Making Changes
1715

1816
Once you have a working environment, you can start making changes to the code! Here are some general guidelines to follow when making changes:
1917

20-
* Follow the [NumPy docstring conventions](https://numpydoc.readthedocs.io/en/latest/format.html) when adding or modifying docstrings.
21-
22-
* Follow the [PEP 8](https://peps.python.org/pep-0008/) style guide when writing code. This codebase also uses [flake8](https://flake8.pycqa.org/en/latest/) and [isort](https://pycqa.github.io/isort/) to ensure a consistent code style (these tools are run automatically by pre-commit).
18+
- Follow the [NumPy docstring conventions](https://numpydoc.readthedocs.io/en/latest/format.html) when adding or modifying docstrings.
2319

24-
* Use Git to manage your changes. Create a new branch for each feature or bug fix.
20+
- Follow the [PEP 8](https://peps.python.org/pep-0008/) style guide when writing code. This codebase also uses [flake8](https://flake8.pycqa.org/en/latest/) and [isort](https://pycqa.github.io/isort/) to ensure a consistent code style (these tools are run automatically by pre-commit).
2521

26-
* Write clear commit messages that explain the changes you've made.
22+
- Use Git to manage your changes. Create a new branch for each feature or bug fix.
2723

28-
* Include tests for any new code you write.
24+
- Write clear commit messages that explain the changes you've made.
2925

30-
* Submit your changes as a pull request to the `master` branch, and wait for feedback!
26+
- Include tests for any new code you write.
3127

28+
- Submit your changes as a pull request to the `master` branch, and wait for feedback!
3229

3330
```{note}
3431
Feel free to create an issue for your proposed feature or change to the codebase so that feedback can be given.
3532
Submitting a "draft pull request" is also a great way to give visibility to your branch during development, allowing for faster feedback.
3633
```
3734

38-
3935
## Working with documentation
4036

4137
The documentation for this project is processed by Sphinx. To view documentation from your changes, you can run
4238
`sphinx-autobuild --ignore "*.zip" docs docs/_build` to create a server to automatically rebuild the documentation when you make changes.
4339

44-
4540
If you have any questions or issues while contributing to parcels, please feel free to [open a discussion](https://github.com/OceanParcels/parcels/discussions). Thank you for your contributions!

0 commit comments

Comments
 (0)