plerpingsystem

.gitignore

@@ -56,4 +56,4 @@ Thumbs.db
 Desktop.ini
 
 # Project settings
-site/
+./site/

.travis.yml

@@ -1,6 +1,5 @@
 language: python
 python:
-  - "2.7"
   - "3.4"
 install:
   - pip install -r requirements.txt
@@ -10,4 +9,4 @@ install:
   - cp my_proj/settings/local.sample.env my_proj/settings/local.env
   - python manage.py migrate
 script:
-  - python manage.py test profiles
+  - python manage.py test profiles

Pipfile

@@ -0,0 +1,26 @@
+[[source]]
+
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+
+[packages]
+
+django = ">=2.0"
+django-environ = ">=0.4.3"
+django-braces = ">=1.12.0"
+django-crispy-forms = ">=1.7.2"
+django-authtools = ">=1.6.0"
+easy-thumbnails = ">=2.4.1"
+
+
+[dev-packages]
+
+django-debug-toolbar = ">=1.8"
+werkzeug = ">=0.12.2"
+
+
+[requires]
+
+python_version = "3"

README.md

@@ -2,31 +2,63 @@
 
 # [Edge][docs]
 
-[![Build Status](https://travis-ci.org/arocks/edge.svg?branch=1_8)](https://travis-ci.org/arocks/edge)
+[![Build Status](https://travis-ci.org/arocks/edge.svg?branch=master)](https://travis-ci.org/arocks/edge)
 
 **A Fantastic Django project starter.**
 
 ## Features
 
 * Ready Bootstrap-themed pages
 * User Registration/Sign up
-* Better Security with [12-Factor](http://12factor.net/) recommendations 
+* Better Security with [12-Factor](http://12factor.net/) recommendations
 * Logging/Debugging Helpers
-* Works on Python 2.7 or 3.4
+* Works on Python 3 and Django 2
+* Formatted with [Black](https://github.com/ambv/black)
+
+More information at: [http://django-edge.readthedocs.org/][docs]
+Contribute using: [Edge Dev Tools](https://github.com/arocks/edge-devtools)  ✨ 🍰 ✨
+
+[docs]: http://django-edge.readthedocs.org/
 
 ## Quick start:
 
+Before creating a new project from this template, you need to create a fresh virtual environment and install Django:
+
+1. `$ python -m venv ./myenv`
+2. `$ source ./myenv/bin/activate.fish` (use the appropriate activate script based on your shell)
+3. `$ python -m pip install -U pip django`
+
+Create your new _edgy_ django project:
+
 1. `$ django-admin.py startproject --template=https://github.com/arocks/edge/archive/master.zip --extension=py,md,html,env my_proj`
 2. `$ cd my_proj`
 3. `$ pip install -r requirements.txt `
 4. `$ cd src`
-5. `$ cp my_proj/settings/local.sample.env my_proj/settings/local.env` (New!)
+5. `$ cp my_proj/settings/local.sample.env my_proj/settings/local.env`
 6. `$ python manage.py migrate`
+7. `$ python manage.py createsuperuser`
+8. `$ python manage.py runserver`
 
-More information at: [http://django-edge.readthedocs.org/][docs]
 
+## Recommended Installation (with `pipenv`)
+1. `$ pip install --user --upgrade pipenv` ([Install pipenv system-wide or locally](https://docs.pipenv.org/) but outside a virtualenv)
+2. `$ mkdir my_proj` (choose a better name than `my_proj` for your project)
+3. `$ django-admin.py startproject --template=https://github.com/arocks/edge/archive/master.zip --extension=py,md,html,env my_proj .`
 
-[docs]: http://django-edge.readthedocs.org/
+    If you get an SSL error, then download the zip file and mention it after `--template=`, like this: `django-admin.py startproject --template=~/Downloads/master.zip --extension=py,md,html,env my_proj .`
+4. `$ pipenv install --dev`
+5. `$ pipenv shell`
+6. `$ cp src/my_proj/settings/local.sample.env src/my_proj/settings/local.env` (or rename this file)
+7. `$ cd src`
+8. `$ python manage.py migrate`
+9. `$ python manage.py createsuperuser`
+10. `$ python manage.py runserver`
+
+If you need to keep `requirements.txt` updated then run
+
+    pipenv lock --requirements > requirements/base.txt
+    echo "-r base.txt" > requirements/development.txt
+    pipenv lock --requirements --dev >> requirements/development.txt
 
 Rest of this README will be copied to the generated project.
 

requirements/base.txt

@@ -1,7 +1,8 @@
-Django>=1.8
-django-environ>=0.3.0
-django-braces>=1.8.0
-django-crispy-forms>=1.4.0
-django-admin-bootstrapped>=2.4.0
-django-authtools>=1.2.0
-easy-thumbnails>=2.2
+django-authtools==1.6.0
+django-braces==1.13.0
+django-crispy-forms==1.7.2
+django-environ==0.4.5
+django==2.0.9
+easy-thumbnails==2.5
+pillow==8.1.2
+pytz==2018.7

requirements/development.txt

@@ -1,3 +1,5 @@
+-i https://pypi.python.org/simple
 -r base.txt
-django-debug-toolbar>=1.3.0
-Werkzeug>=0.10.1
+django-debug-toolbar==1.10.1
+sqlparse==0.2.4
+werkzeug==0.14.1

requirements/production.txt

@@ -1,5 +1,6 @@
+-i https://pypi.python.org/simple
 -r base.txt
 
 # Extra stuff required for production like Prod Database interfacing packages
 # psycopg2
-
+django[argon2]