From 55da4ffc0367ef7c622856f12f297ce64d599f21 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 7 Jun 2016 23:44:22 +0200 Subject: [PATCH] Also generate root requirements --- requirements.txt | 8 +++++--- scripts/dev/recompile_requirements.py | 11 +++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index 196950578..8e3955fb1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,9 @@ -Jinja2==2.8.0 +# This file is automatically generated by scripts/dev/recompile_requirements.py + +colorama==0.3.7 +cssutils==1.0.1 +Jinja2==2.8 MarkupSafe==0.23 Pygments==2.1.3 pyPEG2==2.15.2 PyYAML==3.11 -colorama==0.3.7 -cssutils==1.0.1 diff --git a/scripts/dev/recompile_requirements.py b/scripts/dev/recompile_requirements.py index 0db266ee5..5c4586da1 100644 --- a/scripts/dev/recompile_requirements.py +++ b/scripts/dev/recompile_requirements.py @@ -32,9 +32,9 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), os.pardir, from scripts import utils -REQ_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), - '..', '..', # /scripts/dev -> /scripts -> / - 'misc', 'requirements') +REPO_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), + '..', '..') # /scripts/dev -> /scripts -> / +REQ_DIR = os.path.join(REPO_DIR, 'misc', 'requirements') def convert_line(line, comments): @@ -98,7 +98,10 @@ def main(): utils.print_title(name) filename = os.path.join(REQ_DIR, 'requirements-{}.txt-raw'.format(name)) - outfile = os.path.join(REQ_DIR, 'requirements-{}.txt'.format(name)) + if name == 'qutebrowser': + outfile = os.path.join(REPO_DIR, 'requirements.txt') + else: + outfile = os.path.join(REQ_DIR, 'requirements-{}.txt'.format(name)) with tempfile.TemporaryDirectory() as tmpdir: pip_bin = os.path.join(tmpdir, 'bin', 'pip')