wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1021734 - Remove special handling for marionette-transport, r=wlach

Browse Source
This commit is contained in:
Jonathan Griffin 2014-06-10 13:40:00 -07:00
parent d721ae3699
commit 5f6588ab77
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testing/marionette/client/requirements.txt
View File

@ -1,4 +1,4 @@
./transport
marionette-transport == 0.2
manifestparser
mozhttpd >= 0.5
mozinfo >= 0.7

17
testing/marionette/client/setup.py
View File

@ -8,23 +8,6 @@ version = '0.7.9'
with open('requirements.txt') as f:
deps = f.read().splitlines()
# Requirements.txt contains a pointer to the local copy of marionette_transport;
# if we're installing using setup.py, handle this locally or replace with a valid
# pypi package reference.
deps = [x for x in deps if 'transport' not in x]
transport_dir = os.path.join(os.path.dirname(__file__), os.path.pardir, 'transport')
method = [x for x in sys.argv if x in ('develop', 'install')]
if os.path.exists(transport_dir) and method:
cmd = [sys.executable, 'setup.py', method[0]]
import subprocess
try:
subprocess.check_call(cmd, cwd=transport_dir)
except subprocess.CalledProcessError:
print "Error running setup.py in %s" % transport_dir
raise
else:
deps += ['marionette-transport == 0.2']
setup(name='marionette_client',
version=version,
description="Marionette test automation client",