Skip to content
This repository was archived by the owner on Jul 9, 2020. It is now read-only.

Commit c61e473

Browse files
klenklen
committed
Update django module
1 parent 9016cc8 commit c61e473

File tree

6 files changed

+71
-69
lines changed

6 files changed

+71
-69
lines changed

‎makesite/modules/django/.tests‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎makesite/modules/django/Makefile‎

Lines changed: 45 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,66 @@
11
SETTINGS=dev
2-
STATIC_DIR=../static
3-
SOURCE_DIR=../source
4-
SERVICE_DIR=../service
5-
VIRTUALENV_DIR=../.virtualenv
2+
PROJECT_DIR=$(CURDIR)/..
3+
STATIC_DIR=$(PROJECT_DIR)/static
4+
SOURCE_DIR=$(PROJECT_DIR)/source
5+
SERVICE_DIR=$(PROJECT_DIR)/service
6+
VIRTUALENV_DIR=$(PROJECT_DIR)/.virtualenv
67

7-
run:
8-
# Run local django dev server
9-
./manage.py runserver --settings=settings.$(SETTINGS)
8+
.PHONY: help
9+
# target: help - Display callable targets
10+
help:
11+
@egrep "^# target:" [Mm]akefile
1012

11-
shell:
12-
# Run django project shell
13+
.PHONY: run
14+
# target: run - Run local django dev server
15+
run: $(VIRTUALENV_DIR)
16+
$(CURDIR)/manage.py runserver --settings=settings.$(SETTINGS)
17+
18+
.PHONY: shell
19+
# target: shell - Run django project shell
20+
shell: $(VIRTUALENV_DIR)
1321
./manage.py shell --settings=settings.$(SETTINGS)
1422

15-
test:
16-
# Test project
23+
.PHONY: test
24+
# target: test - Run django project tests
25+
test: $(VIRTUALENV_DIR)
1726
./manage.py test main --settings=settings.test
1827

28+
.PHONY: audit
29+
# target: audit - Audit project code
30+
audit:
31+
pylama $(SOURCE_DIR) -i E501
32+
33+
.PHONY: clean
34+
# target: clean - Clean project files
1935
clean:
20-
# Clean project
2136
find . -name "*.pyc" -delete
2237
find . -name "*.orig" -delete
38+
find $(STATIC_DIR) -name "*.js" -delete
39+
find $(STATIC_DIR) -name "*.css" -delete
2340

24-
clean_static:
25-
sudo rm -rf $(STATIC_DIR)/*.js
26-
sudo rm -rf $(STATIC_DIR)/*.css
27-
sudo rm -rf $(STATIC_DIR)/*/
41+
.PHONY: chown
42+
# target: chown - Set current user as project files owner
43+
chown:
44+
sudo chown -R $(USER):$(USER) $(SOURCE_DIR)
45+
sudo chown -R $(USER):$(USER) $(STATIC_DIR)
46+
sudo chown -R $(USER):$(USER) $(VIRTUALENV_DIR)
2847

29-
update: static ve_update restart chown
48+
.PHONY: update
49+
# target: update - Compile static and restart service
50+
update: $(VIRTUALENV_DIR) $(SOURCE_DIR) restart chown
3051

31-
static: chown collect zeta
52+
.PHONY: static
53+
# target: static - Compile static
54+
static: $(SOURCE_DIR)
3255

56+
.PHONY: restart
57+
# target: restart - Restart service
3358
restart:
3459
$(SERVICE_DIR)/supervisor_update.sh
3560

36-
ve_update:
61+
$(VIRTUALENV_DIR): requirements.txt
3762
$(SERVICE_DIR)/virtualenv_update.sh
3863

39-
chown:
40-
sudo chown -R $(USER):$(USER) $(STATIC_DIR)
41-
sudo chown -R $(USER):$(USER) $(SOURCE_DIR)
42-
sudo chown -R $(USER):$(USER) $(VIRTUALENV_DIR)
43-
44-
collect:
64+
$(SOURCE_DIR): chown
4565
./manage.py collectstatic --noinput --settings=settings.$(SETTINGS)
46-
47-
zeta:
4866
zeta $(STATIC_DIR)

‎makesite/modules/django/initial_data.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
"model": "auth.user",
44
"pk": 1,
55
"fields": {
6-
"username": "admin",
7-
"first_name": "John",
8-
"last_name": "Driver",
9-
"is_active": true,
10-
"is_superuser": true,
11-
"is_staff": true,
12-
"last_login": "2010-01-01 00:00:00",
13-
"groups": [],
14-
"user_permissions": [],
15-
"password": "sha1$bb19a$51b2bac8dd83c30e6cf6694bf3049241a14124ea",
16-
"email": "[email protected]",
6+
"username": "admin",
7+
"first_name": "John",
8+
"last_name": "Driver",
9+
"is_active": true,
10+
"is_superuser": true,
11+
"is_staff": true,
12+
"last_login": "2010-01-01 00:00:00",
13+
"groups": [],
14+
"user_permissions": [],
15+
"password": "sha1$bb19a$51b2bac8dd83c30e6cf6694bf3049241a14124ea",
16+
"email": "[email protected]",
1717
"date_joined": "2010-01-01 00:00:00"
1818
}
1919
}

‎makesite/modules/django/requirements.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# Base
2+
# ----
3+
Django==1.4.1
4+
South==0.7.6
25
wsgiref==0.1.2
36

4-
# Django base
5-
Django==1.4
6-
South==0.7.4
7-
87
# Debug
8+
# -----
99
django-debug-toolbar==0.9.4
10+
ipdb==0.7
1011
Werkzeug==0.8.3

‎makesite/modules/django/settings/__init__.py‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,6 @@
1-
" Get base dirs and parse makesite.ini if exists. "
2-
import os.path
1+
from os import path as op
32

43

5-
PROJECT_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
6-
DEVZONE_ROOT = os.path.dirname(PROJECT_ROOT)
7-
CONFIG_FILE = os.path.join(DEVZONE_ROOT, 'makesite.ini')
8-
9-
10-
# Load configs from project ini file (sitegen generated)
11-
if os.path.exists(CONFIG_FILE):
12-
import ConfigParser
13-
parser = ConfigParser.RawConfigParser()
14-
parser.read(CONFIG_FILE)
15-
V = dict(parser.items('Main'))
16-
17-
else:
18-
V = dict()
19-
20-
21-
PROJECT_NAME = "%s.%s" % (
22-
V.get('project', 'undefined'), V.get('branch', 'master'))
4+
SOURCE_DIR = op.abspath(op.dirname(op.dirname(__file__)))
5+
PROJECT_DIR = op.dirname(SOURCE_DIR)
6+
PROJECT_NAME = "%s.%s" % (op.basename(op.dirname(PROJECT_DIR)), op.basename(PROJECT_DIR))

‎makesite/modules/django/settings/core.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
" Common settings for all project. "
2-
import os
2+
from os import path as op, walk
33
import logging
44

5-
from settings import PROJECT_ROOT, DEVZONE_ROOT, PROJECT_NAME
5+
from settings import SOURCE_DIR, PROJECT_DIR, PROJECT_NAME
66

77

88
SECRET_KEY = "RedefineME.%s" % PROJECT_NAME
@@ -30,16 +30,16 @@
3030
ROOT_URLCONF = 'main.urls'
3131

3232
# Media settigns
33-
MEDIA_ROOT = os.path.join(DEVZONE_ROOT, 'media')
34-
STATIC_ROOT = os.path.join(DEVZONE_ROOT, 'static')
33+
MEDIA_ROOT = op.join(PROJECT_DIR, 'media')
34+
STATIC_ROOT = op.join(PROJECT_DIR, 'static')
3535
MEDIA_URL = '/media/'
3636
STATIC_URL = '/static/'
3737

3838
# Templates settings
3939
TEMPLATE_DIRS = ()
40-
for root, dirs, files in os.walk(PROJECT_ROOT, followlinks=True):
40+
for root, dirs, files in walk(SOURCE_DIR, followlinks=True):
4141
if 'templates' in dirs:
42-
TEMPLATE_DIRS += (os.path.join(root, 'templates'),)
42+
TEMPLATE_DIRS += (op.join(root, 'templates'),)
4343

4444
TEMPLATE_LOADERS = (
4545
'django.template.loaders.filesystem.Loader',

0 commit comments

Comments
 (0)