diff options
author | Florian Bruhin <me@the-compiler.org> | 2020-04-27 16:13:59 +0200 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2020-04-27 16:13:59 +0200 |
commit | 58a14ba3b02fceeabb6a72ac8bebb7a86382bde4 (patch) | |
tree | a7b43b51571c10a27940cec3c5bbe01d42f5e1ad /scripts/mkvenv.py | |
parent | 5e55e59d0f349475adea8d60459a627a68d25798 (diff) | |
download | qutebrowser-58a14ba3b02fceeabb6a72ac8bebb7a86382bde4.tar.gz qutebrowser-58a14ba3b02fceeabb6a72ac8bebb7a86382bde4.zip |
Remove deprecated features
- tox -e mkvenv and friends
- config.bind(key, None)
- :yank markdown
Diffstat (limited to 'scripts/mkvenv.py')
-rw-r--r-- | scripts/mkvenv.py | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/scripts/mkvenv.py b/scripts/mkvenv.py index 04cf0e8c0..dc73ccae4 100644 --- a/scripts/mkvenv.py +++ b/scripts/mkvenv.py @@ -112,24 +112,6 @@ def pip_install(venv_dir: pathlib.Path, *args: str) -> None: run_venv(venv_dir, 'python', '-m', 'pip', 'install', *args) -def show_tox_error(pyqt_type: str) -> None: - """DIsplay an error when invoked from tox.""" - if pyqt_type == 'link': - env = 'mkvenv' - args = ' --pyqt-type link' - elif pyqt_type == 'binary': - env = 'mkvenv-pypi' - args = '' - else: - raise AssertionError - - print() - utils.print_error('tox -e {} is deprecated. ' - 'Please use "python3 scripts/mkvenv.py{}" instead.' - .format(env, args)) - print() - - def delete_old_venv(venv_dir: pathlib.Path) -> None: """Remove an existing virtualenv directory.""" if not venv_dir.exists(): @@ -263,10 +245,7 @@ def main() -> None: wheels_dir = pathlib.Path(args.pyqt_wheels_dir) utils.change_cwd() - if args.tox_error: - show_tox_error(args.pyqt_type) - sys.exit(1) - elif (args.pyqt_version != 'auto' and + if (args.pyqt_version != 'auto' and args.pyqt_type not in ['binary', 'source']): utils.print_error('The --pyqt-version option is only available when ' 'installing PyQt from binary or source') |