Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Formhub #1

Merged
merged 82 commits into from
Aug 20, 2014
Merged

Update Formhub #1

merged 82 commits into from
Aug 20, 2014

Conversation

GeoODK
Copy link
Collaborator

@GeoODK GeoODK commented Aug 20, 2014

No description provided.

planner and others added 30 commits August 8, 2014 15:04
Use Celery to save attachments, take 1
5fff270
Might need a TransactionTestCase again (see simple_threaded_attachmen…
63f7fdf 
…ts branch)
@vr2262
Tests involving celery may need the Celery test runner
8aac296
@vr2262
Revert "Tests involving celery may need the Celery test runner"
9980c10 
This reverts commit 93491cf.
@vr2262
Change only the otherwise-failing tests to use TransactionTestCase
766add0
@vr2262
Missed some spots
5f98389
@vr2262
Sanity check for the MRO
8d119a2
@vr2262
I guess having two distinct classes is unavoidable
010b908
@vr2262
Cleaned up redundant class definitions and fixed methods that refer t…
dccc7c7 
…o the class
@vr2262
I guess having two classes is really really unavoidable
d36d070
@vr2262
Good old sleep()
156228a
@vr2262
More sleep()
7255fe2
@vr2262
Why did this fail? Throw sleep() at it
64c3a13
@vr2262
Add debugging information
fd75329
@vr2262
Maybe the function can't be inside a function decorated with transact…
32b656c 
…ion.autocommit()
@vr2262
As per the celery docs, transaction.autocommit() is probably causing …
729318c 
…issues
@vr2262
Removed a decorator that was swallowing errors (temporarily)
951a83e
@vr2262
Commit transactions in a paranoid fashion
fea804e
@vr2262
The decorator was swallowing errors, so I'm removing it temporarily
55efacd
Revert "The decorator was swallowing errors, so I'm removing it tempo…
60fa4f4 
…rarily"

Apparently that brings things back to transaction.commit_on_success???

This reverts commit 473b284.
Revert "Commit transactions in a paranoid fashion"
c9cd750 
This reverts commit 872d77e.
Revert "Removed a decorator that was swallowing errors (temporarily)"
ccee2a8 
This reverts commit 162fdf4.
Revert "As per the celery docs, transaction.autocommit() is probably …
75fb9f0 
…causing issues"

This reverts commit d985e3f.
Maybe those sleep() calls weren't actually helping
77613cc
Only spawn celery for _save_attachments if media exists
dacb81c
@vr2262
Fix typo
ccbbd5b
@vr2262
Add debugging information to _save_attachments
baa28e1
@vr2262
This tearDown() might be the holy grail
414b711
Final branch cleanup
30ef895
@vr2262
MRO bites again
d43d52e
vr2262 and others added 28 commits August 13, 2014 18:07
@vr2262
Added README changes
a92eb9f
@vr2262
If this is the culprit...
3404969
@vr2262
Revert "If this is the culprit..."
4ab4162 
This reverts commit 3404969.
@vr2262
Maybe the random fix thing is the culprit
0b62c45
@vr2262
I think the random thing is broken
c34cf6f
@vr2262
Get rid of SERVER_EXTERNAL_URL
7ccd039
@vr2262
Get rid of SERVER_EXTERNAL_URL
a96cfca
@vr2262
Let's see what fails with this...
ec188a4
@vr2262
Merge pull request #1339 from SEL-Columbia/external_url
9e87a6c 
Let's see what fails with this...
@vr2262
SERVER_EXTERNAL_URL changes
62f53ff
@vr2262
This line probably isn't necessary
20325b8
@vr2262
IRC room update
0ef9941
@vr2262
Change for the sake of consistency
fa396b3
@vr2262
Change requirements.pip formatting
47d4aa5
@vr2262
requirements.pip doesn't like go
3e4565c
@vr2262
This might be what was breaking things
c109ca5
@vr2262
Add back requirements necessary for syncdb
e0c3cac
@vr2262
Add back requirements necessary for the test
a73a545
@vr2262
The requirements.pip changes are crazy
cd66fa4
@vr2262
Fingers crossed
8389979
@vr2262
import sys was hanging around
f48f368
@vr2262
Running out of ideas
45b01bc
@vr2262
Taking Abdi's suggestion: maybe https is necessary
3fcecc9
@vr2262
Undo file mode change
0a3aa0e
@vr2262
testserver.com really is necessary... for some reason
f20544d
@vr2262
Making sure this bit of code is actually necessary... if it is, then …
86f5c2a 
…revert this commit
@dpapathanasiou
Merge pull request #1340 from SEL-Columbia/retry_slim_dedicated_server
7cd5ce3 
Retry slim dedicated server
@Snkz
adding pandas explicitly to requirements
35d3f10 
pandas version 0.12.0 required for formhub install
GeoODK pushed a commit that referenced this pull request Aug 20, 2014
@jnordling
Merge pull request #1 from SEL-Columbia/master
869f9d4 
Update Formhub
@GeoODK GeoODK merged commit 869f9d4 into GeoODK:master Aug 20, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@GeoODK @vr2262 @dpapathanasiou @Snkz