Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

simplify buildout

  • Loading branch information...
commit 62808ccb63152fc50831fb0b48781acf696d0bbe 1 parent a459b11
@domenkozar domenkozar authored
View
10 buildout.d/base.cfg
@@ -1,6 +1,4 @@
[buildout]
-
-# The versions.cfg file is extended to this file.
extends =
versions.cfg
# list of websites that we pull packages from. This eliminates timeouts and slow buildout runs
@@ -32,8 +30,7 @@ parts =
# this option is needed in different recipes
eggs =
- Fabric
- intranet
+ intranet [develop]
# for this section see djangorecipe documentation
[django]
@@ -47,11 +44,10 @@ test =
www
[scripts]
-recipe = zc.recipe.egg:scripts
+recipe = z3c.recipe.scripts
eggs =
${buildout:eggs}
- bpython
- Feedjack # no idea why do we have to specify it here
+dependent-scripts = true
scripts =
fab
feedjack_update
View
2  buildout.d/development.cfg
@@ -1,3 +1,5 @@
[buildout]
extends =
buildout.d/base.cfg
+eggs +=
+ intranet [develop]
View
10 buildout.d/production.cfg
@@ -1,21 +1,15 @@
[buildout]
extends =
base.cfg
+eggs +=
+ intranet [deploy]
parts +=
supervisor
- gunicorn
[config]
gunicorn-port = 35111
-[gunicorn]
-recipe = zc.recipe.egg:scripts
-dependent-scripts = true
-eggs =
- gunicorn
- ${buildout:eggs}
-
[supervisor]
recipe = collective.recipe.supervisor
plugins =
View
2  buildout.d/staging.cfg
@@ -2,7 +2,5 @@
extends =
production.cfg
-#parts +=
-
[config]
gunicorn-port = 35112
View
61 buildout.d/versions.cfg
@@ -1,66 +1,67 @@
[versions]
+BeautifulSoup = 3.2.0
+bpython = 0.10.1
+buildout-versions = 1.6
+certifi = 0.0.8
+chardet = 1.0.1
collective.recipe.mxbase = 0.1
collective.recipe.supervisor = 0.16
+coverage = 3.5.1
+distribute = 0.6.21
Django = 1.4
django-chosen = 0.1
+django-coverage = 1.2.2
+django-debug-toolbar = 0.9.4
+django-grappelli = 2.3.8
+django-gravatar2 = 1.0.1
+django-haystack = 1.2.7
django-honeypot =
+django-indexer = 0.3.0
django-localeurl = 1.4
+django-mailman = 0.2
+django-paging = 0.2.4
djangorecipe = 1.1.2
-django-grappelli = 2.3.8
-django-haystack = 1.2.7
django-reversion = 1.6.0
+django-tagging = 0.3.1
+django-templatetag-sugar = 0.1
django-tinymce = 1.5.1b2
-django-debug-toolbar = 0.9.4
+egenix-mx-base = 3.2.4
+eventlet = 0.9.16
Fabric = 1.2.0
Feedjack = 0.9.16.1
-django-gravatar2 = 1.0.1
-html2text = 3.200.3
feedparser = 5.0.1
flickrapi = 1.4.2
gocept.recipe.env = 1.0
+greenlet = 0.3.4
gunicorn = 0.12.2
+html2text = 3.200.3
+lockfile = 0.9.1
markdown2 = 1.0.1.17
+meld3 = 0.6.7
+mr.developer = 1.20
paramiko = 1.7.7.1
Pillow = 1.7.2
psycopg2 = 2.4.1 # 2.4.2 breaks django tests
pycrypto = 2.3
pyExcelerator = 0.6.4.1
+Pygments = 1.4
+pysolr = 2.1.0-beta
+python-daemon = 1.6
python-dateutil = 2.0
python-ldap = 2.4.0
python-memcached = 1.47
pytz = 2011g
+raven = 1.5.0
reportlab = 2.5
+requests = 0.10.6
setuptools = 0.6c12dev-r88846
-distribute = 0.6.21
simplejson = 2.1.6
South = 0.7.4
superlance = 0.5
supervisor = 3.0a10
twitter = 1.6.1
+Werkzeug = 0.7.1
+z3c.recipe.scripts = 1.0.1
z3c.recipe.usercrontab = 1.1
-coverage = 3.5.1
-django-coverage = 1.2.2
zc.buildout = 1.5.2
zc.recipe.egg = 1.3.2
-buildout-versions = 1.6
-django-indexer = 0.3.0
-django-paging = 0.2.4
-django-templatetag-sugar = 0.1
-Werkzeug = 0.7.1
-django-tagging = 0.3.1
-mr.developer = 1.20
-BeautifulSoup = 3.2.0
-meld3 = 0.6.7
-Pygments = 1.4
-egenix-mx-base = 3.2.4
-django-mailman = 0.2
-pysolr = 2.1.0-beta
-bpython = 0.10.1
-certifi = 0.0.8
-chardet = 1.0.1
-eventlet = 0.9.16
-greenlet = 0.3.4
-lockfile = 0.9.1
-python-daemon = 1.6
-raven = 1.5.0
-requests = 0.10.6
View
9 setup.py
@@ -28,8 +28,10 @@
'html2text',
'pytz',
'pygments',
+ 'Fabric',
# intranet.org
'python-ldap',
+ 'django-tinymce',
# intranet.www
'python-memcached',
'flickrapi',
@@ -47,12 +49,9 @@
'django-gravatar2',
'django-chosen',
# development
- 'django-debug-toolbar',
'django-extensions',
- 'Werkzeug', # interactive debug
'django-coverage',
'coverage',
- 'django-tinymce',
# solr
'django-haystack',
'pysolr',
@@ -68,4 +67,8 @@
tests_require=[
'nose',
],
+ extras_require={
+ 'develop': ["bpython", 'django-debug-toolbar', 'Werkzeug'],
+ 'deploy': ["gunicorn"],
+ },
)
Please sign in to comment.
Something went wrong with that request. Please try again.