[ros-rosinstall] 01/02: Convert package to pybuild
Jochen Sprickerhof
jspricke at moszumanska.debian.org
Tue Jul 18 15:32:55 UTC 2017
This is an automated email from the git hooks/post-receive script.
jspricke pushed a commit to branch master
in repository ros-rosinstall.
commit 133418f3a2c6d622da15021b40a700f4d9943e96
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date: Fri Jul 14 21:28:45 2017 +0200
Convert package to pybuild
- Add python3-rosinstall
---
debian/control | 37 ++++++++++++++++------
...002-Disable-tests-with-network-connection.patch | 28 ++++++++++++++++
.../patches/0003-Add-fake-identity-for-VCSs.patch | 20 ++++++++++++
debian/patches/0004-Add-missing-dependency.patch | 21 ++++++++++++
debian/patches/series | 3 ++
debian/rules | 14 ++------
debian/source/options | 1 +
7 files changed, 103 insertions(+), 21 deletions(-)
diff --git a/debian/control b/debian/control
index 0b4b4d5..5841dfd 100644
--- a/debian/control
+++ b/debian/control
@@ -1,21 +1,36 @@
Source: ros-rosinstall
-Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Thomas Moulard <thomas.moulard at gmail.com>,
- Jochen Sprickerhof <jspricke at debian.org>,
- Leopold Palomo-Avellaneda <leo at alaxarxa.net>
Section: python
Priority: optional
-Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 10), dh-python
+Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
+Uploaders: Thomas Moulard <thomas.moulard at gmail.com>, Jochen Sprickerhof <jspricke at debian.org>, Leopold Palomo-Avellaneda <leo at alaxarxa.net>
+Build-Depends: debhelper (>= 10), dh-python, python-all, python-setuptools, python3-all, python3-setuptools, python-wstool, python-yaml, python-mock, git, mercurial, python-catkin-pkg, python-rosdistro, zsh, python3-wstool, python3-yaml, python3-mock, python3-catkin-pkg, python3-rosdistro
Standards-Version: 4.0.0
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/ros/ros-rosinstall.git
-Vcs-Git: https://anonscm.debian.org/cgit/debian-science/packages/ros/ros-rosinstall.git
Homepage: http://wiki.ros.org/rosinstall
-X-Python-Version: >= 2.7
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.2
+Vcs-Git: https://anonscm.debian.org/cgit/debian-science/packages/ros/ros-rosinstall.git
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/ros/ros-rosinstall.git
+Testsuite: autopkgtest-pkg-python
Package: python-rosinstall
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-wstool, python-pkg-resources, python-yaml, python-rosdistro, python-rospkg, python-catkin-pkg, python-mock
-Description: Installer for Robot OS
+Depends: ${python:Depends}, ${misc:Depends}
+Description: Installer for Robot OS (Python 2)
+ This package is part of Robot OS (ROS). The rosinstall package
+ provides a Python API for interacting with a source code workspace as
+ well as a group of command line tools. Rosinstall leverages the
+ vcstools package for source control and stores its state in
+ rosinstall files.
+ .
+ Using rosinstall you can update several folders using a variety of SCMs
+ (SVN, Mercurial, git, Bazaar) with just one command.
+ .
+ This package installs the library for Python 2.
+
+Package: python3-rosinstall
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}
+Description: Installer for Robot OS (Python 3)
This package is part of Robot OS (ROS). The rosinstall package
provides a Python API for interacting with a source code workspace as
well as a group of command line tools. Rosinstall leverages the
@@ -24,3 +39,5 @@ Description: Installer for Robot OS
.
Using rosinstall you can update several folders using a variety of SCMs
(SVN, Mercurial, git, Bazaar) with just one command.
+ .
+ This package installs the library for Python 3.
diff --git a/debian/patches/0002-Disable-tests-with-network-connection.patch b/debian/patches/0002-Disable-tests-with-network-connection.patch
new file mode 100644
index 0000000..98e9bed
--- /dev/null
+++ b/debian/patches/0002-Disable-tests-with-network-connection.patch
@@ -0,0 +1,28 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Fri, 14 Jul 2017 21:51:13 +0200
+Subject: Disable tests with network connection
+
+---
+ test/local/test_locate.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/test/local/test_locate.py b/test/local/test_locate.py
+index 2b8efc5..a77e418 100644
+--- a/test/local/test_locate.py
++++ b/test/local/test_locate.py
+@@ -155,6 +155,7 @@ class LocateTest(unittest.TestCase):
+
+
+ def test_get_manifest_groovy(self):
++ return # disabled as sbuild doesn't allow network connections
+ distro = 'groovy'
+ # rviz
+ result = locate.get_manifest('rviz', distro)
+@@ -174,6 +175,7 @@ class LocateTest(unittest.TestCase):
+
+ def test_get_manifest_current(self):
+ # this test obviously returns different results over time
++ return # disabled as sbuild doesn't allow network connections
+ distro = None
+ # rviz
+ result = locate.get_manifest('rviz', distro)
diff --git a/debian/patches/0003-Add-fake-identity-for-VCSs.patch b/debian/patches/0003-Add-fake-identity-for-VCSs.patch
new file mode 100644
index 0000000..dcf32b0
--- /dev/null
+++ b/debian/patches/0003-Add-fake-identity-for-VCSs.patch
@@ -0,0 +1,20 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Tue, 18 Jul 2017 16:26:53 +0200
+Subject: Add fake identity for VCSs
+
+---
+ test/scm_test_base.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/scm_test_base.py b/test/scm_test_base.py
+index 77cb9d7..795ce05 100644
+--- a/test/scm_test_base.py
++++ b/test/scm_test_base.py
+@@ -126,6 +126,7 @@ class AbstractRosinstallCLITest(unittest.TestCase):
+ """Base class for cli tests"""
+ @classmethod
+ def setUpClass(self):
++ os.environ['EMAIL'] = 'Your Name <name at example.com>'
+ self.new_environ = copy.copy(os.environ)
+ self.new_environ["PYTHONPATH"] = os.path.join(os.getcwd(), "src")
+ if "ROS_WORKSPACE" in self.new_environ:
diff --git a/debian/patches/0004-Add-missing-dependency.patch b/debian/patches/0004-Add-missing-dependency.patch
new file mode 100644
index 0000000..7111244
--- /dev/null
+++ b/debian/patches/0004-Add-missing-dependency.patch
@@ -0,0 +1,21 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Tue, 18 Jul 2017 16:49:23 +0200
+Subject: Add missing dependency
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 8e72d61..a252849 100644
+--- a/setup.py
++++ b/setup.py
+@@ -19,7 +19,7 @@ setup(name='rosinstall',
+ version=get_version(),
+ packages=['rosinstall'],
+ package_dir={'': 'src'},
+- install_requires=['vcstools>=0.1.38', 'pyyaml', 'rosdistro>=0.3.0', 'catkin_pkg', 'wstool>=0.1.12'],
++ install_requires=['vcstools>=0.1.38', 'pyyaml', 'rosdistro>=0.3.0', 'catkin_pkg', 'wstool>=0.1.12', 'rospkg'],
+ scripts=["scripts/rosinstall", "scripts/roslocate",
+ "scripts/rosws", "scripts/rosco"],
+ author="Tully Foote",
diff --git a/debian/patches/series b/debian/patches/series
index 18341e8..90e7bb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,4 @@
0001-Add-default-ROS_ROOT-for-rosbuild.patch
+0002-Disable-tests-with-network-connection.patch
+0003-Add-fake-identity-for-VCSs.patch
+0004-Add-missing-dependency.patch
diff --git a/debian/rules b/debian/rules
index 58baf3b..fc4b796 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,7 @@
#!/usr/bin/make -f
-# This file was automatically generated by stdeb 0.6.0+git at
-# Fri, 28 Nov 2014 15:11:27 +0100
+export PYBUILD_NAME=rosinstall
+export PYBUILD_AFTER_INSTALL=rm -rf 'debian/python3-rosinstall/usr/bin'
%:
- dh $@ --with python2 --buildsystem=python_distutils
-
-
-override_dh_clean:
- rm -rf src/rosinstall.egg-info
- dh_clean
-
-get-orig-source:
- uscan --verbose --force-download --repack --compress xz
+ dh $@ --with python2,python3 --buildsystem=pybuild
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..cb61fa5
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1 @@
+extend-diff-ignore = "^[^/]*[.]egg-info/"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-rosinstall.git
More information about the debian-science-commits
mailing list