From 97758a09f437addc131417c1f42cfa525406a69c Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 11 Nov 2018 12:59:41 +0100 Subject: [PATCH 1/3] Update sphinx from 1.7.1 to 1.8.2 --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 67200009..4b63e6cd 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,6 +1,6 @@ -rrequirements.txt -sphinx==1.7.1 +sphinx==1.8.2 pytest==3.8.1 pep8==1.7.1 pytest-timeout==1.2.1 From e2231b1220f5382cacf506a4c4468db8bfb42305 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 24 Nov 2018 09:21:06 +0100 Subject: [PATCH 2/3] Update pytest from 4.0.0 to 4.0.1 --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 6a2f2107..f646b728 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,6 +1,6 @@ -rrequirements.txt sphinx==1.8.2 -pytest==4.0.0 +pytest==4.0.1 pep8==1.7.1 pytest-timeout==1.3.3 From 1067f7195235ee8cba818ca8324d8a766d714fe8 Mon Sep 17 00:00:00 2001 From: Jeremy Grossmann Date: Tue, 27 Nov 2018 14:03:12 +0700 Subject: [PATCH 3/3] Allow appliances to be loaded from file without the appliance id. Fixes https://github.com/GNS3/gns3-gui/issues/2639. --- gns3server/controller/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gns3server/controller/__init__.py b/gns3server/controller/__init__.py index 196446ec..8a743a8d 100644 --- a/gns3server/controller/__init__.py +++ b/gns3server/controller/__init__.py @@ -341,7 +341,7 @@ class Controller: if "appliances" in controller_settings: for appliance_settings in controller_settings["appliances"]: try: - appliance = Appliance(appliance_settings["appliance_id"], appliance_settings) + appliance = Appliance(appliance_settings.get("appliance_id"), appliance_settings) self._appliances[appliance.id] = appliance except jsonschema.ValidationError as e: message = "Cannot load appliance with JSON data '{}': {}".format(appliance_settings, e.message)