From d39507f1360402c5712351cd84e3e4d24402deef Mon Sep 17 00:00:00 2001
From: Arjan Verwer <arjan.verwer@paylogic.eu>
Date: Mon, 24 Jun 2013 15:49:22 +0200
Subject: [PATCH] Version Bump. Updated TODO List, Added sanity check
---
TODO.rst | 10 ++++------
py2deb/__init__.py | 2 +-
py2deb/converter.py | 10 ++++++++--
setup.py | 2 +-
4 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/TODO.rst b/TODO.rst
index 717c60c..5cef8c2 100644
--- a/TODO.rst
+++ b/TODO.rst
@@ -1,12 +1,10 @@
To-do list for the Python to Debian converter
=============================================
-- Use ``logging.RotatingFileHandler`` to write logs to a file.
-- Add confirmation for installation of non-python dependencies *and* add a command to auto-confirm everything (--yes)
-- Use sanity_check_dependencies() from pip_accel.deps.
+``None``
Ideas
-----
-- Make custom exception(s)
-- Support "extra" requirements (optional dependencies, like suggests/enhances)
-- Command-line option: Create config template in current directory.
\ No newline at end of file
+- Custom Exception?
+- Support "extra" requirements (optional dependencies, like suggests/enhances)?
+- Command-line option: Create config template in current directory?
\ No newline at end of file
diff --git a/py2deb/__init__.py b/py2deb/__init__.py
index bc32aae..f553cc2 100644
--- a/py2deb/__init__.py
+++ b/py2deb/__init__.py
@@ -60,7 +60,7 @@ def main():
# Start converting
converted = convert(pip_args, config_file=config_file, auto_install=auto_install,
- verbose=verbose, cleanup=False)
+ verbose=verbose, cleanup=True)
if print_dependencies:
print ', '.join(converted)
diff --git a/py2deb/converter.py b/py2deb/converter.py
index a12abf6..b09d852 100644
--- a/py2deb/converter.py
+++ b/py2deb/converter.py
@@ -56,7 +56,7 @@ def convert(pip_args, auto_install=False, verbose=False, config_file=None, clean
patch_rules(package)
patch_control(package, replacements, config)
apply_script(package, config, verbose)
- # TODO: pip-accel sanity check
+ sanity_check_dependencies(package, auto_install)
debfile = build(package, repository, verbose)
logger.info('%s has been converted to %s', package.name, package.debian_name)
converted.append('%(Package)s (=%(Version)s)' % debfile.debcontrol())
@@ -94,7 +94,7 @@ def get_required_packages(pip_args, prefix, replacements):
if pkg_name not in to_ignore:
yield package
else:
- logger.debug('%s is in the ignore list and will not be build.', pkg_name)
+ logger.info('%s is in the ignore list and will not be build.', pkg_name)
def get_related_packages(pkg_name, packages):
"""
@@ -228,6 +228,12 @@ def apply_script(package, config, verbose):
logger.info('The script has been applied.')
+def sanity_check_dependencies(package, auto_install):
+ logger.debug('Performing a sanity check on %s', package.name)
+ result = pip_accel.deps.sanity_check_dependencies(package.name)
+ assert result, 'Failed sanity check on %s' % package.name
+ logger.debug('Sanity check completed')
+
def build(package, repository, verbose):
"""
Builds the debian package using dpkg-buildpackage.
diff --git a/setup.py b/setup.py
index a588bb8..2413729 100755
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
from setuptools import setup, find_packages
setup(name='pl-py2deb',
- version='0.6.0',
+ version='0.6.1',
description='A tool to convert python packages to debian packages.',
author='Arjan Verwer',
author_email='arjan.verwer@paylogic.eu',