1. Dmitri Lebedev
  2. fastdev-django

Commits

Dmitri Lebedev  committed a8d117a Merge

Merge with makefile-refactor

  • Participants
  • Parent commits e18c93e, 917b35c
  • Branches default

Comments (0)

Files changed (6)

File .hgignore

View file
  • Ignore whitespace
 djangopaths.py
 *.wsgi
 
+syncdb

File Makefile

View file
  • Ignore whitespace
-# Just remember that you need to use real tabs, not spaces, in a Makefile
-
 # Just remember that you need to use real tabs, not spaces, in a Makefile
 
 .PHONY: run
-run: bin/django
-	bin/django runserver 0.0.0.0:8008
+run: bin/django syncdb bin/sass
+	bin/django runserver 0.0.0.0:8000
 
 .PHONY: shell_plus
-shell_plus: bin/django
+shell_plus: bin/django syncdb bin/sass
 	bin/django shell_plus
 
-.PHONY: pyflakes
-pyflakes:
+.PHONY: check_pyflakes
+check_pyflakes: bin/pyflakes
 	find velo -name '*.py' -exec pyflakes {} \;
 
+bin/pyflakes: bin/buildout
+	bin/buildout install pyflakes
+
 bin/django: bin/buildout
 	bin/buildout
 
-bin/buildout: bootstrap.py
+bin/buildout:
 	python bootstrap.py --distribute
 
-init: bin/django
+syncdb: bin/django
 	bin/django syncdb
+	# touch a timestamp file to avoid re-syncing
+	touch syncdb  
 
 .PHONY: make_trans
-make_trans:
+make_trans: bin/django
 	bin/django makemessages -a -e 'html,haml'
 
 .PHONY: compile_trans
-compile_trans:
+compile_trans: bin/django
 	bin/django compilemessages
+
+bin/sass: bin/buildout
+	bin/buildout install sass

File buildout.cfg

View file
  • Ignore whitespace
 # hamlpy needs a patch that this subrepo has
 parts =
 	django
-	rubygems
-	pyflakes
 	pep8
 	cleanup
 
 	hamlpy                # HAML templates. Before a pull request is done, culebron-hamlpy is used.
 	djaml                 # hamlpy loader
 
-[rubygems]
+[sass]
 recipe = rubygemsrecipe
 gems =
 	sass
 project = ${buildout:project}
 
 [versions]
-
 # change these versions when you are sure they will be compatible with your project
 django = 1.3.1
 django-reversion = 1.5.1

File project/settings.py

View file
  • Ignore whitespace
 
 DATABASES = {
 	'default': {
-		'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-		'NAME': '',					  # Or path to database file if using sqlite3.
+		'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+		'NAME': 'development',					  # Or path to database file if using sqlite3.
 		'USER': '',					  # Not used with sqlite3.
 		'PASSWORD': '',				  # Not used with sqlite3.
 		'HOST': '',					  # Set to empty string for localhost. Not used with sqlite3.

File readme.md

View file
  • Ignore whitespace
 
 Clone the project:
 
-    $ hg clone https://hg.bitbucket.org/siberiano/fastdev-django
-    
-Bootstrap & buildout (internet connection needed during the procedure):
+    $ hg clone https://hg.bitbucket.org/siberiano/fastdev-django yourproject
 
-    $ mv fastdev-django my-project
-    $ cd my-project
-    $ make buildout
+If you want to develop your own project, disconnect it from my repo:
+
+    $ rm yourproject/.hg/hgrc
+
+If you want to contribute to fastdev, then don't.
 
 Usage
 =====
 
 **Important**: in this environment, use `bin/django` instead of `manage.py`.
 
-    $ bin/django runserver 0.0.0.0:8000
-
-or
-
+    $ cd yourproject
     $ make run
-    Validating models...
-
-    0 errors found
-    Django version 1.3.1, using settings 'project.development'
-    Development server is running at http://0.0.0.0:8000/
-    Quit the server with CONTROL-C.
-
 
 To add, remove or change the packages, run buildout again:
 
-    $ bin/buildout
-
-or 
-
     $ make buildout
 
-
 Requirements
 ============
 

File readme.ru.md

View file
  • Ignore whitespace
 
     $ hg clone https://hg.bitbucket.org/siberiano/fastdev-django
     
-Запустите bootstrap и buildout (во время работы скриптов нужен интернет):
+Если проект будет жить самостоятельно, удалите связь с репозиторием fastdev:
 
-    $ mv fastdev-django my-project
-    $ cd my-project
-    $ make buildout
+    $ rm yourproject/.hg/hgrc
+
+Если вы хотите участовать в проекте fastdjango, не делайте этого.
 
 Использование
 =====
 
-Когда выполнены bootstrap и buildout, проект готов к работе, можно запускать
+Проект готов к работе, можно запускать
 сервер разработки Джанго.
 
 **Важно**: в этом пакете вместо `manage.py` используется динамически
 собираемый скрипт `bin/django`.
 
-    $ bin/django runserver 0.0.0.0:8000
-
-или
-
     $ make run
-    Validating models...
-
-    0 errors found
-    Django version 1.3.1, using settings 'project.development'
-    Development server is running at http://0.0.0.0:8000/
-    Quit the server with CONTROL-C.
-
 
 Добавив, удалив или изменив пакеты, снова запустите `buildout`:
 
-    $ bin/buildout
-
-или
-
     $ make buildout
 
-
 Требования
 ============