[Python-modules-commits] r33252 - in packages/beautifulsoup4/trunk/debian (6 files)

[stefanor at users.alioth.debian.org]

    Date: Monday, July 6, 2015 @ 03:51:26
  Author: stefanor
Revision: 33252

Bring pypy package back. I've submitted a patch for pypy-setuptools, so maybe it'll happen soon...

Added:
  packages/beautifulsoup4/trunk/debian/pypy-bs4.install
  packages/beautifulsoup4/trunk/debian/tests/unittests-pypy
Modified:
  packages/beautifulsoup4/trunk/debian/changelog
  packages/beautifulsoup4/trunk/debian/control
  packages/beautifulsoup4/trunk/debian/rules
  packages/beautifulsoup4/trunk/debian/tests/control

Modified: packages/beautifulsoup4/trunk/debian/changelog
===================================================================
--- packages/beautifulsoup4/trunk/debian/changelog	2015-07-06 03:51:05 UTC (rev 33251)
+++ packages/beautifulsoup4/trunk/debian/changelog	2015-07-06 03:51:26 UTC (rev 33252)
@@ -2,8 +2,6 @@
 
   * New upstream release.
   * Drop patches, superseded upstream.
-  * Drop pypy packages. pypy-setuptools is not available yet, and 4.4.0 has
-    switched to setuptools.
   * Build-Depend on python-setuptools + python3-setuptools.
   * Bumped copyright years.
   * Updated license to Expat. The trailing "Dammit" has been removed.

Modified: packages/beautifulsoup4/trunk/debian/control
===================================================================
--- packages/beautifulsoup4/trunk/debian/control	2015-07-06 03:51:05 UTC (rev 33251)
+++ packages/beautifulsoup4/trunk/debian/control	2015-07-06 03:51:26 UTC (rev 33252)
@@ -6,14 +6,14 @@
 Build-Depends:
  debhelper (>= 8.1),
  dh-python,
+ pypy (>= 1.7),
+ pypy-setuptools,
  python-all (>= 2.6.5-13~),
  python-lxml,
- python-pkg-resources,
  python-setuptools,
  python-sphinx (>= 1.0.7+dfsg),
  python3-all (>= 3.1.2),
  python3-lxml,
- python3-pkg-resources,
  python3-setuptools
 X-Python-Version: >= 2.6
 Standards-Version: 3.9.6
@@ -34,6 +34,18 @@
  .
  This package contains BeautifulSoup 4, for Python 2.x.
 
+Package: pypy-bs4
+Architecture: all
+Depends: ${misc:Depends}, ${pypy:Depends}
+Recommends: pypy-chardet, pypy-lxml | pypy-html5lib
+Description: error-tolerant HTML parser for PyPy
+ Beautiful Soup is a Python library for pulling data out of HTML and XML files.
+ It works with your favorite parser to provide idiomatic ways of navigating,
+ searching, and modifying the parse tree. It commonly saves programmers hours
+ or days of work.
+ .
+ This package contains BeautifulSoup 4, for Python 2.x PyPy.
+
 Package: python3-bs4
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}

Added: packages/beautifulsoup4/trunk/debian/pypy-bs4.install
===================================================================
--- packages/beautifulsoup4/trunk/debian/pypy-bs4.install	                        (rev 0)
+++ packages/beautifulsoup4/trunk/debian/pypy-bs4.install	2015-07-06 03:51:26 UTC (rev 33252)
@@ -0,0 +1 @@
+/usr/lib/pypy/dist-packages/

Modified: packages/beautifulsoup4/trunk/debian/rules
===================================================================
--- packages/beautifulsoup4/trunk/debian/rules	2015-07-06 03:51:05 UTC (rev 33251)
+++ packages/beautifulsoup4/trunk/debian/rules	2015-07-06 03:51:26 UTC (rev 33252)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+	dh $@ --with python2,python3,pypy,sphinxdoc --buildsystem=pybuild
 
 override_dh_auto_build:
 	dh_auto_build

Modified: packages/beautifulsoup4/trunk/debian/tests/control
===================================================================
--- packages/beautifulsoup4/trunk/debian/tests/control	2015-07-06 03:51:05 UTC (rev 33251)
+++ packages/beautifulsoup4/trunk/debian/tests/control	2015-07-06 03:51:26 UTC (rev 33252)
@@ -1,5 +1,9 @@
 Tests: unittests
 Depends: python-all, python-bs4, python-lxml, python-nose (>= 1.3)
 
+# Currently no pypy-nose (or pypy-lxml)
+#Tests: unittests-pypy
+#Depends: pypy, pypy-bs4, pypy-lxml, pypy-nose
+
 Tests: unittests3
 Depends: python3-all, python3-bs4, python3-lxml, python3-nose (>= 1.3)

Added: packages/beautifulsoup4/trunk/debian/tests/unittests-pypy
===================================================================
--- packages/beautifulsoup4/trunk/debian/tests/unittests-pypy	                        (rev 0)
+++ packages/beautifulsoup4/trunk/debian/tests/unittests-pypy	2015-07-06 03:51:26 UTC (rev 33252)
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -efu
+
+cd "$ADTTMP"
+
+echo "=== pypy ==="
+pypy -m nose bs4.tests 2>&1