Commit graph

645 commits

Author SHA1 Message Date
Tony Narlock
28bd4567a7 switch to py.test + pytest-cov 2017-12-11 08:11:55 -06:00
Tony Narlock
6dd7556da7 add codecov to travis 2017-12-11 07:47:48 -06:00
Tony Narlock
4a7182112f update coveragerc to omit tests, dotfiles 2017-12-11 07:20:03 -06:00
Tony Narlock
6e74791f68
Merge pull request #300 from develtech/rm-update-travis-script
Remove update travis script
2017-12-11 07:15:44 -06:00
Tony Narlock
1f8e9f9fb3 rm update travis script, this can be done by hand 2017-12-11 07:15:06 -06:00
Tony Narlock
749aa09ff2
Merge pull request #298 from develtech/django-2.0
Django 2.0 support
2017-12-10 19:23:31 -06:00
Tony Narlock
35e17150b5 Overhaul travis/tox testbed #299
Passes in python version via travis python: param
2017-12-07 14:08:30 -06:00
Tony Narlock
c4d72123ef rm use_for_related_fields #290 2017-12-07 12:20:50 -06:00
Tony Narlock
a975f2f07b Add django 2.0 to travis and tox #297 2017-12-07 11:24:05 -06:00
Tony Narlock
a07140e771 Use _chain for django 2.0, #295 2017-12-07 11:13:39 -06:00
Jannis Leidel
343d459406 Updated some of the badges. 2017-04-18 10:51:18 +02:00
Carl Meyer
94c77d75ef Add jazzband badge/contributing guidelines. 2017-04-15 08:50:55 -07:00
Carl Meyer
198dcb612e Update github links for jazzband transfer. 2017-04-15 08:47:31 -07:00
Carl Meyer
100d2d7a24 Bump version to 3.0.1a1. 2017-04-13 16:51:52 -07:00
Carl Meyer
2e3b50dcb6 Bump version to 3.0.0. 2017-04-13 16:49:58 -07:00
Carl Meyer
f11646b10e Allow failure of py36 build for now, until Travis gets it 2017-04-13 16:47:48 -07:00
Carl Meyer
89c4a0fc44 Add testing on Python 3.6 and Django 1.11. 2017-04-13 16:39:21 -07:00
Carl Meyer
716e29d83b Merge pull request #270 from nakato/iter_class
Support django 1.11 iterator changes
2017-04-13 16:29:38 -07:00
Sachi King
8cb21aabbc Support django 1.11 iterator changes
Django starting with 1.9 switched to using a class to provide an
iterator for the querymanager.  Between 1.9 and 1.10 changes slowly
stopped referencing that function and instead started calling
_iterator_class directly.

As the functionality model-utils is patching has moved, this patch moves
the iterator logic to a class to match the changes that have been made
in Django in version 1.9.

As Django 1.8 is a LTS release that is still supported, iterator()
is retained in the InheritanceQuerySetMixin and can be removed when
support for Django 1.8 is removed.  This goes for the try-except in the
import statements as well.
2017-04-02 21:53:15 +10:00
Romain Garrigues
1e4bc27e3a Merge pull request #264 from browniebroke/dist/exclude-tests
Exclude tests from distribution. Fixes #258.
2017-02-17 11:10:04 +00:00
Bruno Alla
1473707fc7 Run coverage with '-a' option 2017-02-16 12:39:41 +00:00
Bruno Alla
d6edfdb4db Update CHANGES.rst 2017-02-15 23:13:55 +00:00
Bruno Alla
10ebc16271 Exclude tests from distribution
fixes #258
2017-02-15 23:00:10 +00:00
Romain Garrigues
4d5969a616 Merge pull request #259 from romgar/update_documentation
Update documentation. Closes #61
2017-01-26 14:34:46 +00:00
romgar
7552c4a7f2 Remove out-to-date example 2017-01-26 14:18:19 +00:00
Romain Garrigues
bb439db404 Merge pull request #261 from kavdev/patch-1
Add "license" arg to setup() call
2017-01-26 09:37:34 +00:00
Alexander Kavanaugh
9abcf0c943 Add "license" arg to setup() call
This helps for seeing at-a-glance licenses in services such as pyup.io
2017-01-25 19:36:59 -08:00
romgar
ced4afe8f9 Update documentation to remove references of PassThroughManager, removed in version 2.4 2017-01-22 12:00:50 +00:00
Romain Garrigues
a502e32e9d Merge pull request #260 from romgar/ticket_212_2
Remove compatibility code in runtests.py file, related to #212.
2017-01-22 11:57:35 +00:00
romgar
7d1f2b5be5 Remove compatibility code in runtests.py file 2017-01-21 14:02:31 +00:00
Romain Garrigues
ef42eb43e7 Merge pull request #257 from browniebroke/feature/github-templates
Pull request and issue template fixes #254
2017-01-18 18:16:45 +00:00
Bruno Alla
2ee8627c5a Pull request and issue template fixes #254 2017-01-17 22:34:04 +00:00
Romain Garrigues
7d5e31e62f Merge pull request #256 from romgar/drop_get_query_set_old_syntax_support
Drop old get_query_set syntax, replaced by get_queryset now. Related to #212.
2017-01-13 16:48:00 +00:00
Romain G
d07b992b94 Drop old get_query_set syntax, replaced by get_queryset now 2017-01-12 18:34:47 +00:00
Romain Garrigues
cac2708c17 Merge pull request #212 from rpkilby/drop-unsupported-django
Drop unsupported Django versions
2017-01-12 17:58:11 +00:00
Ryan P Kilby
e148c670d1 Fix django 2.0 warnings 2017-01-12 12:16:46 -05:00
Ryan P Kilby
cd9e296f81 Update docs 2017-01-12 12:16:46 -05:00
Ryan P Kilby
fda2d39ec4 Drop unsupported django versions 2017-01-12 12:16:40 -05:00
Carl Meyer
625e1041cc Bump version to 2.6.2.a1. 2017-01-11 16:07:17 -08:00
Carl Meyer
269f6f130f Bump version to 2.6.1. 2017-01-11 15:37:06 -08:00
Carl Meyer
6a01f3389a Add spaces in changelog for consistency with older sections. 2017-01-11 15:35:51 -08:00
Romain Garrigues
25b6e09296 Merge pull request #253 from romgar/ticket_251
Add fix + tests for abstract manager inheritance issue with StatusModel. Fixes #251.
2017-01-11 12:44:04 +00:00
Romain G
03fd2fb0a0 Add missing newline 2017-01-11 12:22:59 +00:00
Romain G
7ae505733e Update CHANGES 2017-01-11 12:21:42 +00:00
Romain G
3100d47931 Merge branch 'master' into ticket_251 2017-01-11 12:17:45 +00:00
Romain Garrigues
6c4f515540 Merge pull request #252 from browniebroke/doc/changelog
Update changelog about 2 recent pull requests
2017-01-10 14:18:48 +00:00
Romain G
63e5c59c66 Simplify test models + make it compatible for old Django versions 2017-01-09 19:16:09 +00:00
Romain G
679af01f26 Add fix + tests for abstract manager inheritance issue with StatusModel 2017-01-09 19:02:59 +00:00
Bruno Alla
0787a098fd Update changelog about 2 recent pull requests
https://github.com/carljm/django-model-utils/pull/239
https://github.com/carljm/django-model-utils/pull/240
2017-01-09 13:29:07 +00:00
Carl Meyer
f56e26b5a9 Merge pull request #250 from browniebroke/bugfix/extend-queryset
Fix issue when extend QuerySet and Manager - fixes #249
2017-01-08 10:06:27 -07:00