Skip to content
This repository was archived by the owner on Aug 26, 2022. It is now read-only.

Conversation

@safwanrahman
Copy link
Contributor

It passes all the tests! But need some more investigation.
I will investigate more later this week.
@jwhitlock Can you take a look if I have taken proper approach?

--hash=sha256:4962418a57804f8323282728a4f9b9496e78caec1adda352170697752eff01bf
djangorestframework==3.5.4 \
--hash=sha256:110afa12784ceadfb50808882689302d266785b51e3d13286744333ff6d78e60 \
--hash=sha256:f995a35ae22f354d2a9a42ee6d2c059c101f826b1485ed46781677895ad25ee5
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm adding more links to the requirements files, see https://github.com/mozilla/kuma/blob/master/requirements/README.rst#requirements-format. Here's what I have:

# RESTful API framework, used by search
# Code: https://github.com/encode/django-rest-framework
# Changes: http://www.django-rest-framework.org/topics/release-notes/
# Docs: http://www.django-rest-framework.org
djangorestframework==3.5.4 \
    --hash=sha256:110afa12784ceadfb50808882689302d266785b51e3d13286744333ff6d78e60 \
    --hash=sha256:f995a35ae22f354d2a9a42ee6d2c059c101f826b1485ed46781677895ad25ee5

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've tested DRF 3.6.4, and that works with these changes as well. Please switch to that version.

@jwhitlock
Copy link
Contributor

Thanks for tackling this @safwanrahman! I appreciate that you are limiting changes to those needed for the upgrade. This is quick feedback, I'll get into a detailed review later today.

Tests passing is a good sign, although I really don't trust the tests around search 😬 . I'll read the release notes and poke around to see if these look good.

I'm taking an incremental approach with these updates, shipping one or two packages at a time. django-tidings is the next one (PR #4660), going out today, so I'll wait to merge until that is deployed. bug 1399639 is the bug to use for package upgrades.

I think DRF 3.6 supports Django 1.8 still, and if so, we should get to that eventually. I'm happy to focus on DRF 3.5, then do DRF 3.6 in the next PR, if there are a lot of changes for DRF 3.6.

Copy link
Contributor

@jwhitlock jwhitlock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I manually tested this, and it works for me locally. The changes from DRF 3.3 to 3.6 are mostly around core API and the new schema tools, which we aren't using yet.

Please add the URLs to the requirements file, and update to DRF 3.6.4. I'd like to merge and deploy this on Tuesday, Feb 20.

--hash=sha256:4962418a57804f8323282728a4f9b9496e78caec1adda352170697752eff01bf
djangorestframework==3.5.4 \
--hash=sha256:110afa12784ceadfb50808882689302d266785b51e3d13286744333ff6d78e60 \
--hash=sha256:f995a35ae22f354d2a9a42ee6d2c059c101f826b1485ed46781677895ad25ee5
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've tested DRF 3.6.4, and that works with these changes as well. Please switch to that version.


context = self.resolve_context(data, request, response)
return template.render(context, request=request)
return super(ExtendedTemplateHTMLRenderer, self).get_template_context(data, renderer_context)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😄 good job resolving this TODO, the code is much cleaner.

@codecov-io
Copy link

Codecov Report

Merging #4664 into master will decrease coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #4664      +/-   ##
==========================================
- Coverage   95.27%   95.27%   -0.01%     
==========================================
  Files         261      261              
  Lines       23571    23560      -11     
  Branches     1692     1691       -1     
==========================================
- Hits        22458    22447      -11     
  Misses        902      902              
  Partials      211      211
Impacted Files Coverage Δ
kuma/search/renderers.py 100% <100%> (ø) ⬆️
kuma/search/fields.py 84.61% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2871015...6ebc832. Read the comment docs.

@safwanrahman
Copy link
Contributor Author

@jwhitlock Updated with the comments.

@safwanrahman safwanrahman changed the title [Ongoing] Updating Django Rest Framework Updating Django Rest Framework Feb 17, 2018
@safwanrahman safwanrahman changed the title Updating Django Rest Framework [Bug 1399639] Updating Django Rest Framework Feb 17, 2018
Copy link
Contributor

@jwhitlock jwhitlock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @safwanrahman - one step closer to the current DRF!

@jwhitlock jwhitlock merged commit d085539 into mdn:master Feb 20, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants