[Python-modules-commits] r32804 - in packages/python-netaddr/trunk/debian (6 files)

[bernat at users.alioth.debian.org]

    Date: Friday, May 29, 2015 @ 07:05:06
  Author: bernat
Revision: 32804

Convert to debhelper.

Unit tests are not run anymore, yet.

Modified:
  packages/python-netaddr/trunk/debian/changelog
  packages/python-netaddr/trunk/debian/compat
  packages/python-netaddr/trunk/debian/rules
Deleted:
  packages/python-netaddr/trunk/debian/pycompat
  packages/python-netaddr/trunk/debian/python-netaddr-docs.docs
  packages/python-netaddr/trunk/debian/runtests.py

Modified: packages/python-netaddr/trunk/debian/changelog
===================================================================
--- packages/python-netaddr/trunk/debian/changelog	2015-05-29 06:27:04 UTC (rev 32803)
+++ packages/python-netaddr/trunk/debian/changelog	2015-05-29 07:05:06 UTC (rev 32804)
@@ -2,6 +2,7 @@
 
   * New upstream release.
   * Bump Standards-Version to 3.9.6.
+  * Convert to dh/pybuild.
 
  -- Vincent Bernat <bernat at debian.org>  Fri, 29 May 2015 08:22:38 +0200
 

Modified: packages/python-netaddr/trunk/debian/compat
===================================================================
--- packages/python-netaddr/trunk/debian/compat	2015-05-29 06:27:04 UTC (rev 32803)
+++ packages/python-netaddr/trunk/debian/compat	2015-05-29 07:05:06 UTC (rev 32804)
@@ -1 +1 @@
-8
+9

Deleted: packages/python-netaddr/trunk/debian/pycompat
===================================================================
--- packages/python-netaddr/trunk/debian/pycompat	2015-05-29 06:27:04 UTC (rev 32803)
+++ packages/python-netaddr/trunk/debian/pycompat	2015-05-29 07:05:06 UTC (rev 32804)
@@ -1 +0,0 @@
-2

Deleted: packages/python-netaddr/trunk/debian/python-netaddr-docs.docs
===================================================================
--- packages/python-netaddr/trunk/debian/python-netaddr-docs.docs	2015-05-29 06:27:04 UTC (rev 32803)
+++ packages/python-netaddr/trunk/debian/python-netaddr-docs.docs	2015-05-29 07:05:06 UTC (rev 32804)
@@ -1 +0,0 @@
-docs/api

Modified: packages/python-netaddr/trunk/debian/rules
===================================================================
--- packages/python-netaddr/trunk/debian/rules	2015-05-29 06:27:04 UTC (rev 32803)
+++ packages/python-netaddr/trunk/debian/rules	2015-05-29 07:05:06 UTC (rev 32804)
@@ -1,39 +1,30 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
 
-# Hack to ensure Python stuff to be installed in the right place
-DEB_PYTHON_DESTDIR=$(if $(filter %-docs,$(cdbs_curpkg)),$(DEB_DESTDIR),$(CURDIR)/debian/$(cdbs_curpkg))
+export PYBUILD_DESTDIR_python2=debian/python-netaddr/
+export PYBUILD_DESTDIR_python3=debian/python3-netaddr/
+export PYBUILD_TEST_ARGS=titi
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
+%:
+	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
-# ieee-data
-python_module_path=/usr/lib/python*/dist-packages
-binary-fixup/python-netaddr binary-fixup/python3-netaddr::
-	rm $(CURDIR)/debian/$(cdbs_curpkg)$(python_module_path)/netaddr/eui/iab.*
-	rm $(CURDIR)/debian/$(cdbs_curpkg)$(python_module_path)/netaddr/eui/oui.*
-	ln -s /usr/share/ieee-data/oui.txt $(CURDIR)/debian/$(cdbs_curpkg)$(python_module_path)/netaddr/eui/
-	ln -s /usr/share/ieee-data/iab.txt $(CURDIR)/debian/$(cdbs_curpkg)$(python_module_path)/netaddr/eui/
-	# We use "python" on purpose: the idx files cannot be generated by python3
-	PYTHONPATH=$(CURDIR) python \
-		$(CURDIR)/debian/$(cdbs_curpkg)$(python_module_path)/netaddr/eui/ieee.py
-	dh_link -p$(cdbs_curpkg)
+override_dh_installdocs:
+	dh_installdocs
+	PYTHONPATH=. sphinx-build -N -q -E -b html docs/source/ \
+		debian/python-netaddr-docs/usr/share/doc/python-netaddr-docs/api/
 
-# No netaddr binary for python3-netaddr
-binary-fixup/python3-netaddr::
-	rm -rf $(CURDIR)/debian/$(cdbs_curpkg)/usr/bin
+override_dh_install:
+	dh_install
+	rm debian/python3-netaddr/usr/bin/netaddr
 
-# Documentation
-build/python-netaddr-docs::
-	PYTHONPATH=$(CURDIR) sphinx-build -q docs/source docs/api
-binary-fixup/python-netaddr-docs::
-	dh_sphinxdoc -p$(cdbs_curpkg)
-
-# Tests
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-install/python-netaddr install/python3-netaddr::
-	$(cdbs_curpythonindepbinary) debian/runtests.py .
-endif
-
-clean::
-	-rm -rf docs/api
+# Replace EUI files with the appropriate symlinks
+override_dh_link: dh_link/python-netaddr dh_link/python3-netaddr
+	dh_link
+python_module_path=usr/lib/python*/dist-packages
+dh_link/python-netaddr dh_link/python3-netaddr:
+	rm debian/$(@:dh_link/%=%)/$(python_module_path)/netaddr/eui/iab.*
+	rm debian/$(@:dh_link/%=%)/$(python_module_path)/netaddr/eui/oui.*
+	ln -s /usr/share/ieee-data/oui.txt debian/$(@:dh_link/%=%)/$(python_module_path)/netaddr/eui/
+	ln -s /usr/share/ieee-data/iab.txt debian/$(@:dh_link/%=%)/$(python_module_path)/netaddr/eui/
+	PYTHONPATH=$(CURDIR) python \
+		debian/$(@:dh_link/%=%)/$(python_module_path)/netaddr/eui/ieee.py

Deleted: packages/python-netaddr/trunk/debian/runtests.py
===================================================================
--- packages/python-netaddr/trunk/debian/runtests.py	2015-05-29 06:27:04 UTC (rev 32803)
+++ packages/python-netaddr/trunk/debian/runtests.py	2015-05-29 07:05:06 UTC (rev 32804)
@@ -1,6 +0,0 @@
-import sys
-
-sys.path.insert(0, sys.argv.pop(1))
-
-import netaddr.tests
-netaddr.tests.run()