Skip to content

Single main branch #35

@ptheywood

Description

@ptheywood

Currently there are 2 active branches for this repo: main and google-colab, where the google-colab version has minor changes to ensure it runs with verisons compatible with google colab.

When making new FLAMEGPU releases, this is a faff as 2 notebooks have to be modified (and diffing/merging notebooks is grim).

Instead, we could combine these notebooks, and conditionally detect the use of google colab, as @mondus did in FLAMEGPU2_python_sugarscape_tutorial:

import sys
IN_COLAB = 'google.colab' in sys.modules
if IN_COLAB:
    ... 

This would simplify reduce faff, but slightly increase the complexity of a single cell in the notebook.

  • Combine google-colab changes into main with guards where needed
  • Update flamegpu.com/try google colab link
  • Delete google-colab branch

Suggested by @mondus

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type
    No fields configured for issues without a type.

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions