|
30 | 30 | import fileinput
|
31 | 31 | import yaml
|
32 | 32 |
|
33 |
| -from setuptools.command import easy_install |
34 | 33 | from urlparse import urlparse
|
35 | 34 |
|
36 | 35 | from paver.easy import task, options, cmdopts, needs
|
|
43 | 42 | # probably trying to run install_win_deps.
|
44 | 43 | pass
|
45 | 44 |
|
| 45 | + |
46 | 46 | try:
|
47 | 47 | from paver.path import pushd
|
48 | 48 | except ImportError:
|
@@ -177,6 +177,9 @@ def win_install_deps(options):
|
177 | 177 | print "Installing file ... " + tempfile
|
178 | 178 | grab_winfiles(url, tempfile, package)
|
179 | 179 | 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 |
180 | 183 | easy_install.main([tempfile])
|
181 | 184 | except Exception, e:
|
182 | 185 | failed = True
|
@@ -218,6 +221,7 @@ def sync(options):
|
218 | 221 | sh("python manage.py loaddata sample_admin.json")
|
219 | 222 | sh("python manage.py loaddata geonode/base/fixtures/default_oauth_apps.json")
|
220 | 223 | sh("python manage.py loaddata geonode/base/fixtures/initial_data.json")
|
| 224 | + sh("python manage.py layer_notice_types") |
221 | 225 |
|
222 | 226 |
|
223 | 227 | @task
|
@@ -431,7 +435,8 @@ def test(options):
|
431 | 435 | """
|
432 | 436 | Run GeoNode's Unit Test Suite
|
433 | 437 | """
|
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, |
435 | 440 | '.tests '.join(GEONODE_APPS)))
|
436 | 441 |
|
437 | 442 |
|
|
0 commit comments