Code

Update Formhub#1

Code

Merged

GeoODK merged 82 commits intoGeoODK:masterGeoODK/formhub:masterfrom SEL-Columbia:masterSEL-Columbia/formhub:masterCopy head branch name to clipboardAug 20, 2014

+199,073-525

Commits

Commits on Aug 8, 2014

• Use Celery to save attachments, take 1

  

  planner

  committed
  5fff270

  Copy full SHA for 5fff270

• Might need a TransactionTestCase again (see simple_threaded_attachments branch)

  

  planner

  committed
  63f7fdf

  Copy full SHA for 63f7fdf

• Tests involving celery may need the Celery test runner

  

  vr2262

  authored and

  planner

  committed
  8aac296

  Copy full SHA for 8aac296

• Revert "Tests involving celery may need the Celery test runner"

  Show description for 9980c10
  

  vr2262

  authored and

  planner

  committed
  9980c10

  Copy full SHA for 9980c10

• Change only the otherwise-failing tests to use TransactionTestCase

  

  vr2262

  authored and

  planner

  committed
  766add0

  Copy full SHA for 766add0

• Missed some spots

  

  vr2262

  authored and

  planner

  committed
  5f98389

  Copy full SHA for 5f98389

• Sanity check for the MRO

  

  vr2262

  authored and

  planner

  committed
  8d119a2

  Copy full SHA for 8d119a2

• I guess having two distinct classes is unavoidable

  

  vr2262

  authored and

  planner

  committed
  010b908

  Copy full SHA for 010b908

• Cleaned up redundant class definitions and fixed methods that refer to the class

  

  vr2262

  authored and

  planner

  committed
  dccc7c7

  Copy full SHA for dccc7c7

• I guess having two classes is really really unavoidable

  

  vr2262

  authored and

  planner

  committed
  d36d070

  Copy full SHA for d36d070

• Good old sleep()

  

  vr2262

  authored and

  planner

  committed
  156228a

  Copy full SHA for 156228a

• More sleep()

  

  vr2262

  authored and

  planner

  committed
  7255fe2

  Copy full SHA for 7255fe2

• Why did this fail? Throw sleep() at it

  

  vr2262

  authored and

  planner

  committed
  64c3a13

  Copy full SHA for 64c3a13

• Add debugging information

  

  vr2262

  authored and

  planner

  committed
  fd75329

  Copy full SHA for fd75329

• Maybe the function can't be inside a function decorated with transaction.autocommit()

  

  vr2262

  authored and

  planner

  committed
  32b656c

  Copy full SHA for 32b656c

• As per the celery docs, transaction.autocommit() is probably causing issues

  

  vr2262

  authored and

  planner

  committed
  729318c

  Copy full SHA for 729318c

• Removed a decorator that was swallowing errors (temporarily)

  

  vr2262

  authored and

  planner

  committed
  951a83e

  Copy full SHA for 951a83e

• Commit transactions in a paranoid fashion

  

  vr2262

  authored and

  planner

  committed
  fea804e

  Copy full SHA for fea804e

• The decorator was swallowing errors, so I'm removing it temporarily

  

  vr2262

  authored and

  planner

  committed
  55efacd

  Copy full SHA for 55efacd

• Revert "The decorator was swallowing errors, so I'm removing it temporarily"

  Show description for 60fa4f4
  

  planner

  committed
  60fa4f4

  Copy full SHA for 60fa4f4

• Revert "Commit transactions in a paranoid fashion"

  Show description for c9cd750
  

  planner

  committed
  c9cd750

  Copy full SHA for c9cd750

• Revert "Removed a decorator that was swallowing errors (temporarily)"

  Show description for ccee2a8
  

  planner

  committed
  ccee2a8

  Copy full SHA for ccee2a8

• Revert "As per the celery docs, transaction.autocommit() is probably causing issues"

  Show description for 75fb9f0
  

  planner

  committed
  75fb9f0

  Copy full SHA for 75fb9f0

• Maybe those sleep() calls weren't actually helping

  

  planner

  committed
  77613cc

  Copy full SHA for 77613cc

• Only spawn celery for _save_attachments if media exists

  

  Denis Papathanasiou

  authored and

  planner

  committed
  dacb81c

  Copy full SHA for dacb81c

• Fix typo

  vr2262

  committed
  ccbbd5b

  Copy full SHA for ccbbd5b

• Add debugging information to _save_attachments

  vr2262

  committed
  baa28e1

  Copy full SHA for baa28e1

• This tearDown() might be the holy grail

  vr2262

  committed
  414b711

  Copy full SHA for 414b711

• Final branch cleanup

  

  planner

  committed
  30ef895

  Copy full SHA for 30ef895

• MRO bites again

  vr2262

  committed
  d43d52e

  Copy full SHA for d43d52e

Commits on Aug 11, 2014

• Merge pull request #1338 from SEL-Columbia/celery_threaded_attachments

  Show description for 46c098e
  dpapathanasiou

  committed
  46c098e

  Copy full SHA for 46c098e

• Cleaned up requirements.pip according

  Show description for 27bc97e
  vr2262

  committed
  27bc97e

  Copy full SHA for 27bc97e

• Reinserted modilabs-python-utils requirement

  vr2262

  committed
  f14e1ef

  Copy full SHA for f14e1ef

Commits on Aug 12, 2014

• Bring requirements-dev.pip up to date.

  vr2262

  committed
  0e28609

  Copy full SHA for 0e28609

• Add changes from 2539222

  vr2262

  committed
  354117d

  Copy full SHA for 354117d

• typo

  vr2262

  committed
  d010bca

  Copy full SHA for d010bca

• Problematic dependency?

  vr2262

  committed
  f2ff2fb

  Copy full SHA for f2ff2fb

• Put django_nose back

  vr2262

  committed
  c31f898

  Copy full SHA for c31f898

Commits on Aug 13, 2014

• Revert to c31f898

  vr2262

  committed
  395a200

  Copy full SHA for 395a200

• Revert "Revert to c31f898"

  Show description for e03dec8
  vr2262

  committed
  e03dec8

  Copy full SHA for e03dec8

• Brought in line with Apr 25

  

  travis

  committed
  853e90c

  Copy full SHA for 853e90c

• Bring into line with Apr 28

  vr2262

  committed
  8a019ff

  Copy full SHA for 8a019ff

• Bring into line with Apr 29

  vr2262

  committed
  9d25788

  Copy full SHA for 9d25788

• This should get travis to run the test

  vr2262

  committed
  880b553

  Copy full SHA for 880b553

• Bring in line with Jun 10

  vr2262

  committed
  b9312c9

  Copy full SHA for b9312c9

• You can do it, Travis

  vr2262

  committed
  aa88339

  Copy full SHA for aa88339

• Tell Travis to use sqlite

  vr2262

  committed
  eb299a3

  Copy full SHA for eb299a3

• Bring in line with Jul 14

  vr2262

  committed
  87d1856

  Copy full SHA for 87d1856

• The tests should pass with this...

  vr2262

  committed
  a0614ad

  Copy full SHA for a0614ad

• Final updates, typo fix

  vr2262

  committed
  209533f

  Copy full SHA for 209533f

• Fix celeryd

  vr2262

  committed
  19e7620

  Copy full SHA for 19e7620

• Fix celerybeat

  vr2262

  committed
  1a0f7c9

  Copy full SHA for 1a0f7c9

• Fixed fabfile.py

  vr2262

  committed
  47f8246

  Copy full SHA for 47f8246

• final? fixes

  vr2262

  committed
  7ecbc56

  Copy full SHA for 7ecbc56

• Added README changes

  vr2262

  committed
  a92eb9f

  Copy full SHA for a92eb9f

• If this is the culprit...

  vr2262

  committed
  3404969

  Copy full SHA for 3404969

• Revert "If this is the culprit..."

  Show description for 4ab4162
  vr2262

  committed
  4ab4162

  Copy full SHA for 4ab4162

• Maybe the random fix thing is the culprit

  vr2262

  committed
  0b62c45

  Copy full SHA for 0b62c45

• I think the random thing is broken

  vr2262

  committed
  c34cf6f

  Copy full SHA for c34cf6f

• Get rid of SERVER_EXTERNAL_URL

  vr2262

  committed
  7ccd039

  Copy full SHA for 7ccd039

• Get rid of SERVER_EXTERNAL_URL

  vr2262

  committed
  a96cfca

  Copy full SHA for a96cfca

Commits on Aug 14, 2014

• Let's see what fails with this...

  vr2262

  committed
  ec188a4

  Copy full SHA for ec188a4

• Merge pull request #1339 from SEL-Columbia/external_url

  Show description for 9e87a6c
  vr2262

  committed
  9e87a6c

  Copy full SHA for 9e87a6c

Commits on Aug 15, 2014

• SERVER_EXTERNAL_URL changes

  vr2262

  committed
  62f53ff

  Copy full SHA for 62f53ff

• This line probably isn't necessary

  vr2262

  committed
  20325b8

  Copy full SHA for 20325b8

• IRC room update

  vr2262

  committed
  0ef9941

  Copy full SHA for 0ef9941

• Change for the sake of consistency

  vr2262

  committed
  fa396b3

  Copy full SHA for fa396b3

• Change requirements.pip formatting

  vr2262

  committed
  47d4aa5

  Copy full SHA for 47d4aa5

• requirements.pip doesn't like go

  vr2262

  committed
  3e4565c

  Copy full SHA for 3e4565c

• This might be what was breaking things

  vr2262

  committed
  c109ca5

  Copy full SHA for c109ca5

• Add back requirements necessary for syncdb

  vr2262

  committed
  e0c3cac

  Copy full SHA for e0c3cac

• Add back requirements necessary for the test

  vr2262

  committed
  a73a545

  Copy full SHA for a73a545

• The requirements.pip changes are crazy

  vr2262

  committed
  cd66fa4

  Copy full SHA for cd66fa4

• Fingers crossed

  vr2262

  committed
  8389979

  Copy full SHA for 8389979

• import sys was hanging around

  vr2262

  committed
  f48f368

  Copy full SHA for f48f368

• Running out of ideas

  vr2262

  committed
  45b01bc

  Copy full SHA for 45b01bc

• Taking Abdi's suggestion: maybe https is necessary

  vr2262

  committed
  3fcecc9

  Copy full SHA for 3fcecc9

• Undo file mode change

  vr2262

  committed
  0a3aa0e

  Copy full SHA for 0a3aa0e

• testserver.com really is necessary... for some reason

  vr2262

  committed
  f20544d

  Copy full SHA for f20544d

• Making sure this bit of code is actually necessary... if it is, then revert this commit

  vr2262

  committed
  86f5c2a

  Copy full SHA for 86f5c2a

• Merge pull request #1340 from SEL-Columbia/retry_slim_dedicated_server

  Show description for 7cd5ce3
  dpapathanasiou

  committed
  7cd5ce3

  Copy full SHA for 7cd5ce3

Commits on Aug 19, 2014

• adding pandas explicitly to requirements

  Show description for 35d3f10
  Snkz

  committed
  35d3f10

  Copy full SHA for 35d3f10