Skip to content

Commit ec6301c

Browse files
Merge branch 'main' into pset_execute_time_management
2 parents f4fa1e9 + 8cfc912 commit ec6301c

165 files changed

Lines changed: 15325 additions & 8441 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.binder/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: parcels_binder
22
channels:
33
- conda-forge
4-
- defaults
54
dependencies:
65
- parcels
6+
- trajan

.flake8

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

.git-blame-ignore-revs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,9 @@
33

44
# whitespace fixes
55
e99e0d170a7dc128031b82ea00cdf9e9a0164b03
6+
7+
# Run black on examples
8+
cbf96c4e1f58fa6348695d7553900ba3f7c3383b
9+
10+
# Run Ruff format on codebase
11+
19dd7eb1370063f252f94dd26bf313ff71484876

.git_archival.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
ref-names: $Format:%D$
1+
node: $Format:%H$
2+
node-date: $Format:%cI$
3+
describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$
File renamed without changes.

.github/CONTRIBUTING.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
See https://docs.oceanparcels.org/en/latest/contributing.html
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
body:
2+
- type: textarea
3+
id: improvements
4+
attributes:
5+
label: Question
6+
description: "Type in the form below your question to the Parcels community. Make sure to detail any relevant context including what you have tried, as well as any relevant code or error messages."
7+
value: |
8+
## Question
9+
10+
11+
## Supporting code/error messages
12+
13+
```python
14+
# Paste your code within this block
15+
```
16+
17+
18+
```text
19+
# Paste your error message within this block
20+
```
21+
validations:
22+
required: true
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
name: 🔼 Parcels feature requests, and other enhancements
3+
about: Suggest an improvement to the parcels codebase.
4+
title: ""
5+
labels: ""
6+
assignees: ""
7+
---

.github/ISSUE_TEMPLATE/02_bug.yaml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: "🐛 Bug Report"
2+
description: Describe a bug in the parcels codebase. For support related to your specific use case, please post in Q&A in our Discussions tab.
3+
labels: ["bug"]
4+
body:
5+
- type: "input"
6+
attributes:
7+
label: "Parcels version"
8+
description: "What version of parcels are you running? Do `print(parcels.__version__)` if you don't know."
9+
validations:
10+
required: true
11+
- type: "textarea"
12+
attributes:
13+
label: "Description"
14+
description: "Please describe the bug."
15+
validations:
16+
required: true
17+
- type: "textarea"
18+
attributes:
19+
label: "Code sample"
20+
description: "If relevant, please provide a code example where this bug is shown as well as any error message. A [minimal, reproducible example](https://stackoverflow.com/help/minimal-reproducible-example) is preffered as it makes it much easier for developers to identify the cause of the bug. This also allows them quickly determine whether the problem is with your code or with Parcels itself."
21+
value: |
22+
```python
23+
# Paste your code within this block
24+
```
25+
26+
27+
```text
28+
# Paste your error message within this block
29+
```
30+
validations:
31+
required: false

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
contact_links:
2-
- name: Parcels use question, help, or support
2+
- name: 🙏 Parcels use question, help, or support
3+
url: https://github.com/OceanParcels/parcels/discussions/new?category=q-a
4+
about: Have a question about Parcels? Or do you need troubleshooting for a specific usecase? Then start a Q&A Discussion thread instead, and we'll be happy to help.
5+
- name: 💬 Other Parcels discussion
36
url: https://github.com/OceanParcels/parcels/discussions
4-
about: >
5-
Have a question about Parcels? Or do you need troubleshooting for a specific usecase? Then start a Discussion thread instead, and we'll be happy to help.
7+
about: For general discussion about Parcels, or to share your work with the community, please use the Discussions tab.

0 commit comments

Comments
 (0)