Skip to content
This repository has been archived by the owner on May 20, 2019. It is now read-only.

Increment MySQL python library to fix Travis build #171

Merged
merged 1 commit into from
Feb 20, 2014

Conversation

wedaly
Copy link
Contributor

@wedaly wedaly commented Feb 20, 2014

Recent builds in Travis have been failing when trying to install MySQL-python. I suspect that this is a combination of:

  1. If setuptools is importable, don't force use of 'distribute'. farcepest/MySQLdb1#18
  2. Travis not pinning the version of setuptools installed.

This fix is not ideal, since it changes the requirements. One option would be to merge this into master, but not release it back into production.

@adampalay @feanil What do you think?

@adampalay
Copy link
Contributor

👍

@feanil
Copy link
Contributor

feanil commented Feb 20, 2014

looks good, yea I think this is minor enough that hopefully it won't cause too much trouble, looking at the changes between those version, the biggest seem to be around some auto-commit logic and the way it parses timestamps. The autocommit logic stays the same by default but is now configurable.

wedaly pushed a commit that referenced this pull request Feb 20, 2014
Increment MySQL python library to fix Travis build
@wedaly wedaly merged commit 3ca7e27 into master Feb 20, 2014
@wedaly wedaly deleted the will/fix-travis-build branch February 20, 2014 19:32
@wedaly
Copy link
Contributor Author

wedaly commented Feb 20, 2014

@waheedahmed You should rebase your branch onto origin/master to get this fix.

@waheedahmed
Copy link
Contributor

ok got it, thanks

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants