[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#777136: marked as done (unblock: ruby-pygments.rb/0.5.4~ds1-2)

Your message dated Sun, 8 Feb 2015 23:54:34 +0100
with message-id <20150208225434.GA363@ugent.be>
and subject line Re: Bug#777136: unblock: ruby-pygments.rb/0.5.4~ds1-2
has caused the Debian Bug report #777136,
regarding unblock: ruby-pygments.rb/0.5.4~ds1-2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
777136: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=777136
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package ruby-pygments.rb

This release fixes RC bug #775631 and prevents both this package and
reverse dependencies from being removed from jessie.

the diff against the package in testing is attached.

unblock ruby-pygments.rb/0.5.4~ds1-2

-- System Information:
Debian Release: 8.0
  APT prefers buildd-unstable
  APT policy: (500, 'buildd-unstable'), (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=pt_BR.UTF-8, LC_CTYPE=pt_BR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

-- 
Antonio Terceiro <terceiro@debian.org>

diff --git a/debian/changelog b/debian/changelog
index f53c7de..f99c9f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+ruby-pygments.rb (0.5.4~ds1-2) unstable; urgency=medium
+
+  * Team upload
+  * fix tests (Closes: #775631):
+    - test_highlight_works_with_larger_files: instead of testing for an exact
+      amount of bytes, pass with there are more than 400,000 of them.
+      (debian/patches/0007-Update-test-result.patch)
+    - test_highlight_works_with_single_character_input: removed, since the
+      underlying Python code does not support that use case.
+      (debian/patches/0008-Drop-unfeasible-test.patch)
+
+ -- Antonio Terceiro <terceiro@debian.org>  Wed, 04 Feb 2015 19:43:57 -0200
+
 ruby-pygments.rb (0.5.4~ds1-1) unstable; urgency=low
 
   * Initial release (Closes: #703188)
diff --git a/debian/patches/0007-Update-test-result.patch b/debian/patches/0007-Update-test-result.patch
index 89b7619..5522e42 100644
--- a/debian/patches/0007-Update-test-result.patch
+++ b/debian/patches/0007-Update-test-result.patch
@@ -1,18 +1,15 @@
-Description: Update test result
-Subject: Update test result
- Using old test result.
+Description: make test less fragile
 
- Already reported upstream https://github.com/tmm1/pygments.rb/issues/118
-Author: Per Andersson <avtobiff@gmail.com>
+Author: Antonio Terceiro <terceiro@debian.org>
 ---
 --- a/test/test_pygments.rb
 +++ b/test/test_pygments.rb
-@@ -32,7 +32,7 @@
+@@ -32,7 +32,7 @@ class PygmentsHighlightTest < Test::Unit
    def test_highlight_works_with_larger_files
      code = P.highlight(REDIS_CODE)
      assert_match 'used_memory_peak_human', code
 -    assert_equal 455203, code.bytesize.to_i
-+    assert_equal 454107, code.bytesize.to_i
++    assert code.bytesize.to_i > 400_000
    end
  
    def test_returns_nil_on_timeout
diff --git a/debian/patches/0008-Drop-unfeasible-test.patch b/debian/patches/0008-Drop-unfeasible-test.patch
new file mode 100644
index 0000000..cd25e2e
--- /dev/null
+++ b/debian/patches/0008-Drop-unfeasible-test.patch
@@ -0,0 +1,47 @@
+Description: Drop unfeasible test
+ That code works on the original upstream source, which embeds a slightly
+ modified version of pygments, but won't work with the version of pygments in
+ debian.
+ .
+ With Debian pygments:
+ .
+ $ python
+ Python 2.7.9 (default, Dec 11 2014, 08:58:12) 
+ [GCC 4.9.2] on linux2
+ Type "help", "copyright", "credits" or "license" for more information.
+ >>> from pygments import lexers
+ >>> lexers.guess_lexer('a')
+ Traceback (most recent call last):
+   File "<stdin>", line 1, in <module>
+   File "/usr/lib/python2.7/dist-packages/pygments/lexers/__init__.py", line 252, in guess_lexer
+     raise ClassNotFound('no lexer matching the text found')
+ pygments.util.ClassNotFound: no lexer matching the text found
+ .
+ With upstream embeded pygments:
+ .
+ $ python
+ Python 2.7.9 (default, Dec 11 2014, 08:58:12) 
+ [GCC 4.9.2] on linux2
+ Type "help", "copyright", "credits" or "license" for more information.
+ >>> from pygments import lexers
+ >>> lexers.guess_lexer('a')
+ <pygments.lexers.QBasicLexer>
+Author: Antonio Terceiro
+Origin: vendor
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/test/test_pygments.rb
++++ b/test/test_pygments.rb
+@@ -87,11 +87,6 @@ class PygmentsHighlightTest < Test::Unit
+     assert_match '<title>test</title>', code
+   end
+ 
+-  def test_highlight_works_with_single_character_input
+-    code = P.highlight("a")
+-    assert_match 'a</span>', code
+-  end
+-
+   def test_highlight_works_with_trailing_newline
+     code = P.highlight(RUBY_CODE_TRAILING_NEWLINE)
+     assert_match '<span class="c1">#!/usr/bin/ruby</span>', code
diff --git a/debian/patches/series b/debian/patches/series
index d2a5edd..4b97d9a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-Use-proper-python-shebang.patch
 0006-Invoke-mentos-directly-on-GNU-Linux.patch
 0007-Update-test-result.patch
+0008-Drop-unfeasible-test.patch

Attachment: signature.asc
Description: Digital signature


--- End Message ---
--- Begin Message --- 
tags 777136 - moreinfo
thanks

Hi,

On Sat, Feb 07, 2015 at 08:42:17PM -0200, Antonio Terceiro wrote:
> Argh, sorry for the mess. I have just uploaded -3 fixing this, with the
> attached debdiff.

Unblocked.

Cheers,

Ivo

--- End Message ---
Reply to: