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

Devan/upgrade django #424

Merged
merged 14 commits into from May 10, 2019
Merged

Devan/upgrade django #424

merged 14 commits into from May 10, 2019

Conversation

DevanR
Copy link
Contributor

@DevanR DevanR commented Apr 8, 2019

This PR contains the changes required to upgrade the from the current version of Django. 1.10.7 to 1.11. The main steps taken to achieve this were as follows:

update SwampDragon to fork that supports Django 1.11
update Django to 1.11
resolve django-angular issues

Dependencies: None

Testing instructions:

Author notes:

SwampDragon fork that supports Django 1.11:
https://github.com/lepri/swampdragon/commits/master

Django 1.11 removes ChoiceFieldRenderer class:
jrief/django-angular#284

Django 1.11 support for django-angular:
jrief/django-angular#292

Pylint issues with Django 1.11:
pylint-dev/pylint#1653

Reviewers

Copy link
Contributor

@SSPJ SSPJ left a comment

Choose a reason for hiding this comment

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

@DevanR I had a look. Good work tracking down a compatible version of swampdragon. When I run pip install on your branch I still get swampdragon 0.4.2.2 has requirement Django<1.10,>=1.6, but you'll have django 1.11.20 which is incompatible. Do you get that also?

Also, when I run the unit tests on master, I get 22 failures FAILED (failures=22, errors=15, skipped=23) (I know, I shouldn't be getting any) but when I run them on your branch I get 27, i.e. FAILED (failures=27, errors=15, skipped=23). I am running them again to log to a file to see which exact tests are failing, but do you have any insight on it?

requirements.txt Show resolved Hide resolved
requirements.txt Show resolved Hide resolved
pr_watch/models.py Show resolved Hide resolved
@SSPJ
Copy link
Contributor

SSPJ commented May 2, 2019

@DevanR I see that the extra failing tests are:

> FAIL: test_existing_user (registration.tests.test_views.BetaTestApplicationViewTestCase)
> FAIL: test_valid_application (registration.tests.test_views.BetaTestApplicationViewTestCase)
> FAIL: test_valid_subdomain_1_hogwarts (registration.tests.test_views.BetaTestApplicationViewTestCase)
> FAIL: test_valid_subdomain_2_hog_warts (registration.tests.test_views.BetaTestApplicationViewTestCase)
> FAIL: test_valid_subdomain_3_hog1warts (registration.tests.test_views.BetaTestApplicationViewTestCase)

I also saw the note on the ticket description. Is this because you need to rebase on master?

@DevanR
Copy link
Contributor Author

DevanR commented May 2, 2019

@SSPJ Strange, I'm not getting any failing tests. Plus, the extra failing tests should have been fixed by the last commit. Let me double check and get back to you. Thanks for the review so far.

@DevanR
Copy link
Contributor Author

DevanR commented May 3, 2019

@SSPJ I've push a fixed for the additional failing tests (not sure why I did not pick them up before. And I'm even more confused why CircleCI tests passed.) Could you please do 'vagrant destroy && vagrant up && vagrant ssh' and run 'make test' again? I'm getting all tests passing on my local environment. Hopefully CircleCI will show the same.

@SSPJ
Copy link
Contributor

SSPJ commented May 3, 2019

@DevanR I wouldn't worry about the extra failing tests on my devstack. Those are because I don't have all my variables configured properly. But I ran the provisioning again and your branch now has 22 failures, same as master, and I was able to register an account, so nice work!

As soon as you fix the failing Jasmine tests, this should be good to merge. 👍

@DevanR
Copy link
Contributor Author

DevanR commented May 6, 2019

@SSPJ All the tests seem to be passing now. Could you please have another look?

@SSPJ
Copy link
Contributor

SSPJ commented May 9, 2019

Looks good, @DevanR 👍

  • I tested this: registered a user on this branch and ran make test
  • I read through the code
  • I checked for accessibility issues n/a
  • Includes documentation n/a

author Devan Rehunathan <rehunathan@gmail.com> 1554671667 +0100
committer Devan <rehunathan@gmail.com> 1557479187 +0100

Updated SwampDragon.

Upgrade Django to 1.11.20

Upgrade django-angular to a fork that supports Django==1.11.

Fixed param validation issue in get_or_create().

Updated formatting.

Updated pylint to 1.6.5 to resolve deprecated assertRegex errors.

Fix for pre-setting checkbox fo accept_terms booleanfield.

Update ansible line timeout and circle CI output timeout. Add stacktrace to timeout error when running ansible playbook. Update branches to use Hawthorn and update logo assertion regex. (#417)

Update how instances are created to share the same prefix so cleanup scripts can delete dbs and users. Add stacktrace to timeout errors. Update AWS error classes. Update MySQL cleanup so we can delete every db and user related to integration tests.

Delete creation of empty table in new databases.

Fix for pre-setting checkbox fo accept_privacy_policy booleanfield.
@DevanR DevanR merged commit 4ff7831 into master May 10, 2019
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.

None yet

3 participants