Refactoring to look like real repo

Author: sshishov

Diff for: .coveragerc

@@ -0,0 +1,5 @@
+[run]
+source = .
+
+[report]
+omit = *venv/*

Diff for: .gitignore

@@ -1,3 +1,7 @@
+# environment
+/env/
+/venv/
+
 # Python compiled byte code
 *.pyc
 

Diff for: Makefile

@@ -0,0 +1,54 @@
+.PHONY: test fasttest run lint pep8 eslint
+
+# Project settings
+LEVEL ?= development
+PROJECT = src
+
+# Virtual environment settings
+ENV ?= ./venv
+VENV = $(shell python -c "import sys; print(int(hasattr(sys, 'real_prefix')));")
+
+# Python commands
+ifeq ($(VENV),1)
+	ANSIBLE_PLAYBOOK = ansible-playbook
+	COVERAGE = coverage
+	FLAKE8 = flake8
+	GUNICORN = gunicorn
+	PYTHON = python
+else
+	ANSIBLE_PLAYBOOK = $(ENV)/bin/ansible-playbook
+	COVERAGE = ${ENV}/bin/coverage
+	FLAKE8 = $(ENV)/bin/flake8
+	GUNICORN = $(ENV)/bin/gunicorn
+	PYTHON = $(ENV)/bin/python
+endif
+
+SERVER_HOST ?= 0.0.0.0
+SERVER_PORT ?= 8000
+
+# Easy testing
+test:
+	python manage.py test
+
+# Fast testing
+fasttest:
+	REUSE_DB=1 $(MAKE) test
+
+# Run server
+run:
+	python manage.py runserver $(SERVER_HOST):$(SERVER_PORT)
+
+# Linter
+lint: pep8
+
+# PEP8 code style
+pep8:
+ifeq ($(LEVEL),development)
+	$(FLAKE8) --statistics ./$(PROJECT)/
+endif
+
+# JavaScript linter
+eslint:
+ifeq ($(LEVEL),development)
+	npm run lint
+endif

Diff for: authentication/admin.py

@@ -0,0 +1,87 @@
+## Customize the test machine
+machine:
+  environment:
+    COVERALLS_REPO_TOKEN: BIJEGOKsEvdhmwdLlC2QMSp1k9tbjwBYk
+    DATABASE_URL: postgres://ubuntu:@127.0.0.1:5432/circle_test
+    DJANGO_SETTINGS_MODULE: django_and_angular.settings
+    LEVEL: development
+
+  timezone:
+    Russia/Moscow # Set the timezone
+
+  # Version of ruby to use
+  python:
+    version:
+      2.7.11
+
+test:
+  override:
+    - TEST_ARGS=--with-xunit make lint test
+
+  post:
+    - coveralls
+    - mkdir -p $CIRCLE_TEST_REPORTS/junit/
+    - "[ -r nosetests.xml ] && mv nosetests.xml $CIRCLE_TEST_REPORTS/junit/ || :"
+
+#  # Override /etc/hosts
+#  hosts:
+#    circlehost: 127.0.0.1
+#    dev.mycompany.com: 127.0.0.1
+
+#  # Add some environment variables
+#  environment:
+#    CIRCLE_ENV: test
+#    DATABASE_URL: postgres://ubuntu:@127.0.0.1:5432/circle_test
+
+### Customize checkout
+#checkout:
+#  post:
+#    - git submodule sync
+#    - git submodule update --init # use submodules
+
+## Customize dependencies
+#dependencies:
+#  pre:
+#    - npm install coffeescript # install from a different package manager
+#    - gem uninstall bundler # use a custom version of bundler
+#    - gem install bundler --pre
+
+#  override:
+#    - bundle install: # note ':' here
+#        timeout: 180 # fail if command has no output for 3 minutes
+
+  # we automatically cache and restore many dependencies between
+  # builds. If you need to, you can add custom paths to cache:
+#  cache_directories:
+#    - "custom_1"   # relative to the build directory
+#    - "~/custom_2" # relative to the user's home directory
+
+## Customize database setup
+#database:
+#  override:
+#    # replace CircleCI's generated database.yml
+#    - cp config/database.yml.ci config/database.yml
+#    - bundle exec rake db:create db:schema:load
+
+## Customize test commands
+#test:
+#  override:
+#    - phpunit test/unit-tests # use PHPunit for testing
+#  post:
+#    - bundle exec rake jasmine:ci: # add an extra test type
+#        environment:
+#          RAILS_ENV: test
+#          RACK_ENV: test
+
+## Customize deployment commands
+#deployment:
+#  staging:
+#    branch: master
+#    heroku:
+#      appname: foo-bar-123
+
+## Custom notifications
+#notify:
+#  webhooks:
+#    # A list of hashes representing hooks. Only the url field is supported.
+#    - url: https://someurl.com/hooks/circle

Diff for: authentication/tests.py

@@ -0,0 +1,6 @@
+flake8==2.3.0
+flake8-import-order==0.5.3
+flake8-pep257==1.0.3
+pep257==0.6.0
+pep8==1.6.2
+pep8-naming==0.3.3

Diff for: circle.yml

@@ -6,6 +6,7 @@ django-compressor==1.4
 djangorestframework==3.0.0
 drf-nested-routers==0.9.0
 gunicorn==19.1.1
+raven==5.10.2
 six==1.8.0
 static3==0.5.1
 wsgiref==0.1.2

Diff for: posts/admin.py

@@ -0,0 +1,8 @@
+[flake8]
+application-import-names=
+    authentication,
+    django_and_angular,
+    posts
+exclude=src/django_and_angular/settings.py,migrations
+ignore=D100,D101,D102,D103,D205,D400,N802
+import-order-style=google

Diff for: posts/tests.py

@@ -0,0 +1 @@
+# Register your models here.

Diff for: requirements-dev.txt

@@ -1,8 +1,7 @@
 from django.contrib.auth import update_session_auth_hash
-
 from rest_framework import serializers
 
-from authentication.models import Account
+from .models import Account
 
 
 class AccountSerializer(serializers.ModelSerializer):
@@ -20,7 +19,9 @@ def create(self, validated_data):
             return Account.objects.create(**validated_data)
 
         def update(self, instance, validated_data):
-            instance.username = validated_data.get('username', instance.username)
+            instance.username = validated_data.get(
+                'username', instance.username
+            )
             instance.tagline = validated_data.get('tagline', instance.tagline)
 
             instance.save()

Diff for: requirements.txt

@@ -0,0 +1 @@
+# Create your tests here.

Diff for: setup.cfg

@@ -2,7 +2,7 @@
 
 from django.contrib.auth import authenticate, login, logout
 
-from rest_framework import permissions, viewsets, status, views
+from rest_framework import permissions, status, views, viewsets
 from rest_framework.response import Response
 
 from authentication.models import Account
@@ -30,7 +30,10 @@ def create(self, request):
         if serializer.is_valid():
             Account.objects.create_user(**serializer.validated_data)
 
-            return Response(serializer.validated_data, status=status.HTTP_201_CREATED)
+            return Response(
+                serializer.validated_data,
+                status=status.HTTP_201_CREATED
+            )
 
         return Response({
             'status': 'Bad request',

Diff for: authentication/__init__.py renamed to src/authentication/__init__.py

@@ -1,11 +1,12 @@
-from django.conf.urls import patterns, url, include
-
-from django_and_angular.views import IndexView
+from django.conf.urls import include, patterns, url
 from rest_framework_nested import routers
 
 from authentication.views import AccountViewSet, LoginView, LogoutView
 from posts.views import AccountPostsViewSet, PostViewSet
 
+from .views import IndexView
+
+
 router = routers.SimpleRouter()
 router.register(r'accounts', AccountViewSet)
 router.register(r'posts', PostViewSet)
@@ -17,7 +18,7 @@
 
 
 urlpatterns = patterns(
-     '',
+    '',
     url(r'^api/v1/', include(router.urls)),
     url(r'^api/v1/auth/login/$', LoginView.as_view(), name='login'),
     url(r'^api/v1/auth/logout/$', LogoutView.as_view(), name='logout'),

Diff for: src/authentication/admin.py

@@ -1,6 +1,6 @@
+from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import ensure_csrf_cookie
 from django.views.generic.base import TemplateView
-from django.utils.decorators import method_decorator
 
 
 class IndexView(TemplateView):

Diff for: authentication/migrations/0001_initial.py renamed to src/authentication/migrations/0001_initial.py

@@ -1,3 +1,4 @@
+# flake8: noqa
 """
 WSGI config for DjangoAndAngular project.
 
@@ -11,6 +12,6 @@
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "django_and_angular.settings")
 
 from django.core.wsgi import get_wsgi_application
-from dj_static import Cling
+from raven.contrib.django.raven_compat.middleware.wsgi import Sentry
 
-application = Cling(get_wsgi_application())
+application = Sentry(get_wsgi_application())

Diff for: authentication/migrations/__init__.py renamed to src/authentication/migrations/__init__.py

@@ -3,7 +3,10 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "django_and_angular.settings")
+    os.environ.setdefault(
+        "DJANGO_SETTINGS_MODULE",
+        "django_and_angular.settings"
+    )
 
     from django.core.management import execute_from_command_line
 

Diff for: authentication/models.py renamed to src/authentication/models.py

@@ -0,0 +1 @@
+# Register your models here.

Diff for: authentication/permissions.py renamed to src/authentication/permissions.py

@@ -1,7 +1,8 @@
 from rest_framework import serializers
 
 from authentication.serializers import AccountSerializer
-from posts.models import Post
+
+from .models import Post
 
 
 class PostSerializer(serializers.ModelSerializer):

Diff for: authentication/serializers.py renamed to src/authentication/serializers.py

@@ -0,0 +1 @@
+# Create your tests here.

Diff for: src/authentication/tests.py

@@ -16,7 +16,7 @@ def get_permissions(self):
         return (permissions.IsAuthenticated(), IsAuthorOfPost(),)
 
     def perform_create(self, serializer):
-        instance = serializer.save(author=self.request.user)
+        serializer.save(author=self.request.user)
         return super(PostViewSet, self).perform_create(serializer)