summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Williams <codehelp@debian.org>2016-03-13 15:28:27 +0000
committerNeil Williams <codehelp@debian.org>2016-03-13 15:36:21 +0000
commitf1f3659bc23968a23d91bfdedc7f320983c7e503 (patch)
treef46061e3232a9d23554f7a6cf3975306b659a63b
parent748bbd7ca24d3f54ab410fa18a39301a4afa8900 (diff)
downloadvmdebootstrap-f1f3659bc23968a23d91bfdedc7f320983c7e503.tar.gz
Prepare for 1.5
-rwxr-xr-xbin/vmdebootstrap4
-rw-r--r--setup.py2
-rw-r--r--vmdebootstrap/base.py4
-rw-r--r--vmdebootstrap/codenames.py2
-rw-r--r--vmdebootstrap/extlinux.py2
-rw-r--r--vmdebootstrap/filesystem.py2
-rw-r--r--vmdebootstrap/grub.py2
-rw-r--r--vmdebootstrap/uefi.py2
8 files changed, 11 insertions, 9 deletions
diff --git a/bin/vmdebootstrap b/bin/vmdebootstrap
index 82dcfd7..81cc7bf 100755
--- a/bin/vmdebootstrap
+++ b/bin/vmdebootstrap
@@ -16,6 +16,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# pylint: disable=wrong-import-order
+
import os
import sys
import time
@@ -37,7 +39,7 @@ from vmdebootstrap.filesystem import Filesystem
from vmdebootstrap.uefi import Uefi
from vmdebootstrap.network import Networking
-__version__ = '1.4'
+__version__ = '1.5'
# pylint: disable=invalid-name,line-too-long
# pylint: disable=missing-docstring,too-many-statements
diff --git a/setup.py b/setup.py
index 764e35f..6878295 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ from setuptools import setup, find_packages
setup(
name='vmdebootstrap',
- version='1.4',
+ version='1.5',
description='Bootstrap Debian into a (virtual machine) disk image',
author='Neil Williams',
author_email='codehelp@debian.org',
diff --git a/vmdebootstrap/base.py b/vmdebootstrap/base.py
index 7a71641..71d929e 100644
--- a/vmdebootstrap/base.py
+++ b/vmdebootstrap/base.py
@@ -23,9 +23,9 @@
import os
import crypt
import shutil
-import cliapp
import logging
import subprocess
+import cliapp
# pylint: disable=missing-docstring
@@ -101,7 +101,7 @@ class Base(object):
def message(self, msg):
logging.info(msg)
if self.settings['verbose']:
- print(msg)
+ print(msg) # pylint: disable=superfluous-parens
def create_empty_image(self):
self.message('Creating disk image')
diff --git a/vmdebootstrap/codenames.py b/vmdebootstrap/codenames.py
index 01b8600..27bdded 100644
--- a/vmdebootstrap/codenames.py
+++ b/vmdebootstrap/codenames.py
@@ -21,8 +21,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import datetime
-from vmdebootstrap.base import Base
from distro_info import DebianDistroInfo, UbuntuDistroInfo
+from vmdebootstrap.base import Base
# pylint: disable=missing-docstring
diff --git a/vmdebootstrap/extlinux.py b/vmdebootstrap/extlinux.py
index 5698f6c..b37ee7e 100644
--- a/vmdebootstrap/extlinux.py
+++ b/vmdebootstrap/extlinux.py
@@ -23,8 +23,8 @@
import re
import os
import time
-import cliapp
import logging
+import cliapp
from vmdebootstrap.base import Base, runcmd
# pylint: disable=missing-docstring
diff --git a/vmdebootstrap/filesystem.py b/vmdebootstrap/filesystem.py
index 77f02df..9b3369b 100644
--- a/vmdebootstrap/filesystem.py
+++ b/vmdebootstrap/filesystem.py
@@ -22,9 +22,9 @@
import os
-import cliapp
import logging
import tempfile
+import cliapp
from vmdebootstrap.base import (
Base,
runcmd,
diff --git a/vmdebootstrap/grub.py b/vmdebootstrap/grub.py
index 3576bc0..5c50b12 100644
--- a/vmdebootstrap/grub.py
+++ b/vmdebootstrap/grub.py
@@ -24,8 +24,8 @@
import os
-import cliapp
import logging
+import cliapp
from vmdebootstrap.base import (
Base,
runcmd,
diff --git a/vmdebootstrap/uefi.py b/vmdebootstrap/uefi.py
index 674dd78..b2ca410 100644
--- a/vmdebootstrap/uefi.py
+++ b/vmdebootstrap/uefi.py
@@ -25,8 +25,8 @@
import os
-import cliapp
import logging
+import cliapp
from vmdebootstrap.base import (
Base,
runcmd,