Skip to content
Commits on Source (5)
......@@ -2,19 +2,23 @@
The following commands will be useful for anyone writing patches:
```sh
python setup.py test # Run local unit test suite
python setup.py pylint # Run a pylint script against the codebase
./setup.py test # Run local unit test suite
./setup.py pylint # Run a pylint script against the codebase
./setup.py codespell # Run a codespell script against the codebase
```
Any patches shouldn't change the output of 'test' or 'pylint'. The
'pylint' requires `pylint` and `pycodestyle` to be installed.
Any patches shouldn't change the output of 'test', 'pylint' or 'codespell'. The
'pylint' requires [`pylint`](https://github.com/PyCQA/pylint) and
[`pycodestyle`](https://github.com/pycqa/pycodestyle) to be installed. The
'codespell' requires
[`codespell`](https://github.com/codespell-project/codespell) to be installed.
Our pylint script uses a blacklist rather than a whitelist approach,
so it could throw some false positives or useless messages. If you think
your patch exposes one of these, bring it up on the mailing list.
'test*' have a `--debug` option if you are hitting problems.
For more options, use `python setup.py test --help`.
For more options, use `./setup.py test --help`.
One useful way to manually test virt-manager's UI is using libvirt's
unit test driver. From the source directory, Launch virt-manager like:
......@@ -28,8 +32,8 @@ having to alter your host virt config.
Also, there's a few standalone specialty tests:
```sh
python setup.py test_urls # Test fetching media from distro URLs
python setup.py test_initrd_inject # Test --initrd-inject
./setup.py test_urls # Test fetching media from distro URLs
./setup.py test_initrd_inject # Test --initrd-inject
```
We use [glade-3](https://glade.gnome.org/) for building virt-manager's UI.
......@@ -43,7 +47,7 @@ Patches should be developed against a git checkout and **not** a source
release(see [git repository](https://github.com/virt-manager/virt-manager)).
Patches should be sent to the
[mailing list](http://www.redhat.com/mailman/listinfo/virt-tools-list).
[mailing list](https://www.redhat.com/mailman/listinfo/virt-tools-list).
Using git format-patch/send-email is preferred, but an attachment with
format-patch output is fine too.
......@@ -55,7 +59,7 @@ non-trivial should be sent to the mailing list.
Translations are handled at `fedora.zanata.org`. Please register for a Fedora
account and request access to a translation team, as described at
[Translate on Zanata](http://fedoraproject.org/wiki/L10N/Translate_on_Zanata).
[Translate on Zanata](https://fedoraproject.org/wiki/L10N/Translate_on_Zanata).
And contribute to
[virt-manager at Zanata](https://fedora.zanata.org/project/view/virt-manager/).
......@@ -8,19 +8,19 @@ changes, it can be done from the source directory:
To install the software into `/usr/local` (usually), you can do:
```sh
python setup.py install
./setup.py install
```
To build an RPM, you can run:
```sh
python setup.py rpm
./setup.py rpm
```
`setup.py` generally has all the build and install commands, for more info see:
- `python setup.py --help-commands`
- `python setup.py install --help`
- [Python Standard Build and Install](https://docs.python.org/2/install/#standard-build-and-install)
- `./setup.py --help-commands`
- `./setup.py install --help`
- [Python Standard Build and Install](https://docs.python.org/3/install/#standard-build-and-install)
## Pre-requisite software
......@@ -30,7 +30,7 @@ A detailed dependency list can be found in
Minimum version requirements of major components:
- python >= 2.7
- python >= 3.3
- gtk3 >= 3.14
- libvirt-python >= 0.6.0
- pygobject3 >= 3.14
......
......@@ -8,7 +8,6 @@ exclude data/gschemas.compiled
recursive-include man *
recursive-include po *
recursive-include tests *
exclude tests/test_urls_manual.ini
recursive-include ui *
recursive-include virtManager *
recursive-include virtcli *
......
# Virtual Machine Manager News
## Release 1.5.1 (February 28, 2018)
- Bug fix release
- Fix potential crash with libxml2 error callbacks
- Fix disk/net/mem VM graphs
## Release 2.0.0 (October 15, 2018)
- Finish port to Python 3 (Radostin Stoyanov, Cole Robinson)
- Improved VM defaults for supported OS: q35 PCIe, usb3, CPU host-model
- Search based OS selection UI for new VMs (Daniel P. Berrangé, Cole
Robinson)
- Track OS name for lifetime of domain in <metadata> XML
- Host interface management UI has been completely removed
- Show domain IP on interface details page (Lin Ma, Cole Robinson)
- More efficient stats polling with AllDomainStats (Simon Kobyda, Cole
Robinson)
- TPM device model and backend UI (Marc-André Lureau, Stefan Berger)
- Show <channel> connection state in UI (Lin Ma)
- Show attached devices in <controller> UI (Lin Ma)
- UI option to plug/unplug VM nic link (Simon Kobyda)
- UI support for disk discard and detect_zeroes (Povilas Kanapickas, Lin Ma)
- Improved SUSE --location URL/ISO detection (Charles Arnold)
- cli and UI support for SCSI persistent reservations (Lin Ma)
- cli: Add --network mtu.size= option (Anya Harter)
- cli: Add --disk driver.copy_on_read (Anya Harter)
- cli: Add --disk geometry support (Anya Harter)
- cli: Add --sound codec support (Anya Harter)
- cli: Add --hostdev net/char/block for LXC (Lubomir Rintel)
- cli: Add --memorybacking access_mode and source_type (Marc-André Lureau)
- cli: Add --boot rebootTimout (Yossi Ovadia)
- cli: Add --boot bootloader=
- cli: Add --destroy-on-exit
## Release 1.5.0 (February 06, 2018)
- python3 prep work (Radostin Stoyanov, Cole Robinson, Cédric Bosdonnat)
......@@ -461,7 +483,7 @@ virtual console and even greater coverage for translations.
The release focus has been on major bug fixing. This is also the
first release in which (partial) translations are available for
the UI in approximately 20 languages - thanks to the Fedora i18n
team for excellant progress on this. It is now possible to control
team for excellent progress on this. It is now possible to control
the virt-manager UI with command line arguments as well as the DBus
API & it DBus activation is no longer used by default which fixes
interaction with GNOME keyring & AT-SPI accesibility. Numerous
......
Metadata-Version: 1.0
Name: virt-manager
Version: 1.5.1
Version: 2.0.0
Summary: UNKNOWN
Home-page: http://virt-manager.org
Author: Cole Robinson
......
......@@ -22,12 +22,12 @@ For dependency info and installation instructions, see the
## Contact
- All comments / suggestions / patches should be directed to the
[virt-tools-list](http://www.redhat.com/mailman/listinfo/virt-tools-list)
[virt-tools-list](https://www.redhat.com/mailman/listinfo/virt-tools-list)
mailing list.
- For IRC we use #virt on OFTC.
- For bug reporting info, see
[BugReporting](http://virt-manager.org/page/BugReporting).
[BugReporting](https://virt-manager.org/page/BugReporting).
- There are further project details on the
[virt-manager](http://virt-manager.org/) website.
[virt-manager](https://virt-manager.org/) website.
- See the [HACKING.md](HACKING.md) file for info about submitting patches or
contributing translations.
[org.virt-manager.virt-manager]
system-tray = /apps/virt-manager/system-tray
[org.virt-manager.virt-manager.connections]
autostart = /apps/virt-manager/connections/autostart
uris = /apps/virt-manager/connections/uris
[org.virt-manager.virt-manager.details]
show-toolbar = /apps/virt-manager/details/show-toolbar
[org.virt-manager.virt-manager.paths]
image-default = /apps/virt-manager/paths/default-image-path
media-default = /apps/virt-manager/paths/default-media-path
[org.virt-manager.virt-manager.stats]
enable-net-poll = /apps/virt-manager/stats/enable-net-poll
enable-disk-poll = /apps/virt-manager/stats/enable-disk-poll
enable-memory-poll = /apps/virt-manager/stats/enable-mem-poll
enable-cpu-poll = /apps/virt-manager/stats/enable-cpu-poll
[org.virt-manager.virt-manager.vmlist-fields]
cpu-usage = /apps/virt-manager/vmlist-fields/cpu_usage
disk-usage = /apps/virt-manager/vmlist-fields/disk_usage
host-cpu-usage = /apps/virt-manager/vmlist-fields/host_cpu_usage
memory-usage = /apps/virt-manager/vmlist-fields/memory_usage
network-traffic = /apps/virt-manager/vmlist-fields/network_traffic
......@@ -47,6 +47,12 @@
<description>Show system tray icon while app is running</description>
</key>
<key name="enable-libguestfs-vm-inspection" type="b">
<default>true</default>
<summary>Enable libguestfs VM inspection</summary>
<description>Enable libguestfs VM inspection for things like OS icons, installed applications, etc. This only works if python libguestfs bindings are installed.</description>
</key>
<key name="manager-window-height" type="i">
<default>0</default>
<summary>Default manager window height</summary>
......
......@@ -16,19 +16,19 @@
</description>
<screenshots>
<screenshot type="default">
<image>http://virt-manager.org/appdata/en_US/manager.png</image>
<image>https://virt-manager.org/appdata/en_US/manager.png</image>
<_caption>Main manager window</_caption>
</screenshot>
<screenshot>
<image>http://virt-manager.org/appdata/en_US/details.png</image>
<image>https://virt-manager.org/appdata/en_US/details.png</image>
<_caption>Virtual machine configuration screen</_caption>
</screenshot>
<screenshot>
<image>http://virt-manager.org/appdata/en_US/console.png</image>
<image>https://virt-manager.org/appdata/en_US/console.png</image>
<_caption>Graphical console connection for a virtual machine</_caption>
</screenshot>
</screenshots>
<url type="homepage">http://www.virt-manager.org/</url>
<url type="homepage">https://www.virt-manager.org/</url>
<url type="bugtracker">https://bugzilla.redhat.com/enter_bug.cgi?product=Virtualization%20Tools&amp;component=virt-manager</url>
<update_contact>virt-tools-list@redhat.com</update_contact>
<translation type="gettext">virt-manager</translation>
......
virt-manager (1:2.0.0-1~1.gbp426b78) UNRELEASED; urgency=medium
** SNAPSHOT build @426b787d2d5ab0f2494662e045dcde2e9124c241 **
* New upstream version 2.0.0
-- Guido Günther <agx@sigxcpu.org> Wed, 02 Jan 2019 10:02:04 +0100
virt-manager (1:1.5.1-1) unstable; urgency=medium
* Depend on e2fsprogs (Closes: #887285)
......
......@@ -7,34 +7,32 @@ Standards-Version: 4.1.1
Vcs-Git: https://salsa.debian.org/libvirt-team/virt-manager.git
Vcs-Browser: https://salsa.debian.org/libvirt-team/virt-manager
Homepage: http://virt-manager.org/
X-Python-Version: 2.7
Build-Depends:
debhelper (>= 10~),
dh-python,
intltool,
libglib2.0-bin,
python-all,
python3-all,
# for the tests
cpio,
gir1.2-libosinfo-1.0,
gir1.2-libvirt-glib-1.0,
libvirt-daemon,
python-gi,
python-ipaddr,
python-libvirt,
python-libxml2,
python-requests,
python3-gi,
python3-libvirt,
python3-libxml2,
python3-requests,
unzip,
Package: virt-manager
Architecture: all
Depends: ${misc:Depends}, ${python:Depends},
python-gi,
python-gi-cairo,
python-dbus,
Depends: ${misc:Depends}, ${python3:Depends},
python3-gi,
python3-gi-cairo,
python3-dbus,
python-requests,
librsvg2-common,
python-libvirt (>= 0.7.1),
python3-libvirt (>= 0.7.1),
gir1.2-libvirt-glib-1.0,
gir1.2-gtk-vnc-2.0,
gir1.2-gtk-3.0 (>= 3.10),
......@@ -45,7 +43,7 @@ Recommends: libvirt-daemon-system (>= 1.2.7),
gir1.2-spiceclientglib-2.0,
gir1.2-spiceclientgtk-3.0,
Suggests: virt-viewer, ssh-askpass, gnome-keyring, gir1.2-secret-1,
python-guestfs
python3-guestfs
Description: desktop application for managing virtual machines
It presents a summary view of running domains and their live performance &
resource utilization statistics. A detailed view presents graphs showing
......@@ -59,14 +57,13 @@ Description: desktop application for managing virtual machines
Package: virtinst
Architecture: all
Depends:
${python:Depends},
${python3:Depends},
${shlibs:Depends},
${misc:Depends},
e2fsprogs,
python-libvirt (>= 0.4.6),
python-gi,
python-ipaddr,
python-libxml2, python-requests,
python3-libvirt (>= 0.4.6),
python3-gi,
python3-libxml2, python3-requests,
gir1.2-libosinfo-1.0,
Recommends: virt-viewer, qemu-utils
Description: Programs to create and clone virtual machines
......
From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
Date: Sat, 24 Dec 2016 01:18:30 +0100
Subject: Use /usr/bin/python
Subject: Use /usr/bin/python3
so we don't have to worry about picking up the wrong version
---
setup.py | 2 +-
tests/test_inject.py | 2 +-
setup.py | 3 +--
virt-clone | 2 +-
virt-convert | 2 +-
virt-install | 2 +-
virt-manager | 2 +-
virt-xml | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
6 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/setup.py b/setup.py
index 1ae6a22..95b7e13 100755
index 2e1215c..17c497f 100755
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python
# Copyright (C) 2013, 2014 Red Hat, Inc.
@@ -1,9 +1,8 @@
-#!/usr/bin/env python3
+#!/usr/bin/python3
#
# This work is licensed under the GNU GPLv2 or later.
# See the COPYING file in the top-level directory.
-
import glob
diff --git a/tests/test_inject.py b/tests/test_inject.py
index 94ab114..11d91df 100755
--- a/tests/test_inject.py
+++ b/tests/test_inject.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python
# Copyright (C) 2013, 2014 Red Hat, Inc.
from __future__ import print_function
import fnmatch
import os
diff --git a/virt-clone b/virt-clone
index 12f0d06..f1a8976 100755
index d1eedee..7ef6727 100755
--- a/virt-clone
+++ b/virt-clone
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python
-#!/usr/bin/env python3
+#!/usr/bin python3
#
# Copyright(c) FUJITSU Limited 2007.
#
diff --git a/virt-convert b/virt-convert
index c42f2ef..81c25dc 100755
index 1b7b796..6f44902 100755
--- a/virt-convert
+++ b/virt-convert
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python
-#!/usr/bin/env python3
+#!/usr/bin/python3
#
# Copyright 2008, 2013, 2014 Red Hat, Inc.
# Joey Boggs <jboggs@redhat.com>
diff --git a/virt-install b/virt-install
index 4163d0f..bc32b0d 100755
index a7f247f..e09553e 100755
--- a/virt-install
+++ b/virt-install
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python
-#!/usr/bin/env python3
+#!/usr/bin/python3
#
# Copyright 2005-2014 Red Hat, Inc.
#
diff --git a/virt-manager b/virt-manager
index 4ba10fa..f5616de 100755
index 15d5109..b608ff7 100755
--- a/virt-manager
+++ b/virt-manager
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python
-#!/usr/bin/env python3
+#!/usr/bin/python3
#
# Copyright (C) 2006, 2014 Red Hat, Inc.
# Copyright (C) 2006 Daniel P. Berrange <berrange@redhat.com>
diff --git a/virt-xml b/virt-xml
index b7d78fe..199f3c6 100755
index 9bdde95..b8fddac 100755
--- a/virt-xml
+++ b/virt-xml
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python
-#!/usr/bin/env python3
+#!/usr/bin/python3
#
# Copyright 2013-2014 Red Hat, Inc.
# Cole Robinson <crobinso@redhat.com>
virtinst/fix-path-to-hvmloader.patch
virtinst/Fix-patch-to-pygrub.patch
Use-usr-bin-python.patch
From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
Date: Sat, 11 Jan 2014 14:05:29 +0100
Subject: Fix patch to pygrub
Closes: #685749
---
tests/cli-test-xml/compare/virt-install-xen-default.xml | 2 +-
tests/cli-test-xml/compare/virt-install-xen-pv.xml | 2 +-
virtinst/guest.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/cli-test-xml/compare/virt-install-xen-default.xml b/tests/cli-test-xml/compare/virt-install-xen-default.xml
index 5ad1c6b..6a1127a 100644
--- a/tests/cli-test-xml/compare/virt-install-xen-default.xml
+++ b/tests/cli-test-xml/compare/virt-install-xen-default.xml
@@ -4,7 +4,7 @@
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
- <bootloader>/usr/bin/pygrub</bootloader>
+ <bootloader>pygrub</bootloader>
<devices>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
diff --git a/tests/cli-test-xml/compare/virt-install-xen-pv.xml b/tests/cli-test-xml/compare/virt-install-xen-pv.xml
index fbc4f4b..45e044e 100644
--- a/tests/cli-test-xml/compare/virt-install-xen-pv.xml
+++ b/tests/cli-test-xml/compare/virt-install-xen-pv.xml
@@ -31,7 +31,7 @@
<memory>65536</memory>
<currentMemory>65536</currentMemory>
<vcpu>1</vcpu>
- <bootloader>/usr/bin/pygrub</bootloader>
+ <bootloader>pygrub</bootloader>
<devices>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
diff --git a/virtinst/guest.py b/virtinst/guest.py
index e136a17..c5406da 100644
--- a/virtinst/guest.py
+++ b/virtinst/guest.py
@@ -366,7 +366,7 @@ class Guest(XMLBuilder):
if (not install and
self.os.is_xenpv() and
not self.os.kernel):
- self.bootloader = "/usr/bin/pygrub"
+ self.bootloader = "pygrub"
self.os.clear()
return self.get_xml_config()
From: Oliver Seufer <debian@seufer.de>
Date: Sat, 1 Jun 2013 22:41:07 +0200
Subject: fix path to hvmloader
Closes: #685749
---
virtinst/guest.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/virtinst/guest.py b/virtinst/guest.py
index 32acd52..e136a17 100644
--- a/virtinst/guest.py
+++ b/virtinst/guest.py
@@ -814,7 +814,7 @@ class Guest(XMLBuilder):
self.os.init = self.os.init or "/bin/sh"
if not self.os.loader and self.os.is_hvm() and self.type == "xen":
- self.os.loader = "/usr/lib/xen/boot/hvmloader"
+ self.os.loader = "hvmloader"
if self.os.kernel or self.os.init:
self.os.bootorder = []
#!/usr/bin/make -f
%:
dh $@ --with python2 --buildsystem=python_distutils
dh $@ --with python3 --buildsystem=pybuild
override_dh_python2:
dh_python2 -O--buildsystem=python_distutils
dh_python2 -p virtinst usr/share/virt-manager
dh_python3 -O--buildsystem=python_distutils
dh_python3 -p virtinst usr/share/virt-manager
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
python setup.py test
python3 setup.py test
else
@echo "Checks disabled via DEB_BUILD_OPTIONS"
endif
override_dh_auto_install:
python setup.py --no-update-icon-cache --no-compile-schemas install --force --root=debian/tmp --no-compile -O0
python3 setup.py --no-update-icon-cache --no-compile-schemas install --force --root=debian/tmp --no-compile -O0
dh_install debian/10_virt-manager.gschema.override \
/usr/share/glib-2.0/schemas/
......
......@@ -2,7 +2,6 @@ usr/bin/virt-manager
usr/share/man/man1/virt-manager.1
usr/share/icons/
usr/share/applications
usr/share/GConf/
usr/share/glib-2.0
usr/share/locale
usr/share/virt-manager/icons
......
......@@ -203,19 +203,19 @@ new guest can do a filesystem resize when it boots.
=head1 BUGS
Please see http://virt-manager.org/page/BugReporting
Please see https://virt-manager.org/page/BugReporting
=head1 COPYRIGHT
Copyright (C) Fujitsu Limited, Copyright (C) Red Hat, Inc,
and various contributors.
This is free software. You may redistribute copies of it under the terms
of the GNU General Public License C<http://www.gnu.org/licenses/gpl.html>.
of the GNU General Public License C<https://www.gnu.org/licenses/gpl.html>.
There is NO WARRANTY, to the extent permitted by law.
=head1 SEE ALSO
C<virt-sysprep(1)>, C<virsh(1)>, C<virt-install(1)>, C<virt-manager(1)>, the project website C<http://virt-manager.org>
C<virt-sysprep(1)>, C<virsh(1)>, C<virt-install(1)>, C<virt-manager(1)>, the project website C<https://virt-manager.org>
=cut
......@@ -127,18 +127,18 @@ Convert the specified .vmx file. Any references disk images must be in the same
=head1 BUGS
Please see http://virt-manager.org/page/BugReporting
Please see https://virt-manager.org/page/BugReporting
=head1 COPYRIGHT
Copyright (C) Red Hat, Inc, and various contributors.
This is free software. You may redistribute copies of it under the terms
of the GNU General Public License C<http://www.gnu.org/licenses/gpl.html>.
of the GNU General Public License C<https://www.gnu.org/licenses/gpl.html>.
There is NO WARRANTY, to the extent permitted by law.
=head1 SEE ALSO
L<virt-install(1)>, the project website C<http://virt-manager.org>
L<virt-install(1)>, the project website C<https://virt-manager.org>
=cut
This diff is collapsed.