Resolve various Django 1.8 deprecations #1165

benspaulding · 2015-04-06T21:17:01Z

This pull request handles the deprecation in Django 1.8 of:

django.utils.datastructures.SortedDict
django.utils.importlib
django.utils.unittest

For each case it prefers code from the Python stdlib, and if that import fails uses the old Django code. You can see individual commit messages for more information on each change.

This should resolve issue #1162 as well as pull request #1137.

The app_loading module had to shuffle things a bit. When it was importing the function it raised a [RuntimeError][]. Simply importing the module resolved that. [RuntimeError]: https://gist.github.com/benspaulding/f36eaf483573f8e5f777

The two are not exactly they same, but they are equivalent for Haystack's needs.

There is no need to fallback to importing unittest2 because Django 1.5 is the oldest Django we support, so django.utils.unittest is guaranteed to exist.

acdha · 2015-04-06T21:21:27Z

At first glance, this looks very nice – thanks!

benspaulding · 2015-04-06T21:58:00Z

@acdha Thanks for looking at this so quickly. Evidently I need to fix something from commit e37c1f3 about unittest. I’ll look when I get a chance and push a fix.

acdha · 2015-04-07T12:13:06Z

Hmmm, yes:

https://travis-ci.org/django-haystack/django-haystack/jobs/57394850#L1018

Oddly this caused no issue on Django <= 1.7, but it causes numerous errors on Django 1.8.

SalahAdDin · 2015-04-20T02:30:55Z

👍
Sooo good.

troygrosfield · 2015-04-25T15:12:33Z

👍

troygrosfield · 2015-04-25T16:31:04Z

#1175 should also be merged along with this one since this isn't actually running the test suite against django 1.8 (covered that in #1175).

andreif · 2015-04-27T13:57:49Z

@troygrosfield it may be better to merge #1175 into #1165

troygrosfield · 2015-04-27T14:03:25Z

@benspaulding, care to pull in the changes from #1175 to get this to test against django 1.8? Then after that's done I'll close #1175.

SalahAdDin · 2015-04-30T21:25:00Z

Merge please :D

acdha · 2015-05-12T15:37:06Z

I've reshuffled things a bit into https://github.com/acdha/django-haystack/tree/django-1.8

Currently that's down to 4 test failures, all related to the mock models:

======================================================================
ERROR: test_prepare (test_haystack.test_fields.CharFieldTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/cadams/Projects/django-haystack/test_haystack/test_fields.py", line 32, in test_prepare
    mock.tag = mock_tag
  File "/Users/cadams/.virtualenvs/django-haystack/lib/python2.7/site-packages/django/db/models/fields/related.py", line 668, in __set__
    (value, self.field.rel.to._meta.object_name)
ValueError: Cannot assign "<MockTag: MockTag object>": "MockTag" instance isn't saved in the database.

======================================================================
ERROR: test_prepare (test_haystack.test_fields.EdgeNgramFieldTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/cadams/Projects/django-haystack/test_haystack/test_fields.py", line 146, in test_prepare
    mock.tag = mock_tag
  File "/Users/cadams/.virtualenvs/django-haystack/lib/python2.7/site-packages/django/db/models/fields/related.py", line 668, in __set__
    (value, self.field.rel.to._meta.object_name)
ValueError: Cannot assign "<MockTag: MockTag object>": "MockTag" instance isn't saved in the database.

======================================================================
ERROR: test_prepare (test_haystack.test_fields.IntegerFieldTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/cadams/Projects/django-haystack/test_haystack/test_fields.py", line 201, in test_prepare
    mock.tag = mock_tag
  File "/Users/cadams/.virtualenvs/django-haystack/lib/python2.7/site-packages/django/db/models/fields/related.py", line 668, in __set__
    (value, self.field.rel.to._meta.object_name)
ValueError: Cannot assign "<MockTag: MockTag object>": "MockTag" instance isn't saved in the database.

======================================================================
ERROR: test_prepare (test_haystack.test_fields.NgramFieldTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/cadams/Projects/django-haystack/test_haystack/test_fields.py", line 89, in test_prepare
    mock.tag = mock_tag
  File "/Users/cadams/.virtualenvs/django-haystack/lib/python2.7/site-packages/django/db/models/fields/related.py", line 668, in __set__
    (value, self.field.rel.to._meta.object_name)
ValueError: Cannot assign "<MockTag: MockTag object>": "MockTag" instance isn't saved in the database.

benspaulding · 2015-05-13T17:26:26Z

Sorry I missed the activity here. @acdha Do you need anything further from me regarding this?

acdha · 2015-05-13T18:05:08Z

@benspaulding Not immediately, although if you have time to work on the mock models I wouldn't complain. I'm hoping to dig into that again on Friday.

benspaulding · 2015-05-14T15:28:33Z

Okay, I don’t have time in the next few days, but I’ll check back here later and tackle that if it has not already been handled.

acdha · 2015-06-03T22:04:01Z

The Django 1.8 branch has merged as of bd8e512

acdha · 2015-06-05T13:40:08Z

There's a release candidate on PyPI now:

pip install django-haystack==2.4.0rc1

Koed00 · 2015-06-06T10:49:34Z

Testing 2.4.0rc1 and still getting these deprecation warnings:

/local/lib/python2.7/site-packages/haystack/utils/app_loading.py:7: RemovedInDjango19Warning: The utilities in django.db.models.loading are deprecated in favor of the new application loading system.
  from django.db.models.loading import get_app, get_model, get_models

/local/lib/python2.7/site-packages/haystack/utils/app_loading.py:32: RemovedInDjango19Warning: get_app_config(app_label).models_module supersedes get_app(app_label).
  app_mod = get_app(label)

Last one only comes up with the management commands.
I'm feeling adventurous and will have a stab at it.

Koed00 · 2015-06-06T15:01:41Z

Created a pull request #1206 with fixes for this

acdha · 2015-06-06T18:19:51Z

Thanks – my goal for 2.4 is to have it clean against Django 1.8. If we can
get the 1.9 deprecations in before then it's fine but otherwise I figure we
can get that in by 2.5. I'd really like to avoid going so long between
releases in the future.

On Sat, Jun 6, 2015 at 11:01 AM, Ilan Steemers notifications@github.com
wrote:

Created a pull request #1206
#1206 with fixes
for this

—
Reply to this email directly or view it on GitHub
#1165 (comment)
.

Koed00 · 2015-06-06T18:34:33Z

I tested #1206 in my own project that was giving the warnings earlier and it's now nice and clean.
Now that I delved a bit deeper into the code, I can see how deprecating Django 1.6 would be a good goal for a future release.

acdha · 2015-06-06T18:51:42Z

Yes, I'd like to do that for 2.5 along with removing some of the remaining old Python 2.6 workarounds (e.g. the unittest2 special-casing in the test suite). If you see anything, feel free to send a pull request even if it's no more than a comment like "# TODO: remove with Django 1.6 support". I've been trying to add those as I notice branches for old Python or Django versions

benspaulding added 3 commits April 6, 2015 15:12

Prefer stdlib OrderedDict over Django's SortedDict

f6f57c3

The two are not exactly they same, but they are equivalent for Haystack's needs.

Prefer stdlib unittest over Django's unittest2

e37c1f3

There is no need to fallback to importing unittest2 because Django 1.5 is the oldest Django we support, so django.utils.unittest is guaranteed to exist.

acdha self-assigned this Apr 6, 2015

acdha added the highpriority label Apr 6, 2015

acdha added this to the v2.4.0 milestone Apr 6, 2015

benspaulding added 2 commits April 11, 2015 15:58

Correct unittest imports from commit e37c1f3

05c4c91

Fix mistake in calling super TestCase method

333747e

Oddly this caused no issue on Django <= 1.7, but it causes numerous errors on Django 1.8.

Situphen mentioned this pull request Apr 14, 2015

Django 1.8 (II, le retour) zestedesavoir/zds-site#2546

Closed

troygrosfield mentioned this pull request Apr 25, 2015

Updating haystack to test against django 1.8 #1175

Closed

acdha mentioned this pull request May 4, 2015

Can't execute update_index if model has ManyToManyField #1106

Open

acdha added the dependency updates label Jun 3, 2015

acdha closed this Jun 3, 2015

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Resolve various Django 1.8 deprecations #1165

Resolve various Django 1.8 deprecations #1165

benspaulding commented Apr 6, 2015

acdha commented Apr 6, 2015

benspaulding commented Apr 6, 2015

acdha commented Apr 7, 2015

SalahAdDin commented Apr 20, 2015

troygrosfield commented Apr 25, 2015

troygrosfield commented Apr 25, 2015

andreif commented Apr 27, 2015

troygrosfield commented Apr 27, 2015

SalahAdDin commented Apr 30, 2015

acdha commented May 12, 2015

benspaulding commented May 13, 2015

acdha commented May 13, 2015

benspaulding commented May 14, 2015

acdha commented Jun 3, 2015

acdha commented Jun 5, 2015

Koed00 commented Jun 6, 2015

Koed00 commented Jun 6, 2015

acdha commented Jun 6, 2015

Koed00 commented Jun 6, 2015

acdha commented Jun 6, 2015 via email

Resolve various Django 1.8 deprecations #1165

Resolve various Django 1.8 deprecations #1165

Conversation

benspaulding commented Apr 6, 2015

acdha commented Apr 6, 2015

benspaulding commented Apr 6, 2015

acdha commented Apr 7, 2015

SalahAdDin commented Apr 20, 2015

troygrosfield commented Apr 25, 2015

troygrosfield commented Apr 25, 2015

andreif commented Apr 27, 2015

troygrosfield commented Apr 27, 2015

SalahAdDin commented Apr 30, 2015

acdha commented May 12, 2015

benspaulding commented May 13, 2015

acdha commented May 13, 2015

benspaulding commented May 14, 2015

acdha commented Jun 3, 2015

acdha commented Jun 5, 2015

Koed00 commented Jun 6, 2015

Koed00 commented Jun 6, 2015

acdha commented Jun 6, 2015

Koed00 commented Jun 6, 2015

acdha commented Jun 6, 2015 via email