Changes for DEVELOP branch

Author: sshishov

.gitignore

@@ -2,6 +2,13 @@
 /env/
 /venv/
 
+.DS_Store
+.coverage
+.idea
+.module-cache
+.vagrant
+.python-version
+
 # Python compiled byte code
 *.pyc
 
@@ -20,9 +27,6 @@ dist/
 # Staticfiles
 staticfiles/
 
-# PyCharm
-.idea
-
 # npm
 npm-debug.log
 

Makefile

@@ -1,4 +1,4 @@
-.PHONY: test fasttest run lint pep8 eslint
+.PHONY: test fasttest run lint pep8 eslint manage
 
 # Project settings
 LEVEL ?= development
@@ -23,12 +23,41 @@ else
 	PYTHON = $(ENV)/bin/python
 endif
 
+# Gunicorn settings
+GUNICORN_NAME ?= myezh
+GUNICORN_WORKERS ?= $(shell python -c "import multiprocessing; print(multiprocessing.cpu_count() * 2 + 1);")
+LOGS_DIR ?= ./logs
 SERVER_HOST ?= 0.0.0.0
-SERVER_PORT ?= 8000
+SERVER_PORT ?= 8008
+
+# Other settings
+DJANGO_SERVER ?= runserver
+DJANGO_SHELL ?= shell_plus
+
+# Setup bootstrapper & Gunicorn args
+has_bootstrapper = $(shell python -m bootstrapper --version 2>&1 | grep -v "No module")
+ifeq ($(LEVEL),development)
+	bootstrapper_args = -d
+	gunicorn_args = --reload
+	requirements = -r requirements.txt -r requirements-dev.txt
+else
+	gunicorn_args = --access-logfile=$(LOGS_DIR)/gunicorn.access.log \
+	--error-logfile=$(LOGS_DIR)/gunicorn.error.log
+	requirements = -r requirements.txt
+endif
+
+# Enable to install packages from non-HTTPS private PyPI
+PIP_TRUSTED_HOST ?= pypi.ezhome.io
+
+
+# Clean from temporary files
+clean:
+	find ./$(PROJECT)/ $(ENV) -name "*.pyc" -o -type d -empty -exec rm -rf {} +
 
 # Easy testing
-test:
-	python manage.py test
+test: clean pep8
+	$(COVERAGE) run --branch ./$(PROJECT)/manage.py test $(TEST_ARGS)
+	$(COVERAGE) report
 
 # Fast testing
 fasttest:
@@ -38,6 +67,28 @@ fasttest:
 run:
 	python manage.py runserver $(SERVER_HOST):$(SERVER_PORT)
 
+install: install-github-key install-py install-static
+
+install-github-key:
+	ssh-keygen -H -F github.com > /dev/null || ssh-keyscan -H github.com >> ~/.ssh/known_hosts
+
+install-py:
+ifneq ($(has_bootstrapper),)
+	PIP_TRUSTED_HOST=$(PIP_TRUSTED_HOST) python -m bootstrapper -e $(ENV)/ $(bootstrapper_args)
+else
+	[ ! -d "$(ENV)/" ] && virtualenv $(ENV)/ || :
+	PIP_TRUSTED_HOST=$(PIP_TRUSTED_HOST) $(ENV)/bin/pip install $(requirements)
+endif
+
+install-static:
+	npm install
+# 	bower install
+# ifneq ($(CIRCLECI),)
+# 	-bower update
+# else
+# 	bower update
+# endif
+
 # Linter
 lint: pep8
 
@@ -52,3 +103,15 @@ eslint:
 ifeq ($(LEVEL),development)
 	npm run lint
 endif
+
+# Wrapper around manage command
+manage:
+	$(PYTHON) ./$(PROJECT)/manage.py $(COMMAND)
+
+# Development Server
+devserver: clean
+	COMMAND="$(DJANGO_SERVER) $(SERVER_HOST):$(SERVER_PORT)" $(MAKE) manage
+
+# Production Server
+server: clean pep8
+	LEVEL=$(LEVEL) PYTHONPATH=$(PROJECT) $(GUNICORN) -b $(SERVER_HOST):$(SERVER_PORT) -w $(GUNICORN_WORKERS) -n $(GUNICORN_NAME) -t 60 --graceful-timeout 60 $(gunicorn_args) $(GUNICORN_ARGS) $(PROJECT).wsgi:application

circle.yml

@@ -3,25 +3,35 @@ machine:
   environment:
     COVERALLS_REPO_TOKEN: BIJEGOKsEvdhmwdLlC2QMSp1k9tbjwBYk
     DATABASE_URL: postgres://ubuntu:@127.0.0.1:5432/circle_test
-    DJANGO_SETTINGS_MODULE: django_and_angular.settings
+    DJANGO_SETTINGS_MODULE: django_and_angular.settings.development
     LEVEL: development
-
   timezone:
-    Russia/Moscow # Set the timezone
-
-  # Version of ruby to use
+    America/Los_Angeles
+  node:
+    version: 5.5.0
   python:
-    version:
-      2.7.11
+    version: 2.7.10
+  services:
+    - postgresql
+
+dependencies:
+  cache_directories:
+    - bower_components
+    - node_modules
+    - webpack/.babel_cache
+  override:
+    - pip install -U pip wheel
+    - make install
 
 test:
   override:
-    - TEST_ARGS=--with-xunit make lint test
+    - TEST_ARGS='--with-xunit --with-json-extended' make lint test
 
   post:
-    - coveralls
+    # - coveralls
     - mkdir -p $CIRCLE_TEST_REPORTS/junit/
     - "[ -r nosetests.xml ] && mv nosetests.xml $CIRCLE_TEST_REPORTS/junit/ || :"
+    - "[ -r nosetests.json ] && mv nosetests.json $CIRCLE_TEST_REPORTS/junit/ || :"
 
 #  # Override /etc/hosts
 #  hosts:

nosetests.xml

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><testsuite name="nosetests" tests="2" errors="0" failures="0" skip="0"><testcase classname="authentication.tests.AuthenticationTestCase" name="test_failure" time="0.000"></testcase><testcase classname="authentication.tests.AuthenticationTestCase" name="test_success" time="0.000"></testcase></testsuite>

requirements-dev.txt

@@ -1,6 +1,13 @@
+coverage==4.0
+coveralls==1.0
+django-nose==1.4.2
 flake8==2.3.0
 flake8-import-order==0.5.3
 flake8-pep257==1.0.3
+https://github.com/zheller/flake8-quotes/tarball/aef86c4f8388e790332757e5921047ad53160a75#egg=flake8-quotes
+nose==1.3.7
+nosetests-json-extended==0.1.0
 pep257==0.6.0
 pep8==1.6.2
 pep8-naming==0.3.3
+pyflakes==1.0.0

requirements.txt

@@ -1,11 +1,12 @@
-Django==1.7.1
+Django==1.8.4
 dj-database-url==0.3.0
 dj-static==0.0.6
 django-appconf==0.6
 django-compressor==1.4
 djangorestframework==3.0.0
 drf-nested-routers==0.9.0
 gunicorn==19.1.1
+psycopg2==2.6.1
 raven==5.10.2
 six==1.8.0
 static3==0.5.1

src/authentication/tests.py

@@ -1 +1,11 @@
-# Create your tests here.
+from django.test import TestCase
+
+
+class AuthenticationTestCase(TestCase):
+
+    def test_success(self):
+        pass
+
+    def test_failure(self):
+        # self.fail('Failed test')
+        pass

src/django_and_angular/settings/__init__.py

@@ -8,17 +8,18 @@
 https://docs.djangoproject.com/en/1.7/ref/settings/
 """
 
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
-BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
+import dj_database_url
+
+
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
+
+TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
 
-# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = '$6(x*g_2g9l_*g8peb-@anl5^*8q!1w)k&e&2!i)t6$s8kia94'
-
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = os.environ.get('DEBUG', True)
 
@@ -60,8 +61,6 @@
 # Database
 # https://docs.djangoproject.com/en/1.7/ref/settings/#databases
 
-import dj_database_url
-
 DATABASES = {
     'default': dj_database_url.config(
         default='sqlite:///' + os.path.join(BASE_DIR, 'db.sqlite3')
@@ -86,7 +85,7 @@
 # https://docs.djangoproject.com/en/1.7/howto/static-files/
 
 STATIC_URL = '/static/'
-STATIC_ROOT = 'staticfiles'
+STATIC_ROOT = 'static/'
 
 STATICFILES_DIRS = (
     os.path.join(BASE_DIR, 'static'),

src/django_and_angular/settings.py renamed to src/django_and_angular/settings/defaults.py

@@ -0,0 +1,10 @@
+from .injector import inject_settings
+
+
+inject_settings(
+    'django_and_angular.settings.defaults',
+    locals()
+)
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = '$6(x*g_2g9l_*g8peb-@anl5^*8q!1w)k&e&2!i)t6$s8kia94'

src/django_and_angular/settings/development.py

@@ -0,0 +1,19 @@
+from importlib import import_module
+
+
+def inject_settings(path, context, fail_silently=False):
+    """Inject settings from module at path to the given context.
+
+    Do not raise an Import Error when fail silently enabled.
+    """
+    try:
+        module = import_module(path)
+    except ImportError:
+        if fail_silently:
+            return
+        raise
+
+    for attr in dir(module):
+        if attr[0] == '_' or not attr.isupper():
+            continue
+        context[attr] = getattr(module, attr)

src/django_and_angular/settings/injector.py

@@ -1,12 +1,13 @@
 #!/usr/bin/env python
+# flake8: noqa
+
 import os
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault(
-        "DJANGO_SETTINGS_MODULE",
-        "django_and_angular.settings"
-    )
+    level = os.environ.get('LEVEL') or 'development'
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE',
+                          'django_and_angular.settings.{0}'.format(level))
 
     from django.core.management import execute_from_command_line
 

src/manage.py

@@ -1,9 +1,9 @@
 from rest_framework import permissions, viewsets
 from rest_framework.response import Response
 
-from posts.models import Post
-from posts.permissions import IsAuthorOfPost
-from posts.serializers import PostSerializer
+from .models import Post
+from .permissions import IsAuthorOfPost
+from .serializers import PostSerializer
 
 
 class PostViewSet(viewsets.ModelViewSet):

src/posts/views.py

@@ -26,7 +26,6 @@
       isAuthenticated: isAuthenticated,
       login: login,
       logout: logout,
-      register: register,
       setAuthenticatedAccount: setAuthenticatedAccount,
       unauthenticate: unauthenticate
     };