[Python-modules-commits] r26079 - in packages/sqlobject/trunk/debian (4 files)

[drnlmza-guest at users.alioth.debian.org]

    Date: Sunday, October 6, 2013 @ 15:35:49
  Author: drnlmza-guest
Revision: 26079

Add missing build dependency.
Remove pkg_resources requirement from the test paths.

Added:
  packages/sqlobject/trunk/debian/patches/remove_pkg_resources
Modified:
  packages/sqlobject/trunk/debian/changelog
  packages/sqlobject/trunk/debian/control
  packages/sqlobject/trunk/debian/patches/series

Modified: packages/sqlobject/trunk/debian/changelog
===================================================================
--- packages/sqlobject/trunk/debian/changelog	2013-10-06 15:23:39 UTC (rev 26078)
+++ packages/sqlobject/trunk/debian/changelog	2013-10-06 15:35:49 UTC (rev 26079)
@@ -13,6 +13,8 @@
     - Add LGPL version to the manpages.
   * Run tests (against sqlite memory database) during the build.
     - Add python-pytest as build dependency.
+    - Add remove_pkg_resources to remove pkg_resources dependency when running
+      tests.
 
  -- Neil Muller <drnlmuller+debian at gmail.com>  Sun, 06 Oct 2013 12:45:42 +0200
 

Modified: packages/sqlobject/trunk/debian/control
===================================================================
--- packages/sqlobject/trunk/debian/control	2013-10-06 15:23:39 UTC (rev 26078)
+++ packages/sqlobject/trunk/debian/control	2013-10-06 15:35:49 UTC (rev 26079)
@@ -5,6 +5,7 @@
                dh-python,
                python-all (>= 2.7.3-4),
                python-docutils,
+               python-formencode,
                python-pytest
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Neil Muller <drnlmuller+debian at gmail.com>

Added: packages/sqlobject/trunk/debian/patches/remove_pkg_resources
===================================================================
--- packages/sqlobject/trunk/debian/patches/remove_pkg_resources	                        (rev 0)
+++ packages/sqlobject/trunk/debian/patches/remove_pkg_resources	2013-10-06 15:35:49 UTC (rev 26079)
@@ -0,0 +1,15 @@
+--- a/sqlobject/conftest.py
++++ b/sqlobject/conftest.py
+@@ -11,12 +11,6 @@
+ import os
+ import sqlobject
+ 
+-try:
+-    import pkg_resources
+-except ImportError: # Python 2.2
+-    pass
+-else:
+-    pkg_resources.require('SQLObject')
+ 
+ connectionShortcuts = {
+     'mysql': 'mysql://test@localhost/test',

Modified: packages/sqlobject/trunk/debian/patches/series
===================================================================
--- packages/sqlobject/trunk/debian/patches/series	2013-10-06 15:23:39 UTC (rev 26078)
+++ packages/sqlobject/trunk/debian/patches/series	2013-10-06 15:35:49 UTC (rev 26079)
@@ -1,2 +1,3 @@
 get_rid_of_setuptools
 change_doc_build_script
+remove_pkg_resources