From f3dd4b0a2b5d9fe81d62c3a51f884f5b25e20289 Mon Sep 17 00:00:00 2001 From: Vecko <36369090+VeckoTheGecko@users.noreply.github.com> Date: Mon, 16 Feb 2026 12:10:53 +0100 Subject: [PATCH] MAINT: Rename v4-dev to main --- .github/ISSUE_TEMPLATE/01_feature.yml | 2 +- .github/ISSUE_TEMPLATE/02_bug.yaml | 2 +- .github/workflows/ci.yml | 11 +++++------ README.md | 2 +- docs/v4/TODO.md | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/01_feature.yml b/.github/ISSUE_TEMPLATE/01_feature.yml index 634e1359b0..ebcf3178a8 100644 --- a/.github/ISSUE_TEMPLATE/01_feature.yml +++ b/.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 diff --git a/.github/ISSUE_TEMPLATE/02_bug.yaml b/.github/ISSUE_TEMPLATE/02_bug.yaml index 4fc9f4d93c..ecba39d23b 100644 --- a/.github/ISSUE_TEMPLATE/02_bug.yaml +++ b/.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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 459f3faa84..a80a9ab642 100644 --- a/.github/workflows/ci.yml +++ b/.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}" diff --git a/README.md b/README.md index 7ce11bf25c..146a7b0088 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ [![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). diff --git a/docs/v4/TODO.md b/docs/v4/TODO.md index 2936c15cd8..c772d1d4d5 100644 --- a/docs/v4/TODO.md +++ b/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.