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

Add Django 1.10.x test environment and fix broken tests #239

Merged
merged 4 commits into from
Jan 16, 2017

Conversation

djm
Copy link
Contributor

@djm djm commented Jan 16, 2017

Hi James,

Just a small one here to get the project's test suite up to current speed.

Tox now runs the test suite successfully under the latest Django 1.10.x and Python 3.6 environments.

As part of making the tests run under the new environement, the tests were updated to account for deprecated behaviour in Django. Only thing of note really is that render_to_response was removed in favour of render as render_to_response is 'likely pending deprecation' as of Django 1.10.

Thanks for all your work on this, we use it extensively at Yunojuno. If the 1.10 stuff could get a release on PyPI that'd be super; if there's anything blocking that just let us know.

Fixes #224.

cheers,
Darian

Tox now runs the test suite successfully under the latest Django 1.10.x

As part of making the tests run under the new environement, the tests were
updated to account for deprecated behaviour in Django.

Also added Python 3.6 to django-waffle's tox test matrix.

Closes jazzband#23.
@jsocol
Copy link
Collaborator

jsocol commented Jan 16, 2017

Hey @djm, thanks! Waffle doesn't use tox on travis, though, it uses the .travis.yml file to configure the jobs, so this didn't actually run the tests against 1.10. Everything ran OK against 1.8 and 1.9, though. Would you mind adding 1.10 to .travis.yml, too?

@jsocol jsocol mentioned this pull request Jan 16, 2017
@jsocol
Copy link
Collaborator

jsocol commented Jan 16, 2017

Alternatively, if you wanted to incorporate @adamchainz's patch from #227, that would also work

@djm
Copy link
Contributor Author

djm commented Jan 16, 2017

Ah! My bad assumption.

I'll do that ASAP, check it works - then squash.

Thanks @jsocol.

@jsocol
Copy link
Collaborator

jsocol commented Jan 16, 2017

Looks like we need to exclude py3.3 with >=1.9?

One downside of tox is no parallel tests / individual combination reporting from the job, ah well.

@jsocol
Copy link
Collaborator

jsocol commented Jan 16, 2017

Hmm, I guess this is still open for Py3.5 travis-ci/travis-ci#4794

@adamchainz
Copy link

One downside of tox is no parallel tests / individual combination reporting from the job, ah well.

Tests being parallel isn't always faster, for many repos I've moved to having the grid in only tox it has ended up nearly the same time or even faster overall. You can do the coverage combining somehow in the tox file.

@jsocol
Copy link
Collaborator

jsocol commented Jan 16, 2017

Tests being parallel isn't always faster

Faster isn't the only thing (actually I think this run was faster than most) but when you use the Travis matrix you get the slightly cleaner report of whether each combination passed or failed, e.g. the last master build. But like I said, "ah well," not worth maintaining two grids.

@jsocol jsocol mentioned this pull request Jan 16, 2017
@djm
Copy link
Contributor Author

djm commented Jan 16, 2017

Ok, so this works, and keeps the builds separate but not repeated. tox-travis seems pretty handy.

If you're happy with it @jsocol, I can squash. If not, let me know! Thanks again.

@jsocol
Copy link
Collaborator

jsocol commented Jan 16, 2017

This lgtm, thanks @djm!

@jsocol jsocol merged commit a2c4167 into jazzband:master Jan 16, 2017
@djm djm deleted the feature/test-with-django-1-10 branch January 16, 2017 19:12
@djm
Copy link
Contributor Author

djm commented Jan 16, 2017

Awesome, thanks @jsocol :)

@jsocol
Copy link
Collaborator

jsocol commented Jan 16, 2017

"Squash and merge" is a pretty nice feature. Thanks again @djm!

@jsocol jsocol mentioned this pull request Jan 16, 2017
chris-griffin pushed a commit to chris-griffin/django-waffle that referenced this pull request Jun 10, 2017
* Add Django 1.10.x test environment and fix broken tests

Tox now runs the test suite successfully under the latest Django 1.10.x

As part of making the tests run under the new environement, the tests were
updated to account for deprecated behaviour in Django.

Also added Python 3.6 to django-waffle's tox test matrix.

Closes jazzband#23.

* Update travis CI build to just use tox

* Explicitly install Python versions before run

* Exclude py3.3 from Django 1.9/1.10 tests
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