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.

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

Return of the prodigal THUMBNAIL_FORCE_OVERWRITE #408

Merged
merged 4 commits into from
Oct 8, 2015
Merged

Return of the prodigal THUMBNAIL_FORCE_OVERWRITE #408

merged 4 commits into from
Oct 8, 2015

Conversation

haakenlid
Copy link
Contributor

I couldn't find original commit (commit
eb569ad) mentioned in issue #351.

The commit didn't seem to be part of any existing branch in the repo,
and it's gone from the master branch.

I couldn't find original commit (commit
eb569ad) mentioned in issue #351.

The commit didn't seem to be part of any existing branch in the repo,
and it's gone from the master branch.
mariocesar added a commit that referenced this pull request Oct 8, 2015
Return of the prodigal THUMBNAIL_FORCE_OVERWRITE
@mariocesar mariocesar merged commit 51f7a97 into jazzband:master Oct 8, 2015
@haakenlid
Copy link
Contributor Author

The Travis CI build process seems to be broken at the moment.
I suspect it's because the .coveragerc file is no longer valid in the new version of coverage. http://coverage.readthedocs.org/en/coverage-4.0/changes.html

I've made a change to .coveragerc that I hope will make the tests run correctly with the new version. According to the docs, exclude_lines configuration is part of the [report] block. (http://coverage.readthedocs.org/en/coverage-4.0/config.html#syntax)

From the Travis error log https://travis-ci.org/mariocesar/sorl-thumbnail/jobs/84287368#L255
coverage.misc.CoverageException: Unrecognized option '[run] exclude_lines=' in config file .coveragerc

@mariocesar
Copy link
Collaborator

@haakenlid thanks I didn't notice will do a double check and then merge it again

@mariocesar
Copy link
Collaborator

@haakenlid crap ... :( I made a huge mistake trying to revert a commit, never will do that again

@mariocesar
Copy link
Collaborator

@haakenlid Sorry for the confusions on merging, your changes are in master now

@mariocesar mariocesar removed their assignment Oct 8, 2015
@haakenlid
Copy link
Contributor Author

Cool. 👍

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

Successfully merging this pull request may close these issues.

2 participants