Diederik van der Boor
bcb8b0d3a4
Allow .order_by() to pass expressions unchanged
...
Fixes : #257
2017-05-22 12:53:20 +02:00
Diederik van der Boor
d4fde82600
Merge pull request #285 from meshy/test-matrix
...
Don't test Django's master on python 2
2017-05-08 10:21:44 +02:00
Diederik van der Boor
cd7da6063a
Merge pull request #284 from meshy/typo
...
Fix minor typo
2017-05-08 10:21:31 +02:00
Charlie Denton
007ba7a443
Don't test Django's master on python 2
...
Django 2.0 will be dropping support for python 2, so there's no point in
running the tests.
2017-05-08 00:11:17 +01:00
Charlie Denton
6f733d7471
Fix minor typo
2017-05-07 22:19:50 +01:00
Diederik van der Boor
44d79b5a19
Fixed Python 2.6 support in test code
2017-05-01 12:45:43 +02:00
Diederik van der Boor
56444b0f65
Fix building documentation
2017-05-01 12:38:56 +02:00
Diederik van der Boor
21d41100df
Bump to v1.2 for Django 1.11 support
2017-05-01 12:35:47 +02:00
Diederik van der Boor
9c618d8b21
Improve tests to use a unified qrepr() output
2017-05-01 12:34:49 +02:00
Diederik van der Boor
61b398115b
Fixed queryset processing for real (another merge fix for pr #279 )
2017-04-26 16:44:54 +02:00
Diederik van der Boor
09d785f5bb
Fix infinite recursion on github editing of pr #279
...
Fixes: 89632483a7
2017-04-26 16:38:26 +02:00
Diederik van der Boor
b2b1e137b2
Merge pull request #279 from un-def/dj111-fix
...
Add Django 1.11 support
2017-04-26 16:33:31 +02:00
Diederik van der Boor
89632483a7
Merge branch 'master' into dj111-fix
2017-04-26 15:53:59 +02:00
Diederik van der Boor
80b80beedc
Merge pull request #277 from meshy/travis-tox
...
Use tox for travis builds
2017-04-26 15:42:27 +02:00
Diederik van der Boor
6ec29b9e5e
Merge branch 'master' into travis-tox
2017-04-26 15:42:03 +02:00
Diederik van der Boor
4134c152a5
Merge pull request #276 from meshy/django-1.11-iterator
...
WIP: Get tests running on django 1.11
2017-04-26 15:39:58 +02:00
Diederik van der Boor
5afbfbe31b
Merge pull request #275 from sobolevn/patch-1
...
Updates README.rst with svg badge
2017-04-26 15:30:59 +02:00
un.def
78d3cd4945
Fix regression with Django < 1.9
2017-04-19 14:43:51 +03:00
un.def
8d53914344
Disallow Travis failures for Django 1.11
2017-04-19 13:03:43 +03:00
un.def
dbad7bd40d
Migrate from unused in Django 1.11 qs.iterator() to custom qs._iterable_class
2017-04-19 12:56:04 +03:00
Charlie Denton
fcbbbe52b3
Explicitly build coverage XML on travis, not tox
2017-04-15 00:11:33 +01:00
Charlie Denton
1481891733
Use TOXENV env var in travis config
...
I had previously used TOX_ENV, but not realised that TOXENV has a
special meaning for tox. We can now expect TOX to run the appropriate
build on travis without having it explicitly passed into the tox
command.
2017-04-15 00:07:57 +01:00
Charlie Denton
a57b067b42
Compile coverage for coveralls command on travis
2017-04-14 01:26:24 +01:00
Charlie Denton
d5886387d4
Allow travis builds to report failure early
2017-04-14 01:11:30 +01:00
Charlie Denton
c6e58db73e
Use tox for travis builds
...
This paves the way for more complex tox configs that don't need
duplicated config.
2017-04-14 01:09:32 +01:00
Charlie Denton
24d7509879
Run django master in tox tests
2017-04-14 00:53:17 +01:00
Charlie Denton
7dfe58bb10
Remove duplicate line in tox config
2017-04-14 00:49:35 +01:00
Charlie Denton
64325d0f99
Do not allow failures on django 1.11
2017-04-13 00:18:31 +01:00
Charlie Denton
f010c6ddf7
Get tests running on django 1.11
...
I'm a little concerned that this loses some of the efficiencies (in
particular, chunking) from previous versions. That's something that can
probably be improved.
2017-04-12 23:52:06 +01:00
Sobolev Nikita
72cc3d769d
Updates README.rst with svg badge
2017-04-07 13:18:14 +03:00
Diederik van der Boor
a568c04e40
Merge pull request #262 from pawelad/patch-1
...
Added 'z-index' attribute to '.polymorphic-type-menu' CSS class
2017-04-06 14:15:45 +02:00
Diederik van der Boor
7b9c02b53a
Merge pull request #269 from fladi/documentation-contenttypes
...
Install django.contrib.contenttypes for docstrings.
2017-04-06 14:14:57 +02:00
Diederik van der Boor
a8bfb5007e
Fix TypeError on Python 3 when querystring is preserved in the admin.
...
Fixes : #263
2017-04-06 14:13:56 +02:00
Diederik van der Boor
490f968353
Merge pull request #268 from fladi/python3-docstrings
...
Replace force_unicode with force_text for Python3 compatibility.
2017-04-06 14:04:08 +02:00
Diederik van der Boor
a3c9bcb14a
Merge remote branch 'meshy/new-test-versions'
2017-04-06 13:57:07 +02:00
Diederik van der Boor
fa74ce28e8
Start running tests on Django 1.11 (in allow_failures)
2017-04-06 12:53:18 +02:00
Diederik van der Boor
d8cb700e58
Make sure tests can run in Django 1.11
2017-04-06 12:51:16 +02:00
Diederik van der Boor
cd38e785b2
Add an explicit exclude for polymorphic_ctype in the PolymorphicInlineModelAdmin
2017-04-06 12:47:28 +02:00
Charlie Denton
aefb7dabc2
Django 1.11 uses real class names in __repr__()
...
See https://code.djangoproject.com/ticket/27546 and
https://github.com/django/django/commit/48826aa
2017-03-03 22:56:09 +00:00
Charlie Denton
8e52bdf6d1
Explicitly name ids of clashing base models
...
This avoids the following error in django 1.11 tests:
polymorphic.MRODerived: (models.E005) The field 'id' from parent model 'polymorphic.mrobase3' clashes with the field 'id' from parent model 'polymorphic.mrobase1'.
Related to https://code.djangoproject.com/ticket/22442
2017-03-03 22:16:54 +00:00
Charlie Denton
a178ed751d
Test against Python 3.6 and Django 1.11b1
2017-03-03 22:16:54 +00:00
Michael Fladischer
0d6e448a99
Install django.contrib.contenttypes for docstrings.
...
This is merely cosmetic to avoid Django warning because of
`django.contrib.contenttypes` being referenced but not an installed app.
2017-03-01 15:21:23 +01:00
Michael Fladischer
b0b4b826f5
Replace force_unicode with force_text for Python3 compatibility.
...
`force_unicode` has been [deprecated](https://docs.djangoproject.com/en/1.10/ref/utils/#django.utils.encoding.force_unicode ) and replaced with `force_text`[0].
Furthermore, `force_unicode` is not available in Python3, causing the
documentation to be unbuildable with Python3 sphinx.
2017-03-01 15:16:07 +01:00
Paweł Adamczak
54b681c13b
Added 'z-index' attribute to '.polymorphic-type-menu' CSS class
2017-02-06 15:06:58 +00:00
Diederik van der Boor
c2aff50ecc
Fix changelog date for 1.1
2017-02-06 13:37:05 +01:00
Diederik van der Boor
132e2cfdf9
Bump to v1.1
2017-02-03 22:08:48 +01:00
Diederik van der Boor
7dc2f93148
Added plain tests for admin importing
2017-02-03 22:05:13 +01:00
Diederik van der Boor
b691533039
Fix import errors with Django 1.6 code
2017-02-03 22:05:13 +01:00
Diederik van der Boor
66619371fd
remove empty test_models.py file
2017-02-03 22:05:13 +01:00
Diederik van der Boor
e28d7cb9f5
Merge pull request #258 from n1ncha/master
...
Update advanced.rst
2017-02-03 21:49:02 +01:00