rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build_release: Python version adjustments

Browse Source
This commit is contained in:
Florian Bruhin 2017-04-14 20:11:40 +02:00
parent 49a328727e
commit dc947bf9a9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/dev/build_release.py
View File

@ -52,7 +52,7 @@ def call_script(name, *args, python=sys.executable):
subprocess.check_call([python, path] + list(args)) subprocess.check_call([python, path] + list(args))
def call_tox(toxenv, *args, python=os.path.dirname(sys.executable)): def call_tox(toxenv, *args, python=sys.executable):
"""Call tox. """Call tox.
Args: Args:
@ -171,11 +171,11 @@ def build_windows():
utils.print_title("Building Windows binaries") utils.print_title("Building Windows binaries")
parts = str(sys.version_info.major), str(sys.version_info.minor) parts = str(sys.version_info.major), str(sys.version_info.minor)
ver = ''.join(parts) ver = ''.join(parts)
python_x86 = r'C:\Python{}_x32'.format(ver) python_x86 = r'C:\Program Files (x86)\Python{}-32\python.exe'.format(ver)
python_x64 = r'C:\Python{}'.format(ver) python_x64 = r'C:\Program Files\Python{}\python.exe'.format(ver)
out_pyinstaller = os.path.join('build', 'qutebrowser') out_pyinstaller = os.path.join('build', 'qutebrowser')
out_32 = os.path.join('build', out_32 = os.path.join('build',
'qutebrowser-{}-x32'.format(qutebrowser.__version__)) 'qutebrowser-{}-x86'.format(qutebrowser.__version__))
out_64 = os.path.join('build', out_64 = os.path.join('build',
'qutebrowser-{}-x64'.format(qutebrowser.__version__)) 'qutebrowser-{}-x64'.format(qutebrowser.__version__))

2
tox.ini
View File

@ -264,7 +264,7 @@ commands =
{envpython} scripts/dev/freeze.py {posargs} {envpython} scripts/dev/freeze.py {posargs}
[testenv:pyinstaller] [testenv:pyinstaller]
basepython = python3 basepython = {env:PYTHON:python3}
deps = deps =
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/misc/requirements/requirements-pyinstaller.txt -r{toxinidir}/misc/requirements/requirements-pyinstaller.txt