Skip to content

Fix Travis Implementation.#273

Merged
hburgund merged 1 commit intoroundware:developfrom
jslootbeek:features/travis-fix
Mar 22, 2016
Merged

Fix Travis Implementation.#273
hburgund merged 1 commit intoroundware:developfrom
jslootbeek:features/travis-fix

Conversation

@jslootbeek
Copy link
Contributor

@jslootbeek jslootbeek commented Mar 21, 2016

This PR fixes #269. Fixes Travis implementation, and addresses race-condition in tests.

@13rac1
Copy link
Member

13rac1 commented Mar 21, 2016

FWIW you can remove the remote-tracking merge with:

git rebase -i edf72ff112
# Save and exit editor, rebase automatically removes empty merges.
git push -f

@jslootbeek
Fixes #269. Fix Travis-CI implementation by working around a dependen…
342d3ae 
…cy mismatch to install fiona. This will likely be fixed when Travis moves Ubuntu 14.04 to Production. Additionally, this fixes a race-condition that was causing Duplicate Primary Keys for the Tag objects during tests.
@jslootbeek
Copy link
Contributor Author

jslootbeek commented Mar 22, 2016

Thanks! Still figuring out this git stuff past the 'basics'.

hburgund added a commit that referenced this pull request Mar 22, 2016
@hburgund
Merge pull request #273 from jslootbeek/features/travis-fix
02d6243 
Fix Travis Implementation.
@hburgund hburgund merged commit 02d6243 into roundware:develop Mar 22, 2016
@hburgund hburgund mentioned this pull request May 4, 2016
Merged
@jslootbeek jslootbeek deleted the features/travis-fix branch November 19, 2016 15:12
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.

Update Travis to handle postgresql database change

3 participants

@jslootbeek @13rac1 @hburgund