Fix formatting and merge latest Django update (#212)

* Update structure and requirements

* Fix black and pytest

* Add a simple basic test for users

* Add celery bloker url to travis test env

* Correct celery broker url env for local deployment with docker

* Fix black check

* Whitespace fix for templates

* Fix template black formatting errors

.editorconfig

@@ -21,3 +21,7 @@ trim_trailing_whitespace = false
 
 [Makefile]
 indent_style = tab
+
+[nginx.conf]
+indent_style = space
+indent_size = 2

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1 @@
+## [Make sure to follow one of the issue templates we've got](https://github.com/mazdakb/django-naqsh/issues/new/choose), otherwise the issue might be closed immeditely

.github/ISSUE_TEMPLATE/bug.md

@@ -0,0 +1,21 @@
+---
+name: Bug Report
+about: Report a bug
+---
+
+## What happened?
+
+
+
+
+## What should've happened instead?
+
+
+
+
+## Steps to reproduce
+
+[//]: # (Any or all of the following:)
+[//]: # (* Host system configuration: OS, Docker & friends' versions etc.)
+[//]: # (* Replay file https://cookiecutter.readthedocs.io/en/latest/advanced/replay.html)
+[//]: # (* Logs)

.github/ISSUE_TEMPLATE/feature.md

@@ -0,0 +1,24 @@
+---
+name: New Feature Proposal
+about: Propose a new feature
+---
+
+## Description
+
+[//]: # (What's it you're proposing? How should it be implemented?)
+
+
+
+
+## Rationale
+
+[//]: # (Why should this feature be implemented?)
+
+
+
+
+## Use case(s) / visualization(s)
+
+[//]: # ("Better to see something once than to hear about it a thousand times.")
+
+

.github/ISSUE_TEMPLATE/improvement.md

@@ -0,0 +1,24 @@
+---
+name: Improvement Suggestion
+about: Let us know how we could improve
+---
+
+## Description
+
+[//]: # (What's it you're proposing? How should it be implemented?)
+
+
+
+
+## Rationale
+
+[//]: # (Why should this feature be implemented?)
+
+
+
+
+## Use case(s) / visualization(s)
+
+[//]: # ("Better to see something once than to hear about it a thousand times.")
+
+

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,6 @@
+---
+name: Question
+about: Please, ask your question on StackOverflow or Gitter
+---
+
+First, make sure to examine [the docs](https://django-naqsh.readthedocs.io/en/latest/). If that doesn't help post a question on [StackOverflow](https://stackoverflow.com/questions/tagged/django-naqsh) tagged with `django-naqsh` or [StackOverflow](https://stackoverflow.com/questions/tagged/cookiecutter-django) tagged with `cookiecutter-django`.

.github/ISSUE_TEMPLATE/regression.md

@@ -0,0 +1,28 @@
+---
+name: Regression Report
+about: Let us know if something that'd been working has broke
+---
+
+## What happened before?
+
+
+
+
+## What happens now?
+
+
+
+
+## Last stable commit / Since when?
+
+
+
+
+## Steps to reproduce
+
+[//]: # (Any or all of the following:)
+[//]: # (* Host system configuration: OS, Docker & friends' versions etc.)
+[//]: # (* Project generation options)
+[//]: # (* Logs)
+
+

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,27 @@
+[//]: # (Thank you for helping us out: your efforts mean great deal to the project and the community as a whole!)
+
+[//]: # (Before you proceed:)
+
+[//]: # (1. Make sure to add yourself to `CONTRIBUTORS.rst` through this PR provided you're contributing here for the first time)
+[//]: # (2. Don't forget to update the `docs/` presuming others would benefit from a concise description of whatever that you're proposing)
+
+
+## Description
+
+[//]: # (What's it you're proposing?)
+
+
+
+
+## Rationale
+
+[//]: # (Why does the project need that?)
+
+
+
+
+## Use case(s) / visualization(s)
+
+[//]: # ("Better to see something once than to hear about it a thousand times.")
+
+

.gitignore

@@ -129,9 +129,6 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 
-### VSCode template
-.vscode/
-
 
 ### SublimeText template
 # Cache files for Sublime Text
@@ -229,4 +226,10 @@ pip-selfcheck.json
 # is declarative by nature.
 .idea/
 
+# Even though the project might be opened and edited
+# in Visual Studio Code, it makes no sence whatsoever
+# to 'run' anything within it since any particular cookiecutter
+# is declarative by nature.
+.vscode/
+
 .pytest_cache/

.pyup.yml

@@ -3,9 +3,10 @@
 # allowed: all, insecure, False
 update: all
 
-# set the default branch
-# default: empty, the default branch on GitHub
-branch: master
+# configure dependency pinning globally
+# default: True
+# allowed: True, False
+pin: True
 
 # update schedule
 # default: empty
@@ -16,7 +17,7 @@ schedule: "every day"
 # default: pyup-
 branch_prefix: pyup/
 
-# Specify requirement files by hand, pyup seems to struggle to
+# Specify requirement files by hand, pyup seems to struggle to 
 # find the ones in the project_slug folder
 requirements:
   - "requirements.txt"

.travis.yml

@@ -2,37 +2,43 @@
 
 dist: xenial
 
-sudo: required
-
 services:
   - docker
 
 language: python
 
 python: 3.7
 
-env:
-  - TOX_ENV=py36
-
 before_install:
   - docker-compose -v
   - docker -v
 
 matrix:
   include:
-    - name: Tox Test
+    - name: Test results
       script: tox -e py37
-    - name: Black template
+    - name: Run flake8 on result
+      script: tox -e flake8
+    - name: Run black on result
       script: tox -e black
+    - name: Black template
+      script: tox -e black-template
     - name: Basic Docker
       script: sh tests/test_docker.sh
     - name: Docker with Celery
       script: sh tests/test_docker.sh use_celery=y
+    - name: Bare metal
+      script: sh tests/test_bare.sh use_celery=y
+      services:
+        - postgresql
+        - redis-server
+      env:
+        - CELERY_BROKER_URL=redis://localhost:6379/0
 
 install:
   - pip install tox
 
 notifications:
   email:
-    on_success: never
-    on_failure: never
+    on_success: change
+    on_failure: always

CHANGELOG.md

@@ -1,14 +1,3 @@
 # Change Log
 All enhancements and patches to Django Naqsh will be documented in this file.
-This project adheres to [Semantic Versioning](http://semver.org/).
-
-## [2018-05-04]
-### Added
-- Travic build status shield
-- Signals file handling for common app
-### Fixed
-- Missing comma in config.py
-
-## [2018-05-04]
-### Added
-- Initial repository setup
+This project adheres to [Semantic Versioning](http://semver.org/).

CONTRIBUTORS.rst

@@ -30,6 +30,8 @@ Listed in alphabetical order.
 ========================== ============================ ==============
   Name                     Github                        Twitter
 ========================== ============================ ==============
+<Youe Name>                <Your Github>                <Your Twitter>
+========================== ============================ ==============
 
 Special Thanks
 ~~~~~~~~~~~~~~

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2018, Mazdak Badakhshan
+Copyright (c) 2018-2019, Mazdak Badakhshan
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -27,38 +27,3 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-/// ==================================================================
-/// ===================== THIRD PARTY LICENSES =======================
-/// ==================================================================
-
-/// Cookiecutter Django
-/// https://github.com/pydanny/cookiecutter-django/blob/master/LICENSE
-
-Copyright (c) 2013-2018, Daniel Roy Greenfeld
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this
-  list of conditions and the following disclaimer in the documentation and/or
-  other materials provided with the distribution.
-
-* Neither the name of Cookiecutter Django nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.