refactor makefile, fixtures

feature/docker
Dmitriy Shesterkin 9 years ago
parent 0ac33cf832
commit 05a3fbd35a
  1. 13
      Makefile
  2. 44
      project/commons/fixtures/cms.json
  3. 0
      project/commons/fixtures/sites.json
  4. 0
      project/customer/fixtures/price.json
  5. 0
      project/docs/fixtures/country.json
  6. 0
      project/docs/fixtures/currency.json
  7. 0
      project/docs/fixtures/measure.json
  8. 2
      project/local_settings.py.skeleton
  9. 2
      project/myauth/fixtures/myauth.json

@ -3,9 +3,9 @@ VENV_DIR?=$(PROJECT_DIR)/env
PIP?=$(VENV_DIR)/bin/pip
PYTHON?=$(VENV_DIR)/bin/python
.PHONY: all clean test run requirements install virtualenv copy_settings
.PHONY: all clean test run requirements install virtualenv copy_settings loaddata
all: copy_settings virtualenv install create_database
all: copy_settings virtualenv install create_database loaddata
copy_settings:
cp $(PROJECT_DIR)/project/local_settings.py.skeleton $(PROJECT_DIR)/project/local_settings.py
@ -19,7 +19,14 @@ requirements:
$(PIP) install -r $(PROJECT_DIR)/requirements.txt
loaddata:
$(PYTHON) manage.py manage.py loaddata data/fixtures.json
$(PYTHON) manage.py loaddata $(PROJECT_DIR)/project/myauth/fixtures/myauth.json
$(PYTHON) manage.py loaddata $(PROJECT_DIR)/project/commons/fixtures/cms.json
$(PYTHON) manage.py loaddata $(PROJECT_DIR)/project/commons/fixtures/djangocms_text_ckeditor.json
$(PYTHON) manage.py loaddata $(PROJECT_DIR)/project/commons/fixtures/sites.json
$(PYTHON) manage.py loaddata $(PROJECT_DIR)/project/customer/fixtures/price.json
$(PYTHON) manage.py loaddata $(PROJECT_DIR)/project/docs/fixtures/country.json
$(PYTHON) manage.py loaddata $(PROJECT_DIR)/project/docs/fixtures/currency.json
$(PYTHON) manage.py loaddata $(PROJECT_DIR)/project/docs/fixtures/measure.json
create_database:
$(PYTHON) manage.py migrate

@ -20,7 +20,7 @@
"changed_by": "admin",
"parent": null,
"creation_date": "2017-04-28T12:45:08.196Z",
"changed_date": "2017-04-28T13:20:42.882Z",
"changed_date": "2017-04-28T19:31:50.501Z",
"publication_date": "2017-04-28T12:45:08.289Z",
"publication_end_date": null,
"in_navigation": true,
@ -55,7 +55,7 @@
"changed_by": "admin",
"parent": null,
"creation_date": "2017-04-28T12:45:08.292Z",
"changed_date": "2017-04-28T13:20:42.824Z",
"changed_date": "2017-04-28T19:31:50.458Z",
"publication_date": "2017-04-28T12:45:08.289Z",
"publication_end_date": null,
"in_navigation": true,
@ -456,7 +456,23 @@
{
"model": "cms.cmsplugin",
"fields": {
"path": "0002",
"path": "0003",
"depth": 1,
"numchild": 0,
"placeholder": 2,
"parent": null,
"position": 1,
"language": "ru",
"plugin_type": "TextPlugin",
"creation_date": "2017-04-28T19:14:40.568Z",
"changed_date": "2017-04-28T19:31:45.727Z"
},
"pk": 4
},
{
"model": "cms.cmsplugin",
"fields": {
"path": "0004",
"depth": 1,
"numchild": 0,
"placeholder": 3,
@ -464,10 +480,26 @@
"position": 0,
"language": "ru",
"plugin_type": "TextPlugin",
"creation_date": "2017-04-28T13:05:41.393Z",
"changed_date": "2017-04-28T13:20:42.787Z"
"creation_date": "2017-04-28T19:31:50.411Z",
"changed_date": "2017-04-28T19:31:50.414Z"
},
"pk": 3
"pk": 5
},
{
"model": "cms.cmsplugin",
"fields": {
"path": "0005",
"depth": 1,
"numchild": 0,
"placeholder": 3,
"parent": null,
"position": 1,
"language": "ru",
"plugin_type": "TextPlugin",
"creation_date": "2017-04-28T19:14:40.568Z",
"changed_date": "2017-04-28T19:31:50.428Z"
},
"pk": 6
},
{
"model": "cms.title",

@ -14,7 +14,7 @@ ALLOWED_HOSTS = ['*']
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': os.path.join(ROOT_DIR, 'db.sqlite3'),
'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
}
}

@ -2,7 +2,7 @@
{
"model": "myauth.dokuser",
"fields": {
"password": "pbkdf2_sha256$20000$4lp35nWDneop$3gGZhdpBKr8qtLTEWpm9bBUGVSq2hIHJ3rKk0B3jIOA=",
"password": "pbkdf2_sha256$20000$DFxqy2ZZbqEX$TEYwNIjSWNcEeUeuo/Mq/gjnpPFNkX+nOte4ZGleu2Y=",
"last_login": "2017-04-28T13:31:41.512Z",
"is_superuser": true,
"username": "admin",
Loading…
Cancel
Save