Merge pull request #36 from CheesecakeLabs/bernardo/pipenv-to-pip

Change dependency manager back to pip + requirements file

Dockerfile

@@ -1,10 +1,11 @@
-FROM python:3.6-jessie
+FROM python:3.7-alpine
+
+RUN apk update && apk add build-base postgresql-dev
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 COPY . /usr/src/app
 
-RUN pip install --upgrade pip pipenv
-RUN set -ex && pipenv install --deploy --system
+RUN  pip install -r requirements.txt
 
 ENTRYPOINT ["sh", "docker-entrypoint.sh"]

README.md

@@ -1,20 +1,22 @@
 <img src="https://s3-us-west-2.amazonaws.com/ckl-generic-hosting/cheesecake-logo-blue.png" height="60">
 
-# django-drf-boilerplate
+# Django DRF Boilerplate
 Boilerplate project using Django and Django REST Framework.
 Currently supporting only Python 3.x.
 
 **IMPORTANT**:
-Make sure you have Django 2.0 installed on your environment.
 Docker Compose is used *just* for development environment. The Dockerfile works without it.
 
-## How to install
+## How to install with Pyenv
 
 ```bash
+$ pyenv virtualenv 3.7.3 <project_name>
+$ pyenv activate <project_name>
+$ pip install Django==2.2.2
 $ django-admin.py startproject \
   --template=https://github.com/CheesecakeLabs/django-drf-boilerplate/archive/master.zip \
   <project_name> .
-$ pip install -r requirements.txt
+$ pip install -r requirements/dev.txt
 $ python src/manage.py runserver
 ```
 
@@ -27,19 +29,12 @@ $ django-admin.py startproject \
 $ docker-compose up
 ```
 
-## Install git pre-commit hook
-Check code syntax and style before commit changes.
+## Install Black code formatter to your editor
+Check code syntax and style before committing changes.
 
-After initializing git, add flake8 hook.
+Or run it manually:
 ```bash
-$ git init
-$ python -m flake8 --install-hook git
-```
-
-Set flake8 strict parameter to true, this forces all violations to be fixed
-before the commit.
-```bash
-$ git config --bool flake8.strict true
+$ black .
 ```
 
 ## Database

docker-compose.yml

@@ -10,7 +10,7 @@ services:
       ENV: development
 
   db:
-    image: postgres:9.6.6
+    image: postgres:11
     ports:
       - 5432:5432
     volumes:

docker-entrypoint.sh

@@ -1,16 +1,14 @@
 #!/bin/bash
 set -e
 
-if [ "$ENV" = "development" ] || [ "$ENV" = "staging" ] ; then
-    pipenv install --dev --system
+if [ "$ENV" = "development" ] ; then
+    python docker/web/check_db.py --service-name postgres --ip db --port 5432
 fi
 
 if [ "$1" = "manage" ]; then
     shift 1
     exec python src/manage.py "$@"
 else
-    python docker/web/check_db.py --service-name Postgres --ip db --port 5432
-
     python src/manage.py migrate                  # Apply database migrations
     python src/manage.py collectstatic --noinput  # Collect static files
 

docker/web/check_db.py

@@ -1,13 +1,15 @@
 import socket
 import time
 import argparse
+
 """ Check if port is open, avoid docker-compose race condition """
 
-parser = argparse.ArgumentParser(description='Check if port is open, avoid\
-                                 docker-compose race condition')
-parser.add_argument('--service-name', required=True)
-parser.add_argument('--ip', required=True)
-parser.add_argument('--port', required=True)
+parser = argparse.ArgumentParser(
+    description="Check if port is open, avoid docker-compose race condition"
+)
+parser.add_argument("--service-name", required=True)
+parser.add_argument("--ip", required=True)
+parser.add_argument("--port", required=True)
 
 args = parser.parse_args()
 

requirements.txt

@@ -0,0 +1 @@
+-r requirements/base.txt

requirements/base.txt

@@ -0,0 +1,15 @@
+# Django
+Django==2.2.2
+django-environ==0.4.5
+
+# Auth
+cklauth==0.4.0
+
+# Database
+psycopg2==2.8.2
+
+# Static files
+whitenoise==4.1.2
+
+# Webserver
+gunicorn==19.9.0

requirements/dev.txt

@@ -0,0 +1,3 @@
+-r base.txt
+
+ black==19.3b0