Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed multi-table inheritance auto created PK from serialize. #4852

Merged
merged 1 commit into from Jan 26, 2017

Conversation

felixxm
Copy link
Contributor

@felixxm felixxm commented Jan 25, 2017

@tomchristie
Copy link
Member

tomchristie commented Jan 26, 2017

Some build failures on Python 3.6 which look unrelated to this. Just restarting the build now.

@felixxm felixxm changed the title Fixed #4574 -- Removed multi-table inheritance auto created PK from serialize. Refs #4574 -- Removed multi-table inheritance auto created PK from serialize. Jan 26, 2017
@felixxm
Copy link
Contributor Author

felixxm commented Jan 26, 2017

This PR fixed two failures on Django 1.11

tests/test_multitable_inheritance.py:69: in test_data_is_valid_without_parent_ptr
tests/test_multitable_inheritance.py:47: in test_multitable_inherited_model_fields_as_expected

I'm working on test_schemas.py failures. I'm going to send separate PR for this.

@felixxm
Copy link
Contributor Author

felixxm commented Jan 26, 2017

Those python 3.6 failures should be in allowed_failures section (see #4853).

@tomchristie
Copy link
Member

Maybe try re-issuing the Pull Request to see if that resolves things now, given @rpkilby's comment that travis have now resolved this issue. Restarting the build didn't fix things.

@felixxm
Copy link
Contributor Author

felixxm commented Jan 26, 2017

They will deploy fix in the week (see travis-ci/travis-ci#7221 (comment)).

@felixxm
Copy link
Contributor Author

felixxm commented Jan 26, 2017

I rebased from master. Now it works 🎉.

@carltongibson carltongibson changed the title Refs #4574 -- Removed multi-table inheritance auto created PK from serialize. Removed multi-table inheritance auto created PK from serialize. Jan 26, 2017
Copy link
Collaborator

@carltongibson carltongibson left a comment

Choose a reason for hiding this comment

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

This is great. There's already a failing test, which now passes.

(It just leaves a few test_schema issues for Django 1.11/master compat.)

@carltongibson carltongibson added this to the 3.5.4 Release milestone Jan 26, 2017
@tomchristie
Copy link
Member

👍 Fab - thanks!

@tomchristie tomchristie merged commit 1ecbeeb into encode:master Jan 26, 2017
@felixxm felixxm deleted the issue-4574 branch January 26, 2017 15:27
@felixxm
Copy link
Contributor Author

felixxm commented Jan 27, 2017

I found (django/django@f0ef0c4) and fixed (django/django@092f09f) regression in Django. Tests In the beta release 1.11b1 should pass correctly. You can check it with 1.11.x.tar.gz.

vpistis added a commit to vpistis/django-rest-framework that referenced this pull request Feb 6, 2017
* master: (95 commits)
  Add max_length and min_length arguments for ListField (encode#4877)
  Update sponsors on README to include rollbar (encode#4876)
  Added Rollbar to premium sponsors
  fixed url checker ':' to 'http' (encode#4678)
  Fixed `dedent` for tab indent.
  Add test for pagination when limit not set
  Fixed Django 2.0 compatibility due to `django.conf.urls.include` parameters change. (encode#4866)
  Add remaining tests for generics (encode#4865)
  Removed unnecessary importlib wrapper.
  Updated Support section and added funding email (encode#4860)
  Git add remaining tests for BaseSerializer (encode#4857)
  Update machinalis links
  Updated Machinalis links (encode#4856)
  Add remaining tests for metadata (encode#4855)
  Fixed encode#4574 -- Removed multi-table inheritance auto created PK from serialize. (encode#4852)
  Add couple of tests for filters (encode#4849)
  Refactor according to comments in PR (encode#4848)
  Add couple of tests for compat module (encode#4845)
  Direct readers to info on how to add viewset docs (encode#4844)
  Fixed test_one_to_one_with_inheritance. Added required on_delete attribute to OneToOneField field. (encode#4838)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants