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

PR for #57 and #58 #59

Merged
merged 23 commits into from
Feb 3, 2016
Merged

PR for #57 and #58 #59

merged 23 commits into from
Feb 3, 2016

Conversation

LegoStormtroopr
Copy link
Contributor

No description provided.

@jedie
Copy link
Owner

jedie commented Feb 1, 2016

Can you rebase on master? ;)

@jedie
Copy link
Owner

jedie commented Feb 1, 2016

There is something wrong with Python3, see tests: https://travis-ci.org/jedie/django-reversion-compare/builds/106334934

@LegoStormtroopr
Copy link
Contributor Author

Can do, not sure what happened there.

@LegoStormtroopr
Copy link
Contributor Author

There is something screwy going on with the reversion 1.9 build, I'm still working on this, but thoughts are welcome.

@LegoStormtroopr
Copy link
Contributor Author

I'd suggest we keep Django==1.8 and Reversion=1.10.1 in the matrix. Django 1.8 is the long term support branch, and is compatible with 1.10.1 (but not 1.10).

@LegoStormtroopr
Copy link
Contributor Author

Aha!! It seems that Python3 was running the tests in a different order, and one of the tests was unregistering and reregistering a model, but without the follows. In one order this was ok, in another it failed. Should be ok now!

@jedie
Copy link
Owner

jedie commented Feb 2, 2016

I'd suggest we keep Django==1.8 and Reversion=1.10.1 in the matrix. Django 1.8 is the long term support branch, and is compatible with 1.10.1 (but not 1.10).

No, i mean reversion 1.9 and 1.10 with django 1.8 and django 1.9 under python 2 and 3 ;)

- DJANGO='1.9' REVERSION='1.10' EXTRA=''
- DJANGO='1.8' REVERSION='1.9' EXTRA='diff-match-patch'
- DJANGO='1.8' REVERSION='1.10.1' EXTRA='diff-match-patch'
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why should we explicit test with 1.10.1 ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought I read that Django 1.8 isn't compatible with 1.10, but I appear to have been mistaken.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe, i don't know...

We test these combinations:
django 1.8.* with reversion 1.9.*
django 1.9.* with reversion 1.10.*

And all this with Python 2.7, 3.4 and 3.5
see here: https://travis-ci.org/jedie/django-reversion-compare/builds/106359851

Maybe it makes sense to add Django 1.8 with reversion 1.10.*
On the other side: This is more a job for reversion itself, isn't it? They run tests with older django versions too: https://travis-ci.org/etianen/django-reversion/builds/105372317

Think the current test matrix is fine, isn't it?

"bool1": obj_compare.value1,
"bool2": obj_compare.value2,
"bool1": str(obj_compare.value1),
"bool2": str(obj_compare.value2),
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is str() really needed? Why

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No its not, I've previously had troubles with None in templates, but this isn't an issue now.

@LegoStormtroopr
Copy link
Contributor Author

Code review noted, will fix changes in the morning.

@LegoStormtroopr
Copy link
Contributor Author

I've updated the boolean compare functions as per the code review :)

I've also tweaked the travis matrix from:

DJANGO='1.8' REVERSION='1.10.1'

to

DJANGO='1.8' REVERSION='1.10'`

Its probably overzealous, but given that the tests are rather quick*, and 1.8 will be supported until 2018, I think an explcit test of django 1.8 with the latest reversion is worth doing.


* As an interesting aside, the full test suite ran before I finished typing this up :)

jedie added a commit that referenced this pull request Feb 3, 2016
@jedie jedie merged commit b3ca001 into jedie:master Feb 3, 2016
@jedie
Copy link
Owner

jedie commented Feb 3, 2016

That's fine! I done the merge.

Thanks for your work.

@jedie
Copy link
Owner

jedie commented Feb 3, 2016

I will release v0.6.0 today. But currently PyPi is off: https://status.python.org/

@LegoStormtroopr
Copy link
Contributor Author

No worries, this is a really useful module. So I'm glad to give back.

@jedie
Copy link
Owner

jedie commented Feb 3, 2016

Now v0.6.0 is on PyPi ;)

@coveralls
Copy link

Coverage Status

Coverage increased (+0.09%) to 77.847% when pulling 28432b1 on LegoStormtroopr:master into 7a72998 on jedie:master.

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

Successfully merging this pull request may close these issues.

3 participants