settings, requirements

remotes/origin/upgrade-requirements
Dmitriy Shesterkin 9 years ago
parent b06fba71f4
commit ca2db7b936
  1. 4
      .bowerrc
  2. 37
      .editorconfig
  3. 3
      .gitignore
  4. 16
      app/__init__.py
  5. 28
      app/local.py.example
  6. 11
      bower.json
  7. 1
      requirements.txt
  8. 1
      requirements/common.txt
  9. 3
      requirements/dev.txt
  10. 1
      requirements/prod.txt

@ -0,0 +1,4 @@
{
"directory" : "static/vendor",
"json" : "bower.json"
}

@ -0,0 +1,37 @@
# For more information about the properties used in
# this file, please see the EditorConfig documentation:
# http://editorconfig.org/
root = true
[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true
[{*.scss, *.css}]
charset = utf-8
end_of_line = lf
indent_size = 2
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true
[*.md]
trim_trailing_whitespace = false
[*.html]
indent_size = 2
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true
[{.travis.yml, package.json}]
# The indent size used in the `package.json` file cannot be changed
# https://github.com/npm/npm/pull/3180#issuecomment-16336516
indent_size = 2
indent_style = space

3
.gitignore vendored

@ -2,3 +2,6 @@
zsite/static/vendor/ zsite/static/vendor/
_env/ _env/
media/ media/
app/local.py
/static/vendor/

@ -0,0 +1,16 @@
# -*- coding: utf-8 -*-
import sys
from .settings import *
try:
from .local import *
except ImportError:
print("Can't find module settings.local! Make it from local.py.example")
# if manage.py test was called, use test settings
if 'test' in sys.argv or 'jenkins' in sys.argv:
try:
from .testing import *
except ImportError:
pass

@ -0,0 +1,28 @@
# -*- coding: utf-8 -*-
from .settings import INSTALLED_APPS
# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = '...'
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
INSTALLED_APPS += ('debug_toolbar', )
MIDDLEWARE_CLASSES += ['debug_toolbar.middleware.DebugToolbarMiddleware', ]
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.mysql',
'NAME': u'...',
'USER': u'...',
'PASSWORD': u'...',
'HOST': '',
'PORT': '',
}
}
ALLOWED_HOSTS = ['127.0.0.1']

@ -0,0 +1,11 @@
{
"name": "zuykov",
"version": "0.1.0",
"dependencies": {
"angular": "1.3.6",
"bootstrap": "3.3.5",
"angular-bootstrap": "~0.10.0",
"jquery.inputmask": "*",
"font-awesome": "^4.7.0"
}
}

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

@ -12,7 +12,6 @@ django-appconf==1.0.1
django-appdata==0.1.4 django-appdata==0.1.4
django-classy-tags==0.6.2 django-classy-tags==0.6.2
django-cms==3.1.3 django-cms==3.1.3
django-debug-toolbar==1.4
django-durationfield==0.5.2 django-durationfield==0.5.2
django-easy-select2==1.3.3 django-easy-select2==1.3.3
django-filer==0.9.12 django-filer==0.9.12

@ -0,0 +1,3 @@
-r common.txt
django-debug-toolbar==1.4
deployer-0.3.10

@ -0,0 +1 @@
-r common.txt
Loading…
Cancel
Save