Skip to content

Commit 52520a5

Browse files
Upgrade pavement to create notice types
1 parent 55f719d commit 52520a5

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

pavement.py

+7-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import fileinput
3131
import yaml
3232

33-
from setuptools.command import easy_install
3433
from urlparse import urlparse
3534

3635
from paver.easy import task, options, cmdopts, needs
@@ -43,6 +42,7 @@
4342
# probably trying to run install_win_deps.
4443
pass
4544

45+
4646
try:
4747
from paver.path import pushd
4848
except ImportError:
@@ -177,6 +177,9 @@ def win_install_deps(options):
177177
print "Installing file ... " + tempfile
178178
grab_winfiles(url, tempfile, package)
179179
try:
180+
# This import causes an error with six.moves on OSX
181+
# let's leave it in the windows specific section.
182+
from setuptools.command import easy_install
180183
easy_install.main([tempfile])
181184
except Exception, e:
182185
failed = True
@@ -218,6 +221,7 @@ def sync(options):
218221
sh("python manage.py loaddata sample_admin.json")
219222
sh("python manage.py loaddata geonode/base/fixtures/default_oauth_apps.json")
220223
sh("python manage.py loaddata geonode/base/fixtures/initial_data.json")
224+
sh("python manage.py layer_notice_types")
221225

222226

223227
@task
@@ -431,7 +435,8 @@ def test(options):
431435
"""
432436
Run GeoNode's Unit Test Suite
433437
"""
434-
sh("%s manage.py test %s.tests --noinput" % (options.get('prefix'),
438+
prefix = options.get('prefix', 'python')
439+
sh("%s manage.py test %s.tests --noinput" % (prefix,
435440
'.tests '.join(GEONODE_APPS)))
436441

437442

0 commit comments

Comments
 (0)