Difference between revisions of "Development Branches"

From VistrailsWiki
Jump to navigation Jump to search
(refs to be deleted)
Line 102: Line 102:
=== v2.0-prov ===
=== v2.0-prov ===
=== v2.0-with-layout ===
=== v2.0-with-layout ===
== To be deleted ==
* persistence-fix-directories: merged/rebased
* dat-fixes: early changes for DAT, superseded by branch dat
tags:
* v2.1beta: this is not the beta

Revision as of 20:40, 17 September 2013

Main branches

master

This is the development branch of VisTrails. It's where the features are merged for the next release and tested/bugfixed for a future public version.

v2.1

This is the upcoming version, currently in beta. No more features should be added here, and once we think no more bug fixing is required, it will become the new stable version. Bug fixes will still happen on this branch, and would lead to the release of minor versions (2.1.1, 2.1.2, ...).

v2.0

This is the current stable version. No more features are to be added here. We add there the occasional bugfix, but this should slow down once 2.1 is released.

The list of features that are not present in 2.0 is available on the page New features.

uvcdat-*

These branches are used by the UV-CDAT project. They were forked from VisTrails long ago (Feb. 2012) and there is not intention to merge back, although they live in the same repository.

Development branches

master itself is an integration branch and is not generally stable. However development of complex features happen in their own branches, based off master, listed below.

dat

This branch has changes needed by the DAT tool, and that generally makes VisTrails more customizable and useful when used as a library. These changes are intended to be merged back in the main line of development someday.

http_directory

Adds an HTTPDirectory. This has been merged in master and is pending for 2.1.

logger-rewrite

Right now the logger has special cases to detect modules that trigger a nested execution, such as Group, Map, and While. It then pushes these special module's execution to an interpreter-global stack, which is incompatible with multithreaded-interpreter.

This branches attempts to make this both more natural (and extensible), and compatible with multithreaded-interpreter.

matplotlib-figure-creation

Attempt at fixing issue 685, which makes matplotlib incompatible with the multithreaded-interpreter work.

multiline-unicode-strings

Went further than multiline-strings by trying to make VisTrails unicode-safe. This means eliminating bytestrings from the code where unicode strings were meant (PyQt4 already uses unicode). Work in progress.

See issue 673.

multithreaded-interpreter

This changes the interpreter part of VisTrails to use a task system instead of relying on each module running its upstream counterparts recursively. It allows the use of multithreading at the module level (i.e. running different modules in parallel) and provides this via different schemes. The branch has schemes for threading and multiprocessing (through concurrent.futures) as well as IPython (which replaces the ParallelFlow package).

This is a legacy branch that is still relevant and functional, but is superseeded by multithreaded-interpreter-target-selection which provides more options.

More information is available on its specific page: multithreaded-interpreter.

multithreaded-interpreter-target-selection

It's a variant of the previous branch that changes the way schemes work. There can be different instances of each scheme (named targets), configured by the user, and each module can be assigned to a specific target, allowing fine-grained control of where each module should execute.

It also revamps the XML log and adds an XML configuration file for remote execution.

multithreaded-interpreter-responsive

This brings in background-interpreter, except that it works. The interpreter runs in a different thread, although modules that don't use the @parallelizable decorator will be run synchronously on the UI thread (thus blocking the UI for a time).

See issue 701.

It is probably required for further work in stopping/resuming workflows, but is a bit complex.

new-matplotlib-pkg

New 'matplotlib' package, that replaces 'pylab'. Has been merged in v2.1 and released. The branch is still used by Sunitha Menon who is making more examples.

parameter-configuration-api

Improves the widgets API to allow module developers to choose custom widgets for the ports of their modules.

Currently, it is only possible to provide a widget for a type (all ports of that type will have that widget) or to do limited configuration with entry_type. This branch makes it more extensible.

pyside-compatibility

This branch aims at making VisTrails compatible with both PyQt4 and PySide. PySide currently crashes.

python3

Python 3 port of VisTrails. Work in progress.

See issue 674.

resume-suspended-pipelines

Changes the interpreter to not clean not-cacheable modules from the persisted pipeline if the execution was suspended. This means that the next execution will resume close to where the last one stopped.

Obviously doesn't work across sessions.

support-spawned-vistrails

Fixes for running sub-instances of VisTrails, e.g. via multiprocessing or remote execution schemes. Currently, their are problems with the configuration being wrong (listing unnecessary/unloadable packages) or changed (the sub-instance will disable the packages it couldn't load).

See issue 702

testsuite-tempdir

Fixes the test suite to use a different temporary directory (so it can clean leaked temporary files) and dotvistrails (in order not to alter the user's configuration).

See issue 732

use-uuid

Use UUIDs for identifiers instead of incrementing integers. This would make things like merging vistrails or dealing with distributed versions of the same vistrail much easier (e.g. crowdLabs, subworkflows).

See ticket 355

Unknown (fixme?)

easy-install

fernando

improve-vt-bundle

madagascar

sahm-mac

sql-alchemy

v2.0-prov

v2.0-with-layout

To be deleted

  • persistence-fix-directories: merged/rebased
  • dat-fixes: early changes for DAT, superseded by branch dat

tags:

  • v2.1beta: this is not the beta