Remove py2 commands from makefile, update README copyright for (C) 2019 (happy new year everyone)

This commit is contained in:
Garret Wassermann 2019-01-01 18:10:51 -05:00
parent a5a679512c
commit eaaaad8391
3 changed files with 3 additions and 44 deletions

View File

@ -22,11 +22,6 @@ help:
develop: develop:
$(PIP) install -e . $(PIP) install -e .
#: develop2 - Install minimal development utilities for Python2.
.PHONY: develop2
develop2:
pip2 install -e .
#: clean - Basic cleanup, mostly temporary files. #: clean - Basic cleanup, mostly temporary files.
.PHONY: clean .PHONY: clean
@ -94,31 +89,12 @@ demo:
demodesk loaddata emailtemplate.json demodesk loaddata emailtemplate.json
demodesk loaddata demo.json demodesk loaddata demo.json
#: demo2 - Setup demo project using Python2.
.PHONY: demo2
demo2:
pip2 install -e .
pip2 install -e demo
demodesk migrate --noinput
# Create superuser; user will be prompted to manually set a password.
# When you get a prompt, enter a password of your choosing.
# We suggest a default of 'Test1234' for the demo project.
demodesk createsuperuser --username admin --email helpdesk@example.com
# Install fixtures (helpdesk templates as well as demo ticket data)
demodesk loaddata emailtemplate.json
demodesk loaddata demo.json
#: rundemo - Run demo server using Python3. #: rundemo - Run demo server using Python3.
.PHONY: rundemo .PHONY: rundemo
rundemo: demo rundemo: demo
demodesk runserver 8080 demodesk runserver 8080
#: rundemo2 - Run demo server using Python2.
.PHONY: rundemo2
rundemo2: demo2
demodesk runserver 8080
#: release - Tag and push to PyPI. #: release - Tag and push to PyPI.
.PHONY: release .PHONY: release

View File

@ -7,7 +7,7 @@ django-helpdesk - A Django powered ticket tracker for small businesses.
.. image:: https://codecov.io/gh/django-helpdesk/django-helpdesk/branch/develop/graph/badge.svg .. image:: https://codecov.io/gh/django-helpdesk/django-helpdesk/branch/develop/graph/badge.svg
:target: https://codecov.io/gh/django-helpdesk/django-helpdesk :target: https://codecov.io/gh/django-helpdesk/django-helpdesk
Copyright 2009-2018 Ross Poulton and django-helpdesk contributors. All Rights Reserved. Copyright 2009-2019 Ross Poulton and django-helpdesk contributors. All Rights Reserved.
See LICENSE for details. See LICENSE for details.
django-helpdesk was formerly known as Jutda Helpdesk, named after the django-helpdesk was formerly known as Jutda Helpdesk, named after the

View File

@ -17,8 +17,6 @@ in the top level of the django-helpdesk directory.
Running the demo Running the demo
---------------- ----------------
By default, the demo is configured for Python 3.
While not recommended, the simplest way to get While not recommended, the simplest way to get
started is to simply install django-helpdesk started is to simply install django-helpdesk
to your system python package directory. to your system python package directory.
@ -59,25 +57,10 @@ before running:
make rundemo make rundemo
*NOTE ON USING PYTHON 2*
By default, the demo uses Python 3, as Python 3
will be the recommended version of python for
django-helpdesk and even Django itself in the near future.
However, if you wish to use Python 2, you can
instead run the following:
sudo make rundemo2
Then navigate to the site in a browser as above.
*NOTE ON DJANGO VERISON* *NOTE ON DJANGO VERISON*
The demo project was also created with Django 1.11 The demo project was configured with Django 2.x in mind.
in mind. If you are using an older version of Django, Django 1.11 is NOT supported.
slight tweaks might be necessary to make the demo work.
Please remember that we do not currently support any
version of Django other than 1.11.
*NOTE ON ATTACHMENTS* *NOTE ON ATTACHMENTS*