make change for refactor

Makefile

@@ -0,0 +1,50 @@
+PROJECT_DIR=$(shell pwd)
+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
+
+all: copy_settings virtualenv install create_database
+
+copy_settings:
+	cp $(PROJECT_DIR)/project/local_settings.py.sample $(PROJECT_DIR)/project/local_settings.py
+
+virtualenv:
+	virtualenv -p python3 $(VENV_DIR) --no-site-packages
+
+install: requirements
+
+requirements:
+	$(PIP) install -r $(PROJECT_DIR)/requirements.txt
+
+loaddata:
+	$(PYTHON) manage.py manage.py loaddata data/fixtures.json
+
+create_database:
+	$(PYTHON) manage.py migrate
+
+run:
+	$(PYTHON) manage.py runserver 0.0.0.0:8000
+
+migrations:
+	$(PYTHON) manage.py makemigrations
+
+migrate:
+	$(PYTHON) manage.py migrate
+
+shell:
+	$(PYTHON) manage.py shell
+
+clean_temp:
+	find . -name '*.pyc' -delete
+	rm -rf .coverage dist docs/_build htmlcov MANIFEST
+	rm -rf media/
+
+clean_db:
+	find . -name '*.sqlite3' -delete
+
+clean_venv:
+	rm -rf $(VENV_DIR)
+
+clean: clean_temp clean_venv clean_db

README

@@ -1,8 +0,0 @@
-Документор
-
-
-===
-
-Если не работает локаль ru в autocomplete_light, то значит надо её скомпилировать:
-
-msgfmt django.po --output-file django.mo

README.md

@@ -0,0 +1,30 @@
+# Dokumentor
+
+Сервис для создания и хранения первичных бухгалтерских документов. 
+
+## Установка
+
+### Установка проекта для разработки вручную
+
+Создаем окружение и ставим зависимости
+```bash
+virtualenv --python=python3 env
+source env/bin/activate
+pip install -r requirements.txt
+```
+Создаем локальные настройки
+```bash
+cp project/local_settings.py.sample project/local_settings.py
+```
+
+Накатываем миграции и заполняем базу данных
+```bash
+python manage.py migrate
+```
+### Установка проекта для разработки командой `make`
+
+Для разработки проект можно развернуть выполив 
+```bash
+make
+make run
+```

requirements-py3.txt

@@ -1,75 +0,0 @@
-amqp==2.1.4
-anyjson==0.3.3
-appdirs==1.4.3
-astroid==1.4.9
-backports.functools-lru-cache==1.3
-billiard==3.5.0.2
-celery==4.0.2
-cmsplugin-filer==1.0.0
-configparser==3.5.0
-Django==1.8
-django-appconf==1.0.1
-django-autocomplete-light==2.1.1
-django-classy-tags==0.8.0
-django-cms==3.4.3
-django-debug-toolbar==1.5
-django-eml-email-backend==0.1
-django-filer==1.2.7
-django-filter==0.11.0
-django-formtools==1.0
-django-mptt==0.7.0
-django-polymorphic==1.0.2
-django-sekizai==0.9.0
-django-simple-captcha==0.4.2
-django-treebeard==4.1.0
-djangocms-admin-style==1.2.7
-djangocms-ckeditor-filer==0.2.2
-djangocms-file==0.0.1
-djangocms-flash==0.0.2
-djangocms-googlemap==1.0.0
-djangocms-inherit==0.0.1
-djangocms-link==1.3.5
-djangocms-picture==0.0.2
-djangocms-snippet==1.0.2
-djangocms-teaser==0.0.1
-djangocms-text-ckeditor==2.7.0
-djangocms-video==0.0.1
-easy-thumbnails==2.4.1
-flup==1.0.3.dev20161029
-ghostscript==0.4.1
-gnureadline==6.3.3
-html5lib==1.0b10
-httplib2==0.10.3
-ipython==2.1.0
-isort==4.2.5
-kombu==4.0.2
-lazy-object-proxy==1.2.2
-lxml==3.7.3
-mccabe==0.6.1
-olefile==0.44
-packaging==16.8
-Pillow==4.1.0
-pisa==3.0.33
-psycopg2==2.6
-pylint==1.6.5
-pyparsing==2.2.0
-pyPdf==1.13
-PyPDF2==1.26.0
-python-dateutil==2.6.0
-python-memcached==1.58
-python3-ghostscript==0.5.0
-pytils==0.3
-pytz==2017.2
-reportlab==3.4.0
-simplejson==3.3.1
-six==1.10.0
-sqlparse==0.2.3
-Unidecode==0.4.17
-vine==1.1.3
-webencodings==0.5.1
-Werkzeug==0.12
-wrapt==1.10.10
-xhtml2pdf==0.2b1
-xlrd==1.0.0
-xlutils==2.0.0
-xlwt==1.2.0

requirements.txt

@@ -1,57 +1,75 @@
-Django==1.5.8
+amqp==2.1.4
-Pillow==2.2.1
-South==1.0
-Unidecode==0.4.17
-amqp==1.4.5
 anyjson==0.3.3
-argparse==1.2.1
+appdirs==1.4.3
-billiard==3.3.0.18
+astroid==1.4.9
-celery==3.1.12
+backports.functools-lru-cache==1.3
-cmsplugin-filer==0.10.1
+billiard==3.5.0.2
+celery==4.0.2
+cmsplugin-filer==1.0.0
+configparser==3.5.0
+Django==1.8
 django-appconf==1.0.1
-django-autocomplete-light==1.4.9
+django-autocomplete-light==2.1.1
-django-classy-tags==0.5.1
+django-classy-tags==0.8.0
-django-cms==3.0.10
+django-cms==3.4.3
-django-debug-toolbar==1.2.1
+django-debug-toolbar==1.5
-django-devserver==0.8.0
 django-eml-email-backend==0.1
-django-filer==0.9.9
+django-filer==1.2.7
 django-filter==0.11.0
-django-mptt==0.6.1
+django-formtools==1.0
-django-polymorphic==0.6.1
+django-mptt==0.7.0
-django-sekizai==0.7
+django-polymorphic==1.0.2
+django-sekizai==0.9.0
 django-simple-captcha==0.4.2
-djangocms-admin-style==0.2.2
+django-treebeard==4.1.0
-git+https://github.com/igloox/djangocms-ckeditor-filer.git@799c8e853978d8807e9561295f6abca8172c4443
+djangocms-admin-style==1.2.7
+djangocms-ckeditor-filer==0.2.2
 djangocms-file==0.0.1
 djangocms-flash==0.0.2
-djangocms-googlemap==0.0.5
+djangocms-googlemap==1.0.0
 djangocms-inherit==0.0.1
 djangocms-link==1.3.5
 djangocms-picture==0.0.2
 djangocms-snippet==1.0.2
 djangocms-teaser==0.0.1
-djangocms-text-ckeditor==2.1.6
+djangocms-text-ckeditor==2.7.0
 djangocms-video==0.0.1
-easy-thumbnails==2.2
+easy-thumbnails==2.4.1
-flup==1.0.2
+flup==1.0.3.dev20161029
 ghostscript==0.4.1
-html5lib==0.999
+gnureadline==6.3.3
+html5lib==1.0b10
+httplib2==0.10.3
 ipython==2.1.0
-kombu==3.0.20
+isort==4.2.5
+kombu==4.0.2
+lazy-object-proxy==1.2.2
+lxml==3.7.3
+mccabe==0.6.1
+olefile==0.44
+packaging==16.8
+Pillow==4.1.0
 pisa==3.0.33
 psycopg2==2.6
+pylint==1.6.5
+pyparsing==2.2.0
 pyPdf==1.13
-python-dateutil==2.2
+PyPDF2==1.26.0
-pytils==0.2.3
+python-dateutil==2.6.0
-pytz==2014.4
-reportlab==2.7
-simplejson==3.3.1
-six==1.7.3
-sqlparse==0.1.11
-wsgiref==0.1.2
-xlrd==0.9.2
-xlutils==1.7.1
-xlwt==0.7.5
-
 python-memcached==1.58
+python3-ghostscript==0.5.0
+pytils==0.3
+pytz==2017.2
+reportlab==3.4.0
+simplejson==3.3.1
+six==1.10.0
+sqlparse==0.2.3
+Unidecode==0.4.17
+vine==1.1.3
+webencodings==0.5.1
+Werkzeug==0.12
+wrapt==1.10.10
+xhtml2pdf==0.2b1
+xlrd==1.0.0
+xlutils==2.0.0
+xlwt==1.2.0

requirements.txt.old

@@ -0,0 +1,57 @@
+Django==1.5.8
+Pillow==2.2.1
+South==1.0
+Unidecode==0.4.17
+amqp==1.4.5
+anyjson==0.3.3
+argparse==1.2.1
+billiard==3.3.0.18
+celery==3.1.12
+cmsplugin-filer==0.10.1
+django-appconf==1.0.1
+django-autocomplete-light==1.4.9
+django-classy-tags==0.5.1
+django-cms==3.0.10
+django-debug-toolbar==1.2.1
+django-devserver==0.8.0
+django-eml-email-backend==0.1
+django-filer==0.9.9
+django-filter==0.11.0
+django-mptt==0.6.1
+django-polymorphic==0.6.1
+django-sekizai==0.7
+django-simple-captcha==0.4.2
+djangocms-admin-style==0.2.2
+git+https://github.com/igloox/djangocms-ckeditor-filer.git@799c8e853978d8807e9561295f6abca8172c4443
+djangocms-file==0.0.1
+djangocms-flash==0.0.2
+djangocms-googlemap==0.0.5
+djangocms-inherit==0.0.1
+djangocms-link==1.3.5
+djangocms-picture==0.0.2
+djangocms-snippet==1.0.2
+djangocms-teaser==0.0.1
+djangocms-text-ckeditor==2.1.6
+djangocms-video==0.0.1
+easy-thumbnails==2.2
+flup==1.0.2
+ghostscript==0.4.1
+html5lib==0.999
+ipython==2.1.0
+kombu==3.0.20
+pisa==3.0.33
+psycopg2==2.6
+pyPdf==1.13
+python-dateutil==2.2
+pytils==0.2.3
+pytz==2014.4
+reportlab==2.7
+simplejson==3.3.1
+six==1.7.3
+sqlparse==0.1.11
+wsgiref==0.1.2
+xlrd==0.9.2
+xlutils==1.7.1
+xlwt==0.7.5
+
+python-memcached==1.58