Commit graph

689 commits

Author SHA1 Message Date
Lucas Wiman
da65d0be32 Fix E30X too-few line spacing errors. 2018-07-02 12:20:38 -07:00
Lucas Wiman
600ddc8dc5 Fix F401: imported but unused. 2018-07-02 12:16:41 -07:00
Lucas Wiman
679aed41a2 Remove unused __unicode__ method (dead code). 2018-07-02 11:52:05 -07:00
Lucas Wiman
954624cb22 Fix F841: local variable is assigned but never used. 2018-07-02 11:50:56 -07:00
Lucas Wiman
f845dcb24c Fix E231: missing whitespace after ",". 2018-07-02 11:49:16 -07:00
Lucas Wiman
654e13235e Fix E303 too many blank lines. 2018-07-02 11:47:19 -07:00
Lucas Wiman
9a6634b87a Ignore assigning to lambda warning. 2018-07-02 11:45:51 -07:00
Lucas Wiman
54543f1e8d Add a flake8 environment to ensure pep8 compatibility. 2018-07-02 11:43:38 -07:00
Lucas Wiman
16dec4d12d
Merge pull request #317 from lucaswiman/django-1.11-compatibility
Fix handling of deferred fields on django 1.10+
2018-07-02 11:30:09 -07:00
Lucas Wiman
2e92877910 Merge branch 'master' into django-1.11-compatibility 2018-07-02 11:21:48 -07:00
Martey Dodoo
e750fc7408 Fix AUTHORS.rst formatting.
Add pipe character at the beginning of each line so that all authors are
not concatenated together when ReStructuredText is parsed. Add Martey to
AUTHORS as well.
2018-06-30 16:18:16 -07:00
Harry Moreno
1197839765 Update docs to support django 2.0 2018-06-30 16:11:43 -07:00
Lucas Wiman
45502c0ec2
Put changelog in the right place. 2018-06-30 15:52:00 -07:00
Lucas Wiman
7d6b45f0c1 Increase coverage: verify that accessing the descriptor from the class yields the descriptor object. 2018-06-28 17:04:57 -07:00
Lucas Wiman
ca2fbb4ccd Fix coverage for a codepath only executed in <1.10 environments. 2018-06-28 16:59:30 -07:00
Lucas Wiman
cde1d706af Cover a branch in has_changed. 2018-06-28 14:08:03 -07:00
Lucas Wiman
59347ef36f Correctly clean up recursion sentinel value. 2018-06-28 13:52:52 -07:00
Lucas Wiman
c16a275bd7 Use --cov-append option in travis build to include coverage data from all tox environments run on the travis environment.
Note that it is run as one per python version, but multiple versions of django are tested in each.
2018-06-28 13:46:39 -07:00
Lucas Wiman
4740ab43ec Update passed environment variables to match codecov documentation.
Hopefully this will combine the coverage reports.
2018-06-28 13:41:09 -07:00
Lucas Wiman
15f9393bb2 Handle API change in DeferredAttribute descriptor in django-trunk.
This should maintain compatibility with the next version of django.
2018-06-28 13:16:33 -07:00
Lucas Wiman
a84c3afddd Fix behavior of .previous() in Django 1.10+.
The complications are that when the attribute is set in Django 1.10,
it no longer counts as a deferred attribute, and it is not retrieved from the database.
Naively updating __set__ to retrieve the value if it is deferred leads to infinite
recursion because accessing the attribute involves loading data from the database
and trying to set the attribute based on that value. This commit introduces
a somewhat hacky flag that records whether we're already trying to set
the attribute further up in the call stack.
2018-06-28 13:15:56 -07:00
Lucas Wiman
5d410e9ccc Fix test failures from merge. 2018-06-28 11:29:44 -07:00
Lucas Wiman
98a1366608 Merge branch 'defer-has-changed' into django-1.11-compatibility 2018-06-21 12:52:33 -07:00
Lucas Wiman
90ed7fc905 Improve coverage. 2018-06-21 12:41:42 -07:00
Lucas Wiman
be1a7d9281 Update AUTHORS and CHANGES.
As far as I can tell, no changes to documentation is required.
2018-06-21 12:41:42 -07:00
Lucas Wiman
80b099f129 Do not override custom descriptors when present.
This commit adds a collection of wrapper classes for tracking fields
while still using custom descriptors that may be present. This fixes
a bug where deferring a model field with a custom descriptor meant
that the descriptor was overridden in all subsequent queries.
2018-06-21 12:41:42 -07:00
Lucas Wiman
be52bc9290 Add failing test for deferred attributes. 2018-06-21 12:41:42 -07:00
Lucas Wiman
0fc0b44c95 Remove version checks for django<1.8.
Support for older versions of django was dropped in 3.0.0.
2018-06-21 12:41:42 -07:00
João Amaro
6d2ba63387 update changelog and versions for 3.1.2 2018-05-09 14:45:37 -03:00
Hanley Hansen
18dfb6b2cf
Merge pull request #279 from hanleyhansen/inheritance-iterable
Update InheritanceIterable to inherit from ModelIterable instead of BaseIterable
2018-05-02 14:14:22 -04:00
Jack Cushman
d34043fd25 Avoid fetching deferred fields in has_changed 2018-02-10 10:53:36 -05:00
Jannis Leidel
1eff6d0d8f
Add project release info to Travis config. 2018-01-10 10:59:29 +01:00
Jannis Leidel
a4afe46051
Merge pull request #308 from jazzband/tox-travis
Simplified tox setup with tox-travis.
2018-01-10 10:58:21 +01:00
Jannis Leidel
ccaa08d12e
Simplified tox setup with tox-travis. 2018-01-10 10:48:14 +01:00
Tony Narlock
7afacccd79
Merge pull request #306 from develtech/update-versions
Simplify version mentioning in README, classifiers
2017-12-17 07:50:22 -06:00
Tony Narlock
baa8bae1c0 update changelog and versions for 3.1.1 2017-12-17 07:45:56 -06:00
Tony Narlock
419fe216b7 Simplify version mentioning in README, classifiers
Remove Python version mentionings, as they are beholden to Django's
constraints.

See also:

- https://github.com/jazzband/django-model-utils/issues/305
2017-12-17 07:38:16 -06:00
Tony Narlock
78e837e572
Merge pull request #302 from develtech/codecov-btn
use codecov button on readme
2017-12-11 18:06:01 -06:00
Tony Narlock
fc13a6bd40 use codecov button on readme 2017-12-11 18:05:28 -06:00
Tony Narlock
8a0d00b939 tag 3.1.0 2017-12-11 08:27:41 -06:00
Tony Narlock
044cac0d68 pep8 + add django classifiers to setup.py 2017-12-11 08:22:59 -06:00
Tony Narlock
32259fb90b
Merge pull request #301 from develtech/codecov
Add codecov to travis, switch to py.test

This removes runtest.py.
2017-12-11 08:21:33 -06:00
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