Code

Supplemental data#272

Code

Merged

olgabot merged 16 commits intomasterYeoLab/flotilla:masterfrom supplemental_dataYeoLab/flotilla:supplemental_dataCopy head branch name to clipboardMar 17, 2015

+668-53

Commits

Commits on Mar 12, 2015

• initial commit of supplemental data

  olgabot

  committed
  0bafb39

  Copy full SHA for 0bafb39

• initial tests of supplemental seem to work

  olgabot

  committed
  4b86fc1

  Copy full SHA for 4b86fc1

Commits on Mar 14, 2015

• fix supplemental/spikein merge conflict

  olgabot

  committed
  ce91f11

  Copy full SHA for ce91f11

Commits on Mar 16, 2015

• add release notes

  olgabot

  committed
  f3e1436

  Copy full SHA for f3e1436

• pep8 fixes

  olgabot

  committed
  3ca34ee

  Copy full SHA for 3ca34ee

• Add newline to sys.stdout message

  olgabot

  committed
  24c1fff

  Copy full SHA for 24c1fff

• Add supplemental data to reading/loading of the datapackage

  olgabot

  committed
  d28eaaf

  Copy full SHA for d28eaaf

• Add test for embarking on a datapackage with supplemental data

  olgabot

  committed
  9040761

  Copy full SHA for 9040761

• move _is_absolute_path to not a method of Study because it's needed during _filename_from_resource but can't use non-staticmethod methods on an uninstantiated class

  olgabot

  committed
  6e12d23

  Copy full SHA for 6e12d23

• initial addition of ipynb for supplementaldata

  olgabot

  committed
  4e00dfc

  Copy full SHA for 4e00dfc

• actually iterate over the items of name_to_df

  olgabot

  committed
  7bc0818

  Copy full SHA for 7bc0818

• fix resource --> supplemental in reading all supplemental data

  olgabot

  committed
  054ba2e

  Copy full SHA for 054ba2e

• Get supplemental resource name, not name of supplemental

  olgabot

  committed
  986571a

  Copy full SHA for 986571a

• fix pep8

  olgabot

  committed
  b2aeaea

  Copy full SHA for b2aeaea

• Add option and test for user-specified flotilla directory

  olgabot

  committed
  bb92407

  Copy full SHA for bb92407

• Add finished supplementaldata ipynb

  olgabot

  committed
  8c7705e

  Copy full SHA for 8c7705e