Merge branch 'main' into patch/ux-uv-uvw

Author: fluidnumericsJoe

.github/ISSUE_TEMPLATE/01_feature.yml

@@ -22,7 +22,7 @@ body:
         - "I'm trying to simulate particle behavior with [specific physics], but Parcels doesn't support..."
         - "When working with [specific data format/kernel], I find it difficult to..."
 
-        If you would like to see Parcels work with a specific dataset, please also [follow our instructions on how to share dataset metadata](https://docs.parcels-code.org/en/v4-dev/development/posting-issues.html).
+        If you would like to see Parcels work with a specific dataset, please also [follow our instructions on how to share dataset metadata](https://docs.parcels-code.org/en/latest/development/posting-issues.html).
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/02_bug.yaml

@@ -17,7 +17,7 @@ body:
   - type: "textarea"
     attributes:
       label: "Code sample"
-      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. If you want support on a specific dataset, please [follow our instructions on how to share dataset metadata](https://docs.parcels-code.org/en/v4-dev/development/posting-issues.html)"
+      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. If you want support on a specific dataset, please [follow our instructions on how to share dataset metadata](https://docs.parcels-code.org/en/latest/development/posting-issues.html)"
       value: |
         ```python
         # Paste your code within this block

.github/workflows/ci.yml

@@ -3,7 +3,6 @@ on:
   push:
     branches:
       - "main"
-      - "v4-dev"
       - "test-me/*"
   pull_request:
 
@@ -79,7 +78,7 @@ jobs:
         with:
           pixi-version: ${{ needs.cache-pixi-lock.outputs.pixi-version }}
           cache: true
-          cache-write: ${{ github.event_name == 'push' && github.ref_name == 'v4-dev' }} # TODO: Update v4-dev to main when v4 is released
+          cache-write: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
       # https://github.com/actions/cache/blob/main/tips-and-workarounds.md#update-a-cache
       - name: Restore cached hypothesis directory
         id: restore-hypothesis-cache
@@ -139,7 +138,7 @@ jobs:
         with:
           pixi-version: ${{ needs.cache-pixi-lock.outputs.pixi-version }}
           cache: true
-          cache-write: ${{ github.event_name == 'push' && github.ref_name == 'v4-dev' }} # TODO: Update v4-dev to main when v4 is released
+          cache-write: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
       - name: Integration test
         run: |
           pixi run test-notebooks -v -s --html="${{ env.COVERAGE_REPORT }}" --self-contained-html --cov=parcels --cov-report=xml
@@ -184,7 +183,7 @@ jobs:
         with:
           pixi-version: ${{ needs.cache-pixi-lock.outputs.pixi-version }}
           cache: true
-          cache-write: ${{ github.event_name == 'push' && github.ref_name == 'v4-dev' }} # TODO: Update v4-dev to main when v4 is released
+          cache-write: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
       - name: Typechecking
         run: |
           pixi run typing --non-interactive --html-report mypy-report
@@ -212,14 +211,14 @@ jobs:
         with:
           pixi-version: ${{ needs.cache-pixi-lock.outputs.pixi-version }}
           cache: true
-          cache-write: ${{ github.event_name == 'push' && github.ref_name == 'v4-dev' }} # TODO: Update v4-dev to main when v4 is released
+          cache-write: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
       - run: pixi run get-parcels-alpha-version >> $GITHUB_ENV
       - run: echo "PARCELS_ALPHA_VERSION is $PARCELS_ALPHA_VERSION"
       - name: Build conda package
         uses: prefix-dev/rattler-build-action@v0.2.34
         with:
           recipe-path: .github/ci/recipe.yaml
-      - if: github.ref == 'refs/heads/v4-dev'
+      - if: github.ref == 'refs/heads/main'
         run: |
           for pkg in $(find output -type f \( -name "*.conda" -o -name "*.tar.bz2" \) ); do
             echo "Uploading ${pkg}"

README.md

@@ -15,11 +15,11 @@
 [![LinkedIn](https://custom-icon-badges.demolab.com/badge/LinkedIn-0A66C2?logo=linkedin-white&logoColor=fff)](https://www.linkedin.com/company/parcelscode/)
 
 > [!WARNING]
-> This branch is `v4-dev` - version 4 of Parcels which is in active development. See `main` (or the tags) to browse stable versions of Parcels.
+> This branch contains version 4 of Parcels which is in active development. See `v3-support` to see v3 or the tags to browse stable versions of Parcels.
 
 **Parcels** provides a set of Python classes and methods to create customisable particle tracking simulations using gridded output from (ocean) circulation models. Parcels can be used to track passive and active particulates such as water, plankton, [plastic](http://www.topios.org/) and [fish](https://github.com/Jacketless/IKAMOANA).
 
-![Arctic-SO-medusaParticles](https://github.com/Parcels-code/oceanparcels_website/blob/main/images/homepage.gif)
+![Arctic-SO-medusaParticles](https://github.com/Parcels-code/Parcels/blob/main/docs/_static/homepage.gif?raw=true)
 
 _Animation of virtual particles carried by ocean surface flow in the global oceans. The particles are advected with [Parcels](http://parcels-code.org/) in data from the [NEMO Ocean Model](https://www.nemo-ocean.eu/)._
 

docs/v4/TODO.md

@@ -1,6 +1,6 @@
 # TODO
 
-List of tasks that are important to do before the release of version 4 (but can't be done now via code changes in `v4-dev`).
+List of tasks that are important to do before the release of version 4.
 
 - [ ] Make migration guide for v3 to v4
 - [ ] Just prior to release: Update conda feedstock recipe dependencies (Python 3.11+, remove cgen and compiler dependencies, add pooch as dependency and remove platformdirs). Make sure that recipe is up-to-date.