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

Bug#857400: marked as done (unblock: python-bleach/2.0)

Your message dated Sun, 12 Mar 2017 15:10:00 +0000
with message-id <a0170f72-2a5a-0545-6b52-860d35c8e698@thykier.net>
and subject line Re: Bug#857400: unblock: python-bleach/2.0
has caused the Debian Bug report #857400,
regarding unblock: python-bleach/2.0
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.)


-- 
857400: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=857400
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 python-bleach

python-bleach in testing is currently totally broken due to an uncoordinated
pre-freeze (by a little bit) html5lib update.  Unfortunately, that update
contained substantial API changes.  Upstream for python-bleach has just
released a new version that is compatible with our html5lib version.

It's (as you will see) a large diff.  Realistically, I think we have only two
choices; either remove the package from stretch or update to the new version.
Any attempt to adapt the version we have in stretch to the new html5lib would
be substantially as much change done by people less familiar with the code
base.  I don't see a middle, patch the old version, option that's at all
realistic.

I have not yet uploaded to Unstable because I'd like to get feedback from the
release team first.  My proposed debdiff is not strictly the minimal changes
needed to resolve the RC bug.  I'm also including packaging updates so the
tests will still run and an agreed maintainer change.

Either of those could, strictly speaking, be skipped and I could do this as an
NMU, but I think changing the maintainer to DPMT will be better in case issues
come up in stretch.

The attached debdiff, modulo and UNRELEASED/unstable is what I propose
uploading.  I've attached the packaging diff separately for easier reviewing.

Please let me know how you would like to approach this package.

Scott K

unblock python-bleach/2.0

Attachment: python-bleach.debdiff.tar.gz
Description: application/gzip

diff -Nru python-bleach-1.4.2/debian/changelog python-bleach-2.0/debian/changelog
--- python-bleach-1.4.2/debian/changelog	2016-02-22 14:38:38.000000000 -0500
+++ python-bleach-2.0/debian/changelog	2017-03-10 14:19:55.000000000 -0500
@@ -1,3 +1,16 @@
+python-bleach (2.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release (Closes: #844943)
+    - Update minimum htmlib5 version requirement
+    - Update debian/copyright
+    - Drop override of dh_auto_test and add pytest/3 and pytest/3-runner to
+      build-depends so tests still run
+    - Drop obsolete build-depends on python/3-nose
+  * Agreed maintainer change to DPMT
+    - Updated Vcs-* fields in debian/control
+
+ -- Scott Kitterman <scott@kitterman.com>  Fri, 10 Mar 2017 14:08:47 -0500
+
 python-bleach (1.4.2-1) unstable; urgency=low
 
   [ Per Andersson ]
diff -Nru python-bleach-1.4.2/debian/control python-bleach-2.0/debian/control
--- python-bleach-1.4.2/debian/control	2016-01-24 12:57:19.000000000 -0500
+++ python-bleach-2.0/debian/control	2017-03-10 14:17:37.000000000 -0500
@@ -1,28 +1,32 @@
 Source: python-bleach
 Section: python
 Priority: optional
-Maintainer: Per Andersson <avtobiff@debian.org>
-Uploaders: Christopher Baines <mail@cbaines.net>
+Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
+Uploaders: Scott Kitterman <scott@kitterman.com>, Per Andersson <avtobiff@debian.org>, Christopher Baines <mail@cbaines.net>
 Standards-Version: 3.9.6
 Build-Depends:
  debhelper (>= 8),
  dh-python,
+ python-pytest (>= 3.0.0~),
+ python3-pytest (>= 3.0.0~),
+ python-pytest-runner (>= 2.0~),
+ python3-pytest-runner (>= 2.0~),
+ python-pytest-runner (<< 3.0~),
+ python3-pytest-runner (<< 3.0~),
  python-docutils,
  python3-all,
- python3-nose,
  python3-setuptools,
  python3-sphinx (>= 1.0.7+dfsg-1~),
  python-all (>= 2.6.6-3~),
- python-nose,
  python-setuptools,
  python-sphinx (>= 1.0.7+dfsg-1~),
- python3-html5lib,
+ python3-html5lib (>= 0.999999999~),
  python3-six,
- python-html5lib,
+ python-html5lib (>= 0.999999999~),
  python-six
 Homepage: https://github.com/jsocol/bleach/
-Vcs-Git: https://anonscm.debian.org/collab-maint/python-bleach.git
-Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/python-bleach.git;a=summary
+Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/python-bleach.git
+Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/python-bleach.git
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.2
 
diff -Nru python-bleach-1.4.2/debian/copyright python-bleach-2.0/debian/copyright
--- python-bleach-1.4.2/debian/copyright	2014-02-13 18:58:22.000000000 -0500
+++ python-bleach-2.0/debian/copyright	2017-03-10 14:12:52.000000000 -0500
@@ -3,11 +3,11 @@
 Source: http://github.com/jsocol/bleach/
 
 Files: *
-Copyright: 2012-2014 James Socol <james@mozilla.com>
+Copyright: 2012-2015, James Socol; 2015-2017, Mozilla Foundation
 License: Apache-2.0
 
 Files: debian/*
-Copyright: 2012-2014 Per Andersson <avtobiff@gmail.com>
+Copyright: 2012-2014 Per Andersson <avtobiff@gmail.com>, 2017 Scott Kitterman <scott@kitterman.com>
 License: Apache-2.0
 
 License: Apache-2.0
diff -Nru python-bleach-1.4.2/debian/.git-dpm python-bleach-2.0/debian/.git-dpm
--- python-bleach-1.4.2/debian/.git-dpm	1969-12-31 19:00:00.000000000 -0500
+++ python-bleach-2.0/debian/.git-dpm	2017-03-10 13:57:01.000000000 -0500
@@ -0,0 +1,11 @@
+# see git-dpm(1) from git-dpm package
+fb79febacc53548017a1729584fc3c257b7f8e0a
+fb79febacc53548017a1729584fc3c257b7f8e0a
+fb79febacc53548017a1729584fc3c257b7f8e0a
+fb79febacc53548017a1729584fc3c257b7f8e0a
+python-bleach_2.0.orig.tar.gz
+92d780715d070878015c9959adaa4bd83bb5a85a
+40572
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff -Nru python-bleach-1.4.2/debian/rules python-bleach-2.0/debian/rules
--- python-bleach-1.4.2/debian/rules	2014-02-13 19:06:21.000000000 -0500
+++ python-bleach-2.0/debian/rules	2017-03-10 14:16:59.000000000 -0500
@@ -9,6 +9,3 @@
 	dh_auto_build -O--buildsystem=pybuild
 	PYTHONPATH=. http_proxy='localhost' sphinx-build -N -bhtml docs/ build/html
 
-override_dh_auto_test:
-	nosetests
-	nosetests3

--- End Message ---
--- Begin Message --- 
Emilio Pozuelo Monfort:
> Control: tags -1 confirmed moreinfo
> 
> [...]
> Have you tested the one rdep, django-html-sanitizer? If so, go ahead and remove
> the moreinfo tag once this is accepted.
> 
> Cheers,
> Emilio
> 

The upload happened and Scott removed the moreinfo tag => unblocked.

Thanks,
~Niels

--- End Message ---
Reply to: