backport stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Fri, 28 Sep 2012 17:28:40 +0200
changeset 832 fbb7eb24f3ad
parent 824 562c476dddbb (current diff)
parent 831 7f222c8bc649 (diff)
child 1005 0dff68de958e
backport stable
--- a/.hgtags	Fri Mar 23 11:59:33 2012 +0100
+++ b/.hgtags	Fri Sep 28 17:28:40 2012 +0200
@@ -76,3 +76,5 @@
 74f6596c6246308afc32f6a08d390fddfb7fb635 apycot-debian-version-2.2.1-1
 1e8dff8bfd1b3ac89b42b4e713cf52889c60374a apycot-version-2.2.2
 372245c5bbb01a8f990c6eb2b9eed545ff6dba2b apycot-debian-version-2.2.2-1
+5d1b7e01c4bcdfaf450493ad8964d8cd12854513 apycot-version-2.2.3
+ae91a0cc488e612bdf5da1905db6028544bf3641 apycot-debian-version-2.2.3-1
--- a/__pkginfo__.py	Fri Mar 23 11:59:33 2012 +0100
+++ b/__pkginfo__.py	Fri Sep 28 17:28:40 2012 +0200
@@ -24,11 +24,11 @@
                'cubicweb-vcsfile': '>= 1.6.1',
                'cubicweb-file': None,
                'cubicweb-narval': '>= 3.0.2',
-               'cubicweb-jqplot': '>= 0.1.2',
                }
 __recommends__ = {'cubicweb-tracker': None,
-                  'cubicweb-nosylist': '>= 0.5.0'}
-
+                  'cubicweb-nosylist': '>= 0.5.0',
+                  'cubicweb-jqplot': '>= 0.1.2',
+                  }
 
 # packaging ###
 
--- a/_apycotlib/checkers/python.py	Fri Mar 23 11:59:33 2012 +0100
+++ b/_apycotlib/checkers/python.py	Fri Sep 28 17:28:40 2012 +0200
@@ -525,9 +525,10 @@
     from pylint.lint import PyLinter
     from pylint.__pkginfo__ import version as pylint_version
     from pylint.interfaces import IReporter
+    from pylint.reporters import BaseReporter
     register('checker', PyLintChecker)
 
-    class MyLintReporter(object):
+    class MyLintReporter(BaseReporter):
         """a partial pylint writer (implements only the message method, not
         methods necessary to display layouts
         """
--- a/test/data/goodpkg2.4/__pkginfo__.py	Fri Mar 23 11:59:33 2012 +0100
+++ b/test/data/goodpkg2.4/__pkginfo__.py	Fri Sep 28 17:28:40 2012 +0200
@@ -37,5 +37,5 @@
 
 web='http://www.goodpackage.org'
 
-pyversions = ['2.5','2.4']
+pyversions = ['2.7', '2.6', '2.5','2.4']
 
--- a/test/unittest_task.py	Fri Mar 23 11:59:33 2012 +0100
+++ b/test/unittest_task.py	Fri Sep 28 17:28:40 2012 +0200
@@ -382,10 +382,14 @@
 class EnvironmentTrackerMixinTC(TestCase):
 
     def setUp(self):
+        self._PYTHONPATH = os.environ.get('PYTHONPATH', '')
         os.environ['PYTHONPATH'] = ''
         self.tracker = Test(TestConfig('yo', dependencies=(Environment('pypasax'),)),
                             MockTestWriter(), {})
 
+    def tearDown(self):
+        os.environ['PYTHONPATH'] = self._PYTHONPATH
+
     def test_update_clean_env(self):
         lc_all = os.environ.get('LC_ALL')
         self.tracker.update_env('key', 'LC_ALL', 'XXXX')