From 563cd6d05ea7d04c3eb479631bcebe60b6ea821f Mon Sep 17 00:00:00 2001 From: Mazunki Hoksaas Date: Fri, 7 Nov 2025 14:58:46 +0100 Subject: [PATCH 1/3] fix shebangs having a space after the shebang is not valid under POSIX --- vmrunner/bin/qemu-ifdown | 2 +- vmrunner/bin/qemu-ifup | 2 +- vmrunner/prettify.py | 1 + vmrunner/validate_vm.py | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/vmrunner/bin/qemu-ifdown b/vmrunner/bin/qemu-ifdown index f6de9df54..d1df1e0f4 100644 --- a/vmrunner/bin/qemu-ifdown +++ b/vmrunner/bin/qemu-ifdown @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # ============================================================================== # Simple tap-networking for IncludeOS on Qemu # ============================================================================== diff --git a/vmrunner/bin/qemu-ifup b/vmrunner/bin/qemu-ifup index c09a248ca..47a54fc91 100755 --- a/vmrunner/bin/qemu-ifup +++ b/vmrunner/bin/qemu-ifup @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # ============================================================================== # Simple tap-networking for IncludeOS on Qemu # ============================================================================== diff --git a/vmrunner/prettify.py b/vmrunner/prettify.py index 22561e47f..a37daf975 100644 --- a/vmrunner/prettify.py +++ b/vmrunner/prettify.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 """ pretty printer for vmrunner """ # pylint: disable=invalid-name,line-too-long diff --git a/vmrunner/validate_vm.py b/vmrunner/validate_vm.py index 4a3170853..67a61bddd 100755 --- a/vmrunner/validate_vm.py +++ b/vmrunner/validate_vm.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python3 +#!/usr/bin/env python3 """ validate VM configuration against schema """ # pylint: disable=invalid-name From 162823f2d7d1c340d1854e7b549df0e1019435d1 Mon Sep 17 00:00:00 2001 From: Mazunki Hoksaas Date: Fri, 7 Nov 2025 14:59:51 +0100 Subject: [PATCH 2/3] remove unnecessary python3 imports we are using python3, these imports are no longer necessary. in order to remove the `future` library, we might as well remove these dependencies (even if it works with them) --- vmrunner/boot.py | 2 -- vmrunner/prettify.py | 1 - vmrunner/validate_vm.py | 2 -- vmrunner/vmrunner.py | 4 ---- 4 files changed, 9 deletions(-) diff --git a/vmrunner/boot.py b/vmrunner/boot.py index eb8376606..6436c8c2c 100755 --- a/vmrunner/boot.py +++ b/vmrunner/boot.py @@ -3,8 +3,6 @@ # pylint: disable=invalid-name -from __future__ import print_function - import os import sys import argparse diff --git a/vmrunner/prettify.py b/vmrunner/prettify.py index a37daf975..dc560ba98 100644 --- a/vmrunner/prettify.py +++ b/vmrunner/prettify.py @@ -3,7 +3,6 @@ # pylint: disable=invalid-name,line-too-long -from __future__ import print_function from builtins import str from builtins import range diff --git a/vmrunner/validate_vm.py b/vmrunner/validate_vm.py index 67a61bddd..390794e17 100755 --- a/vmrunner/validate_vm.py +++ b/vmrunner/validate_vm.py @@ -3,8 +3,6 @@ # pylint: disable=invalid-name -from __future__ import print_function - import json import sys import os diff --git a/vmrunner/vmrunner.py b/vmrunner/vmrunner.py index 503697a40..1c2494932 100755 --- a/vmrunner/vmrunner.py +++ b/vmrunner/vmrunner.py @@ -5,10 +5,6 @@ # pylint: disable=line-too-long, too-many-lines, invalid-name, fixme, broad-exception-raised, broad-exception-caught, too-many-arguments, too-many-branches, too-many-statements, too-many-instance-attributes, too-many-locals -from __future__ import print_function -from __future__ import absolute_import - - from builtins import hex from builtins import chr from builtins import str From 28839e6294a6a369c7501dd9a676b013e141af93 Mon Sep 17 00:00:00 2001 From: Mazunki Hoksaas Date: Fri, 7 Nov 2025 15:01:28 +0100 Subject: [PATCH 3/3] remove pkgs.python3.future the future python library doesn't exist in current nixpkgs version for python3.13. removing this allows us to compile without overriding nixpkgs version --- default.nix | 1 - pyproject.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/default.nix b/default.nix index 2e3c73109..926e059ab 100644 --- a/default.nix +++ b/default.nix @@ -13,7 +13,6 @@ pkgs.python3.pkgs.buildPythonPackage rec { ]; dependencies = with pkgs.python3.pkgs; [ - future jsonschema psutil ]; diff --git a/pyproject.toml b/pyproject.toml index 6c015565a..9c6b10aec 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,6 @@ name = "vmrunner" version = "0.16.0" description = "A qemu convenience wrapper for writing integration tests" dependencies = [ - "future", "jsonschema", "psutil", ]