[PATCH v5 0/8] Fix Django 1.7 compatibility

Stephen Finucane stephenfinucane at hotmail.com
Wed Apr 8 07:20:47 AEST 2015


This patchset resolves a number of issues related to support for Django
1.7. These fixes do not impact support for Django 1.5 and 1.6. To
ensure this remains the case, a tox file has been added to run unit
tests against the myriad environments.

This patchset should also serve to open the discussion on the versions
of Django (and Python) that patchwork should support going forward.
Currently two of the three version of Django supported in patchwork
(1.5, 1.6) are deprecated and unsupported upstream.

    https://www.djangoproject.com/download/

This requires discussion.

Stephen Finucane (8):
  Resolve removed 'AUTH_PROFILE_MODULE' setting
  views: Replace 'mimetype' with 'content_type'
  settings: Resolve all but one Django 1.7 warning
  docs: Use 'prod' and 'dev' requirements files
  settings: Restructure settings file
  Integrate 'django.contrib.staticfiles'
  settings: Split 'settings.py' into multiple files
  tox: Add tox.ini file

 apps/manage.py                         |   2 +-
 apps/patchwork/filters.py              |   6 +-
 apps/patchwork/forms.py                |   2 +-
 apps/patchwork/models.py               |   9 ++-
 apps/patchwork/paginator.py            |   2 +-
 apps/patchwork/settings/__init__.py    |   0
 apps/patchwork/settings/base.py        | 115 +++++++++++++++++++++++++++++
 apps/patchwork/settings/dev.py         |  52 ++++++++++++++
 apps/patchwork/settings/prod.py        |  62 ++++++++++++++++
 apps/patchwork/tests/test_bundles.py   |   2 +-
 apps/patchwork/tests/utils.py          |   2 +-
 apps/patchwork/urls.py                 |   8 ++-
 apps/patchwork/views/base.py           |   6 +-
 apps/patchwork/views/bundle.py         |   2 +-
 apps/patchwork/views/patch.py          |   4 +-
 apps/patchwork/views/project.py        |   2 +-
 apps/patchwork/views/user.py           |  14 ++--
 apps/settings.py                       | 128 ---------------------------------
 apps/urls.py                           |  44 ------------
 docs/requirements-base.txt             |   2 +
 docs/requirements-dev.txt              |   1 +
 docs/requirements-django-1.5-mysql.txt |   3 -
 docs/requirements-django-1.6-mysql.txt |   3 -
 docs/requirements-django-1.7-mysql.txt |   3 -
 docs/requirements-prod.txt             |   2 +
 htdocs/css/style.css                   |   2 +-
 templates/base.html                    |  11 +--
 templates/patchwork/bundle.html        |  13 ++--
 templates/patchwork/bundles.html       |   6 +-
 templates/patchwork/filters.html       |   5 +-
 templates/patchwork/list.html          |   1 +
 templates/patchwork/patch-list.html    |  31 ++++++--
 templates/patchwork/patch.html         |   2 +-
 templates/patchwork/profile.html       |  14 ++--
 templates/patchwork/project.html       |   2 +-
 tox.ini                                |  46 ++++++++++++
 36 files changed, 366 insertions(+), 243 deletions(-)
 create mode 100644 apps/patchwork/settings/__init__.py
 create mode 100644 apps/patchwork/settings/base.py
 create mode 100644 apps/patchwork/settings/dev.py
 create mode 100644 apps/patchwork/settings/prod.py
 delete mode 100644 apps/settings.py
 delete mode 100644 apps/urls.py
 create mode 100644 docs/requirements-base.txt
 create mode 100644 docs/requirements-dev.txt
 delete mode 100644 docs/requirements-django-1.5-mysql.txt
 delete mode 100644 docs/requirements-django-1.6-mysql.txt
 delete mode 100644 docs/requirements-django-1.7-mysql.txt
 create mode 100644 docs/requirements-prod.txt
 create mode 100644 tox.ini

-- 
2.1.0



More information about the Patchwork mailing list