Bug 744902 - Add datazilla and mozrunner to setup.py deps, r=jgriffin, DONTBUILD because NPOTB
authorMalini Das <mdas@mozilla.com>
Tue, 12 Jun 2012 11:57:25 -0700
changeset 97967 f6ab11012771581c31a0fa4d6428360b7bd51623
parent 97966 5581c3b2a95cb03cda4d735f9dddf19cf3092f6a
child 97968 880037c0ff1e90eda546788d7be033908e8f331d
push idunknown
push userunknown
push dateunknown
reviewersjgriffin, DONTBUILD
bugs744902
milestone16.0a1
Bug 744902 - Add datazilla and mozrunner to setup.py deps, r=jgriffin, DONTBUILD because NPOTB
testing/marionette/client/marionette/venv_test.sh
testing/marionette/client/setup.py
--- a/testing/marionette/client/marionette/venv_test.sh
+++ b/testing/marionette/client/marionette/venv_test.sh
@@ -37,20 +37,16 @@ else
   echo "Creating a virtual environment in $VENV_DIR"
   curl https://raw.github.com/pypa/virtualenv/develop/virtualenv.py | ${PYTHON} - $VENV_DIR
   cd $VENV_DIR
   . bin/activate
   # set up mozbase
   git clone git://github.com/mozilla/mozbase.git
   cd mozbase
   python setup_development.py
-  cd ..
-  git clone git://github.com/mozilla/datazilla_client.git
-  cd datazilla_client
-  python setup.py develop
 fi
 
 # update the marionette_client
 cd $MARIONETTE_HOME
 python setup.py develop
 cd marionette
 
 # pop off the python parameter
--- a/testing/marionette/client/setup.py
+++ b/testing/marionette/client/setup.py
@@ -6,17 +6,17 @@ version = '0.2'
 # get documentation from the README
 try:
     here = os.path.dirname(os.path.abspath(__file__))
     description = file(os.path.join(here, 'README.md')).read()
 except (OSError, IOError):
     description = ''
 
 # dependencies
-deps = ['manifestdestiny', 'mozhttpd >= 0.3', 'mozprocess']
+deps = ['manifestdestiny', 'mozhttpd >= 0.3', 'mozrunner', 'datazilla']
 
 setup(name='marionette',
       version=version,
       description="Marionette test automation client",
       long_description=description,
       classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
       keywords='mozilla',
       author='Jonathan Griffin',