Browse files

Small improvements around packaging (thanks @benoitbryon)

  • Loading branch information...
1 parent fe3a862 commit b45ce310ae3810c028229d44c4719ec39c6fba79 @leplatrem leplatrem committed Feb 29, 2012
Showing with 26 additions and 13 deletions.
  1. +6 −0 .gitignore
  2. +10 −6 example/buildout.cfg
  3. +3 −0 example/conf/local_settings.py.in
  4. +3 −3 example/setup.py
  5. +2 −0 requirements.txt
  6. +2 −4 setup.py
View
6 .gitignore
@@ -4,6 +4,12 @@
build
dist
eggs
+parts
develop-eggs
*.egg-info
.installed.cfg
+
+# example project
+example/bin
+example/etc
+
View
16 example/buildout.cfg
@@ -14,11 +14,7 @@ extra-paths =
versions = versions
eggs =
gunicorn
- django
livembtiles
- django-mbtiles
- easydict
- landez
[django]
recipe = isotoma.recipe.django
@@ -43,8 +39,8 @@ bind = 127.0.0.1
port = 8000
workers = 4
user = www-data
-logfile = /var/log/gunicorn.log
-pidfile = /var/run/gunicorn.pid
+logfile = ${buildout:directory}/var/log/gunicorn.log
+pidfile = ${buildout:directory}/var/run/gunicorn.pid
input = conf/gunicorn.in
output = ${buildout:directory}/etc/init.d/gunicorn
@@ -59,6 +55,7 @@ output = ${buildout:directory}/etc/nginx/livembtiles.conf
[django-settings]
recipe = collective.recipe.template
+debug = True
input = conf/local_settings.py.in
output = ${django:projectpath}/local_settings.py
@@ -76,3 +73,10 @@ cmds = ${buildout:directory}/bin/django collectstatic --noinput
[versions]
django = 1.3.1
landez = 1.8.1
+collective.recipe.cmd = 0.5
+collective.recipe.template = 1.9
+easydict = 1.3
+gunicorn = 0.13.4
+isotoma.recipe.django = 3.1.5
+z3c.recipe.mkdir = 0.3.1
+zc.recipe.egg = 1.3.2
View
3 example/conf/local_settings.py.in
@@ -10,3 +10,6 @@ DATABASES = {
'PORT': '', # Set to empty string for default. Not used with sqlite3.
}
}
+
+DEBUG = ${django-settings:debug}
+TEMPLATE_DEBUG = DEBUG
View
6 example/setup.py
@@ -1,8 +1,7 @@
#!/usr/bin/python
# -*- coding: utf8 -*-
import os
-from distutils.core import setup
-from setuptools import find_packages
+from setuptools import setup, find_packages
here = os.path.abspath(os.path.dirname(__file__))
@@ -14,7 +13,8 @@
url='https://github.com/makinacorpus/django-mbtiles',
description="Map browser as an example project for django-mbtiles.",
long_description=open(os.path.join(here, 'README.rst')).read(),
- requires = ['django_mbtiles (==1.0)'],
+ install_requires = ['django == 1.3.1',
+ 'django_mbtiles == 1.0'],
packages=find_packages(),
classifiers = ['Topic :: Utilities',
'Natural Language :: English',
View
2 requirements.txt
@@ -0,0 +1,2 @@
+easydict >= 1.3
+landez == 1.8.1
View
6 setup.py
@@ -1,6 +1,5 @@
import os
-from distutils.core import setup
-from setuptools import find_packages
+from setuptools import setup, find_packages
here = os.path.abspath(os.path.dirname(__file__))
@@ -13,8 +12,7 @@
download_url = "http://pypi.python.org/pypi/django-mbtiles/",
description="Serve maps from MBTiles files using Django",
long_description=open(os.path.join(here, 'README.rst')).read(),
- requires = ['easydict (>=1.3)',
- 'landez (==1.7)'],
+ install_requires = open(os.path.join(here, 'requirements.txt')).readlines(),
packages=find_packages(),
classifiers = ['Topic :: Utilities',
'Natural Language :: English',

0 comments on commit b45ce31

Please sign in to comment.