Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Jun 4, 2021. It is now read-only.

Support tests running in Django 2.2 #251

Merged
cwdavies merged 6 commits into from
Mar 27, 2020
Merged

Support tests running in Django 2.2 #251

cwdavies merged 6 commits into from
Mar 27, 2020

Conversation

@cwdavies
Copy link
Contributor

@cwdavies cwdavies commented Mar 20, 2020 •
edited
Loading

Support import of Django 1.11 and 2.2 libraries

Additions

  • Support for Django 2.2 import paths

Removals

  • Support for Wagtail 1.13 in tox and travis
  • from __future__ import absolute_import, unicode_literals

Notes

  • Another PR will address the issue that tests do not pass in Django 2.2

Testing

  1. tox -e lint
  2. tox -e py36-dj111
  3. tox -e py36-dj22

Todos

Checklist

  • PR has an informative and human-readable title
  • Changes are limited to a single goal (no scope creep)
  • Code can be automatically merged (no conflicts)
  • Code follows the standards laid out in the development playbook
  • Passes all existing automated tests
  • Any change in functionality is tested
  • Placeholder code is flagged / future todos are captured in comments
  • Project documentation has been updated
  • Reviewers requested with the Reviewers tool ➡️

@cwdavies cwdavies changed the title Support Django 2.2 imports Support tests running in Django 2.2 Mar 20, 2020
cwdavies and others added 4 commits March 23, 2020 19:25
@cwdavies
Fix test settings
61a1456
@cwdavies
Fix API test url
e33e8e9
@cwdavies
Fix ModuleNotFoundError
4f80f0b
@willbarton
Fix test failures
fcb5704 
This change fixes the two test failures that the Django 2.2 upgrade introduced.
@willbarton willbarton requested a review from higs4281 March 26, 2020 16:39
@willbarton
Copy link
Member

willbarton commented Mar 26, 2020

I've pushed a fix for the test issues and then used black to address the linting issues.

@willbarton
Format with black
d5ed6fc 
This commit has had `black` (https://github.com/psf/black), the autoformatter, run on the `retirement_api` package and `setup.py`

It also adds `black --check` to the `tox` `lint` environment and adds a section in `CONTRIBUTING.md` about code style and tools.
higs4281
higs4281 approved these changes Mar 27, 2020
View reviewed changes
Copy link
Member

@higs4281 higs4281 left a comment

Choose a reason for hiding this comment

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

This looks great, and the app runs as it should.
I'm not following the Travis errors, though.

@cwdavies cwdavies merged commit 6b9c165 into master Mar 27, 2020
@cwdavies cwdavies deleted the support-dj22 branch March 27, 2020 13:16
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@higs4281 higs4281 higs4281 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@cwdavies @willbarton @higs4281