diff --git a/MANIFEST.in b/MANIFEST.in index 92aabae8..cf8f5763 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,6 @@ include README.rst include CONTRIBUTING.rst +include SECURITY.md include AUTHORS include LICENSE* include requirements.txt diff --git a/README.rst b/README.rst index f8f57483..bc9df258 100644 --- a/README.rst +++ b/README.rst @@ -21,16 +21,6 @@ or online at http://django-helpdesk.readthedocs.org/. You can see a demo installation at http://django-helpdesk-demo.herokuapp.com/, or run a demo locally in just a couple steps! -Licensing ---------- - -django-helpdesk is licensed under terms of the BSD 3-clause license. -See the file 'LICENSE' for full licensing terms. - -Note that django-helpdesk is distributed with 3rd party products which -have their own licenses. See LICENSE.3RDPARTY for license terms for -included packages. - Demo Quickstart --------------- @@ -62,7 +52,7 @@ Installation `django-helpdesk` requires: -* Python 3.6+ +* Python 3.8+ * Django 2.2 LTS or 3.2 LTS (recommend migration to 3.2 as soon as possible) You can quickly install the latest stable version of `django-helpdesk` @@ -115,5 +105,16 @@ We're happy to include any type of contribution! This can be: For more information on contributing, please see the `CONTRIBUTING.rst` file. + +Licensing +--------- + +django-helpdesk is licensed under terms of the BSD 3-clause license. +See the `LICENSE` file for full licensing terms. + +Note that django-helpdesk is distributed with 3rd party products which +have their own licenses. See LICENSE.3RDPARTY for license terms for +included packages. + .. _note: http://docs.djangoproject.com/en/dev/ref/databases/#sqlite-string-matching diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 851972ab..e99abcc2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,12 +10,6 @@ pool: vmImage: ubuntu-latest strategy: matrix: - Python36Django22: - PYTHON_VERSION: '3.6' - DJANGO_VERSION: '22' - Python37Django22: - PYTHON_VERSION: '3.7' - DJANGO_VERSION: '22' Python38Django22: PYTHON_VERSION: '3.8' DJANGO_VERSION: '22' @@ -25,12 +19,6 @@ strategy: Python310Django22: PYTHON_VERSION: '3.10' DJANGO_VERSION: '22' - Python36Django32: - PYTHON_VERSION: '3.6' - DJANGO_VERSION: '32' - Python37Django32: - PYTHON_VERSION: '3.7' - DJANGO_VERSION: '32' Python38Django32: PYTHON_VERSION: '3.8' DJANGO_VERSION: '32' diff --git a/demo/README.rst b/demo/README.rst index 73271158..87513afa 100644 --- a/demo/README.rst +++ b/demo/README.rst @@ -59,7 +59,7 @@ before running: *NOTE ON DJANGO VERISON* -The demo project was configured with Django 2.2+ in mind. +The demo project was configured with Django 2.2 in mind. Django 3.2 LTS is highly recommended. Django 1.11 is NOT supported. diff --git a/demo/setup.py b/demo/setup.py index e294a14f..07eaf55f 100644 --- a/demo/setup.py +++ b/demo/setup.py @@ -13,16 +13,15 @@ project_root = os.path.dirname(here) NAME = 'django-helpdesk-demodesk' DESCRIPTION = 'A demo Django project using django-helpdesk' README = open(os.path.join(here, 'README.rst')).read() -VERSION = '0.3.0b5' +VERSION = '0.3.0' #VERSION = open(os.path.join(project_root, 'VERSION')).read().strip() AUTHOR = 'django-helpdesk team' URL = 'https://github.com/django-helpdesk/django-helpdesk' CLASSIFIERS = ['Development Status :: 4 - Beta', 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'Framework :: Django :: 2.2', 'Framework :: Django :: 3.0', 'Framework :: Django :: 3.1', diff --git a/docs/install.rst b/docs/install.rst index 036f4fd3..e1107b07 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -9,8 +9,8 @@ Prerequisites Before getting started, ensure your system meets the following recommended dependencies: -* Python 3.6+ -* Django 2.2+ LTS or 3.2 LTS (strongly recommend migrating to 3.2 LTS as soon as possible) +* Python 3.8+ +* Django 2.2 LTS or 3.2 LTS (strongly recommend migrating to 3.2 LTS as soon as possible) Ensure any extra Django modules you wish to use are compatible before continuing. diff --git a/docs/upgrade.rst b/docs/upgrade.rst index 117a7cf1..89e24ef4 100644 --- a/docs/upgrade.rst +++ b/docs/upgrade.rst @@ -16,7 +16,7 @@ The tips below are based on modifications of the original installation instructi - Under `INSTALLED_APPS`, `bootstrapform` needs to be replaced with `bootstrap4form` -- Unless turning off `pinax_teams`, need to add the following to `INSTALLED_APPS` for `pinax_teams`: +- Unless turning off `pinax_teams`, add the following to `INSTALLED_APPS` for `pinax_teams`: ``` "account", "pinax.invitations", diff --git a/setup.py b/setup.py index 78cae6d5..f02c847e 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from distutils.util import convert_path from fnmatch import fnmatchcase from setuptools import setup, find_packages -version = '0.3.0b5' +version = '0.3.0' # Provided as an attribute, so you can append to these instead # of replicating them: @@ -124,10 +124,9 @@ setup( "Development Status :: 4 - Beta", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "Framework :: Django", 'Framework :: Django :: 2.2', "Framework :: Django :: 3.0",