diff --git a/.travis.yml b/.travis.yml index 04c65710..a8708a05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,15 +2,12 @@ language: python python: - "2.7" - - 3.4.4 + - "3.4" - "3.5" - "3.6" env: - - DJANGO=1.8.18 - - DJANGO=1.9.13 - - DJANGO=1.10.7 - - DJANGO=1.11 + - DJANGO=1.11.4 install: - pip install -q Django==$DJANGO diff --git a/README.rst b/README.rst index 9b5b611d..9fbe07ab 100644 --- a/README.rst +++ b/README.rst @@ -7,7 +7,7 @@ django-helpdesk - A Django powered ticket tracker for small businesses. .. image:: https://codecov.io/gh/django-helpdesk/django-helpdesk/branch/master/graph/badge.svg :target: https://codecov.io/gh/django-helpdesk/django-helpdesk -Copyright 2009- Ross Poulton and contributors. All Rights Reserved. +Copyright 2009-2017 Ross Poulton and django-helpdesk contributors. All Rights Reserved. See LICENSE for details. django-helpdesk was formerly known as Jutda Helpdesk, named after the @@ -61,8 +61,13 @@ to alert you to this shortcoming. There is no way around it, sorry. Installation ------------ -django-helpdesk requires either Python 2.7 or 3.4+, as well as Django 1.8+. -The recommended combination is Python 3.4+ with Django 1.10. +django-helpdesk requires either Python 2.7 or 3.4+, as well as Django 1.11+. + +**NOTE REGARDING PYTHON VERSION:** +The recommended combination is Python 3.4+ with Django 1.11+. +Support for Python 2 will end in the next versions of both django-helpdesk +and Django itself (2.0), so users and developers are encouraged to begin +transitioning to Python 3 if have not already. You can quickly install the latest stable version of django-helpdesk app via pip: diff --git a/demo/README.rst b/demo/README.rst index 548bb850..14bcfd0d 100644 --- a/demo/README.rst +++ b/demo/README.rst @@ -73,7 +73,7 @@ Then navigate to the site in a browser as above. *NOTE ON DJANGO VERISON* -The demo project was also created with Django 1.10 +The demo project was also created with Django 1.11 in mind. If you are using a different version of Django, slight tweaks might be necessary to make the demo work. diff --git a/docs/conf.py b/docs/conf.py index 7f441650..6ecfce4a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -41,16 +41,16 @@ master_doc = 'index' # General information about the project. project = u'django-helpdesk' -copyright = u'2011, Ross Poulton + Contributors' +copyright = u'2011-2017, Ross Poulton + django-helpdesk Contributors' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '0.1' +version = '0.2' # The full version, including alpha/beta/rc tags. -release = '0.1' +release = '0.2.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -179,7 +179,7 @@ htmlhelp_basename = 'django-helpdeskdoc' # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ ('index', 'django-helpdesk.tex', u'django-helpdesk Documentation', - u'Ross Poulton + Contributors', 'manual'), + u'Ross Poulton + django-helpdesk Contributors', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -212,5 +212,5 @@ latex_documents = [ # (source start file, name, description, authors, manual section). man_pages = [ ('index', 'django-helpdesk', u'django-helpdesk Documentation', - [u'Ross Poulton + Contributors'], 1) + [u'Ross Poulton + django-helpdesk Contributors'], 1) ] diff --git a/docs/index.rst b/docs/index.rst index ae9e3ead..37054149 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -10,13 +10,13 @@ Contents :maxdepth: 2 :glob: - license install configuration settings spam custom_fields contributing + license How Does It Look? @@ -69,7 +69,7 @@ django-helpdesk is released under the BSD license, however it packages 3rd party Dependencies ------------ -1. Python 2.7+ (or 3.4+) -2. Django (1.8 or newer) +1. Python 3.4+ (or 2.7, but deprecated and support will be removed next release) +2. Django 1.11 or newer 3. An existing **working** Django project with database etc. If you cannot log into the Admin, you won't get this product working! This means you **must** run `syncdb` **before** you add ``helpdesk`` to your ``INSTALLED_APPS``. diff --git a/docs/install.rst b/docs/install.rst index 26d7a36e..ea0aa77f 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -63,7 +63,7 @@ errors with trying to create User settings. This line will have to come *after* any other lines in your urls.py such as those used by the Django admin. - Note that the `helpdesk` namespace is no longer required for Django 1.9 and you can use a different namespace. + Note that the `helpdesk` namespace is no longer required for Django 1.9+ and you can use a different namespace. However, it is recommended to use the default namespace name for clarity. 3. Create the required database tables. diff --git a/requirements.txt b/requirements.txt index 2b53215d..0b95046e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django>=1.8 +Django>=1.11 django-bootstrap-form>=3.1,<4 email-reply-parser django-markdown-deux diff --git a/setup.py b/setup.py index 9d1f8d03..39602eb3 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ from distutils.util import convert_path from fnmatch import fnmatchcase from setuptools import setup, find_packages -version = '0.2.0.1' +version = '0.2.0' # Provided as an attribute, so you can append to these instead # of replicating them: @@ -133,9 +133,6 @@ setup( "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Framework :: Django", - "Framework :: Django :: 1.8", - "Framework :: Django :: 1.9", - "Framework :: Django :: 1.10", "Framework :: Django :: 1.11", "Environment :: Web Environment", "Operating System :: OS Independent", @@ -150,8 +147,8 @@ setup( 'cases', 'bugs', 'track', 'support'], author='Ross Poulton', author_email='ross@rossp.org', - maintainer='Jonathan Barratt', - maintainer_email='jonathan@the-im.com', + maintainer='Garret Wassermann', + maintainer_email='gwasser@gmail.com', url='https://github.com/django-helpdesk/django-helpdesk', license='BSD', packages=find_packages(),