[gentoo-commits] repo/gentoo:master commit in: dev-python/rospkg/files/, dev-python/rospkg/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: dev-python/rospkg/files/, dev-python/rospkg/
@ 2015-09-16 21:33 Alexis Ballier
  0 siblings, 0 replies; 8+ messages in thread
From: Alexis Ballier @ 2015-09-16 21:33 UTC (permalink / raw
  To: gentoo-commits

commit:     98d56a43b063e8961a2c2a1e497da87e57c2534e
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 21:32:31 2015 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 21:32:31 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98d56a43

dev-python/rospkg: Initial import. Ebuild by me.

Package-Manager: portage-2.2.20.1

 dev-python/rospkg/Manifest              |  1 +
 dev-python/rospkg/files/norecurse.patch | 64 +++++++++++++++++++++++++++++++++
 dev-python/rospkg/metadata.xml          |  5 +++
 dev-python/rospkg/rospkg-1.0.35.ebuild  | 56 +++++++++++++++++++++++++++++
 dev-python/rospkg/rospkg-9999.ebuild    | 56 +++++++++++++++++++++++++++++
 5 files changed, 182 insertions(+)

diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
new file mode 100644
index 0000000..c0522ad
--- /dev/null
+++ b/dev-python/rospkg/Manifest
@@ -0,0 +1 @@
+DIST rospkg-1.0.35.tar.gz 88589 SHA256 9ce13cb1d0f470f24cdb7f665d53948fcd0db19be7c8946ad998cbcf3998da30 SHA512 01e59dc3eb8290af661dc54902da950649a81b3caa0b65ad7dba18c0c6d0ba1ed08bec802edbced49f65515f20f1b8db719bfb576eb38c87982386aac22a2e31 WHIRLPOOL 20ebafd588c6cf8598d155cdd6ec76a9f1b7ce1bb9f1a545159a75d4fe5c3621005ea5abb5b15080716439bdec91a943855a564014eee295999126caed5c34e3

diff --git a/dev-python/rospkg/files/norecurse.patch b/dev-python/rospkg/files/norecurse.patch
new file mode 100644
index 0000000..4b7aae9
--- /dev/null
+++ b/dev-python/rospkg/files/norecurse.patch
@@ -0,0 +1,64 @@
+commit c2e06e0ea0b4a1cbb67049ab77a80f53646fb0b2
+Author: Alexis Ballier <aballier@gentoo.org>
+Date:   Tue Dec 23 12:27:19 2014 +0100
+
+    Add support for rospack_norecurse to avoid recursing into all subdirectories when looking for a package.
+    
+    I am installing ros into /usr, hence this searches in /usr/share. I have a lot of directories, not ROS related, into /usr/share (e.g. a full TeX Live install), and I get these timings:
+    
+    Without rospack_norecurse in /usr/share:
+    $ time rosversion rospack
+    2.2.5
+    
+    real    0m2.861s
+    user    0m1.588s
+    sys     0m1.267s
+    
+    With rospack_norecurse in /usr/share:
+    $ time rosversion rospack
+    2.2.5
+    
+    real    0m0.135s
+    user    0m0.100s
+    sys     0m0.034s
+    
+    This is on a desktop with a SSD drive. On an arm board, with much less packages in /usr/share but way much slower I/O I remember hitting the 10 seconds timeout for roscore to start.
+
+diff --git a/src/rospkg/rospack.py b/src/rospkg/rospack.py
+index e55acec..7ed98de 100644
+--- a/src/rospkg/rospack.py
++++ b/src/rospkg/rospack.py
+@@ -42,7 +42,7 @@ from .stack import parse_stack_file, InvalidStack
+ _cache_lock = Lock()
+ 
+ 
+-def list_by_path(manifest_name, path, cache):
++def list_by_path(manifest_name, path, cache, recurse=True):
+     """
+     List ROS stacks or packages within the specified path.
+ 
+@@ -53,6 +53,7 @@ def list_by_path(manifest_name, path, cache):
+     :param manifest_name: MANIFEST_FILE or STACK_FILE, ``str``
+     :param path: path to list resources in, ``str``
+     :param cache: path cache to update. Maps resource name to directory path, ``{str: str}``
++    :param recurse: search recursively in subdirectories ``bool``
+     :returns: complete list of resources in ROS environment, ``[str]``
+     """
+     resources = []
+@@ -89,9 +90,15 @@ def list_by_path(manifest_name, path, cache):
+             # optimization for stacks.
+             del dirs[:]
+             continue #leaf     
+-        elif 'rospack_nosubdirs' in files:
++        elif 'rospack_nosubdirs' in files or not recurse:
+             del dirs[:]
+             continue  #leaf
++        elif 'rospack_norecurse' in files:
++            for sd in dirs:
++                spath = os.path.join(d, sd)
++                resources += list_by_path(manifest_name, spath, cache, False)
++            del dirs[:]
++            continue
+         # remove hidden dirs (esp. .svn/.git)
+         [dirs.remove(di) for di in dirs if di[0] == '.']
+     return resources

diff --git a/dev-python/rospkg/metadata.xml b/dev-python/rospkg/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-python/rospkg/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>

diff --git a/dev-python/rospkg/rospkg-1.0.35.ebuild b/dev-python/rospkg/rospkg-1.0.35.ebuild
new file mode 100644
index 0000000..06dd93b
--- /dev/null
+++ b/dev-python/rospkg/rospkg-1.0.35.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="http://github.com/ros-infrastructure/rospkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the ROS package system"
+HOMEPAGE="http://wiki.ros.org/rospkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+	# Needed for tests
+	S="${WORKDIR}/${PN}"
+	EGIT_CHECKOUT_DIR="${S}"
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		http://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+"
+PATCHES=(
+	"${FILESDIR}/norecurse.patch"
+)
+
+python_test() {
+	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# Avoid recursing into /usr/share when looking for packages.
+	dodir /usr/share
+	touch "${ED}/usr/share/rospack_norecurse"
+}

diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild
new file mode 100644
index 0000000..06dd93b
--- /dev/null
+++ b/dev-python/rospkg/rospkg-9999.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="http://github.com/ros-infrastructure/rospkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the ROS package system"
+HOMEPAGE="http://wiki.ros.org/rospkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+	# Needed for tests
+	S="${WORKDIR}/${PN}"
+	EGIT_CHECKOUT_DIR="${S}"
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		http://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+"
+PATCHES=(
+	"${FILESDIR}/norecurse.patch"
+)
+
+python_test() {
+	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# Avoid recursing into /usr/share when looking for packages.
+	dodir /usr/share
+	touch "${ED}/usr/share/rospack_norecurse"
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/rospkg/files/, dev-python/rospkg/
@ 2016-02-23 18:38 Alexis Ballier
  0 siblings, 0 replies; 8+ messages in thread
From: Alexis Ballier @ 2016-02-23 18:38 UTC (permalink / raw
  To: gentoo-commits

commit:     b8ea6a01778544fd37dacafbfeb35fe5616d081e
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 23 18:32:18 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 18:32:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8ea6a01

dev-python/rospkg: remove old

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 dev-python/rospkg/Manifest                |  2 --
 dev-python/rospkg/files/py3.patch         | 21 ------------
 dev-python/rospkg/rospkg-1.0.35.ebuild    | 56 ------------------------------
 dev-python/rospkg/rospkg-1.0.37-r1.ebuild | 57 -------------------------------
 4 files changed, 136 deletions(-)

diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
index 24e6a92..1024384 100644
--- a/dev-python/rospkg/Manifest
+++ b/dev-python/rospkg/Manifest
@@ -1,3 +1 @@
-DIST rospkg-1.0.35.tar.gz 88589 SHA256 9ce13cb1d0f470f24cdb7f665d53948fcd0db19be7c8946ad998cbcf3998da30 SHA512 01e59dc3eb8290af661dc54902da950649a81b3caa0b65ad7dba18c0c6d0ba1ed08bec802edbced49f65515f20f1b8db719bfb576eb38c87982386aac22a2e31 WHIRLPOOL 20ebafd588c6cf8598d155cdd6ec76a9f1b7ce1bb9f1a545159a75d4fe5c3621005ea5abb5b15080716439bdec91a943855a564014eee295999126caed5c34e3
-DIST rospkg-1.0.37.tar.gz 89332 SHA256 733e9e30d30a1f293f2d2b07060d231746ce88f7cfecb076d466d9aece5a0a8a SHA512 5e8e938831aac0c14b18d0f5063c8c8d50a2f13a4a15ce15955d854a840a8b46bab42d854b6d61d1e4e6bdef95f90e10008838d16b31e7d5b0d963b1c3c246d6 WHIRLPOOL 3d50c070197019b607e23a430affec8950539e0b32dd88f14e85027acea87435abebd8f58c4aeadd11cafee00d2faa26a3d9d88a0afb6efdc42dc0797642ef39
 DIST rospkg-1.0.38.tar.gz 89321 SHA256 1a1567d3e33c3910518dbfbb09760c499153b1c0ad6b8ddc5045488c11db43e4 SHA512 21cc9057a445b06db66b454e46c3ecdf8d83e54bbf4c204c63b13278dc93cdad60a80f4cab29eba7bc1811d43b406f91435499f7e58fa97814302dfb786f483e WHIRLPOOL 109e8d5ddc3f432c28959b7e6f15703aa2d67cd3ee524e4964e5388a7982b6aea144e5afcf0d22add230e33beb485ade0656025b77f2b56be75d313aa1e52870

diff --git a/dev-python/rospkg/files/py3.patch b/dev-python/rospkg/files/py3.patch
deleted file mode 100644
index 268ff89..0000000
--- a/dev-python/rospkg/files/py3.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/ros-infrastructure/rospkg/pull/90
-
-commit 7be8d9e5ec3c6bffd970e93053078b707879c7b9
-Author: Alexis Ballier <aballier@gentoo.org>
-Date:   Tue Oct 13 10:08:42 2015 +0200
-
-    src/rospkg/os_detect.py: Use "string in dict" instead of "dict.has_key(string)" for python3 compatibility.
-
-diff --git a/src/rospkg/os_detect.py b/src/rospkg/os_detect.py
-index 14b57c2..554b607 100644
---- a/src/rospkg/os_detect.py
-+++ b/src/rospkg/os_detect.py
-@@ -150,7 +150,7 @@ class FdoDetect(OsDetector):
-     """
-     def __init__(self, fdo_id):
-         release_info = read_os_release()
--        if release_info is not None and release_info.has_key("ID") and release_info["ID"] == fdo_id:
-+        if release_info is not None and "ID" in release_info and release_info["ID"] == fdo_id:
-             self.release_info = release_info
-         else:
-             self.release_info = None

diff --git a/dev-python/rospkg/rospkg-1.0.35.ebuild b/dev-python/rospkg/rospkg-1.0.35.ebuild
deleted file mode 100644
index 06dd93b..0000000
--- a/dev-python/rospkg/rospkg-1.0.35.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="http://github.com/ros-infrastructure/rospkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the ROS package system"
-HOMEPAGE="http://wiki.ros.org/rospkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-	# Needed for tests
-	S="${WORKDIR}/${PN}"
-	EGIT_CHECKOUT_DIR="${S}"
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		http://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-"
-PATCHES=(
-	"${FILESDIR}/norecurse.patch"
-)
-
-python_test() {
-	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Avoid recursing into /usr/share when looking for packages.
-	dodir /usr/share
-	touch "${ED}/usr/share/rospack_norecurse"
-}

diff --git a/dev-python/rospkg/rospkg-1.0.37-r1.ebuild b/dev-python/rospkg/rospkg-1.0.37-r1.ebuild
deleted file mode 100644
index 526c071..0000000
--- a/dev-python/rospkg/rospkg-1.0.37-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="http://github.com/ros-infrastructure/rospkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the ROS package system"
-HOMEPAGE="http://wiki.ros.org/rospkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-	# Needed for tests
-	S="${WORKDIR}/${PN}"
-	EGIT_CHECKOUT_DIR="${S}"
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		http://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-"
-PATCHES=(
-	"${FILESDIR}/norecurse.patch"
-	"${FILESDIR}/py3.patch"
-)
-
-python_test() {
-	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Avoid recursing into /usr/share when looking for packages.
-	dodir /usr/share
-	touch "${ED}/usr/share/rospack_norecurse"
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/rospkg/files/, dev-python/rospkg/
@ 2016-10-07 15:55 Alexis Ballier
  0 siblings, 0 replies; 8+ messages in thread
From: Alexis Ballier @ 2016-10-07 15:55 UTC (permalink / raw
  To: gentoo-commits

commit:     01d5d3de1190a8355e8d42e739bed44dd427a633
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  7 15:54:09 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Oct  7 15:55:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01d5d3de

dev-python/rospkg: drop norecurse patch now that ROS_PACKAGE_PATH is installed in /usr/share/ros_packages.

Package-Manager: portage-2.3.1

 dev-python/rospkg/files/norecurse.patch            | 64 ----------------------
 ...ospkg-1.0.41.ebuild => rospkg-1.0.41-r1.ebuild} | 11 ----
 dev-python/rospkg/rospkg-9999.ebuild               | 13 +----
 3 files changed, 1 insertion(+), 87 deletions(-)

diff --git a/dev-python/rospkg/files/norecurse.patch b/dev-python/rospkg/files/norecurse.patch
deleted file mode 100644
index 4b7aae9..00000000
--- a/dev-python/rospkg/files/norecurse.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-commit c2e06e0ea0b4a1cbb67049ab77a80f53646fb0b2
-Author: Alexis Ballier <aballier@gentoo.org>
-Date:   Tue Dec 23 12:27:19 2014 +0100
-
-    Add support for rospack_norecurse to avoid recursing into all subdirectories when looking for a package.
-    
-    I am installing ros into /usr, hence this searches in /usr/share. I have a lot of directories, not ROS related, into /usr/share (e.g. a full TeX Live install), and I get these timings:
-    
-    Without rospack_norecurse in /usr/share:
-    $ time rosversion rospack
-    2.2.5
-    
-    real    0m2.861s
-    user    0m1.588s
-    sys     0m1.267s
-    
-    With rospack_norecurse in /usr/share:
-    $ time rosversion rospack
-    2.2.5
-    
-    real    0m0.135s
-    user    0m0.100s
-    sys     0m0.034s
-    
-    This is on a desktop with a SSD drive. On an arm board, with much less packages in /usr/share but way much slower I/O I remember hitting the 10 seconds timeout for roscore to start.
-
-diff --git a/src/rospkg/rospack.py b/src/rospkg/rospack.py
-index e55acec..7ed98de 100644
---- a/src/rospkg/rospack.py
-+++ b/src/rospkg/rospack.py
-@@ -42,7 +42,7 @@ from .stack import parse_stack_file, InvalidStack
- _cache_lock = Lock()
- 
- 
--def list_by_path(manifest_name, path, cache):
-+def list_by_path(manifest_name, path, cache, recurse=True):
-     """
-     List ROS stacks or packages within the specified path.
- 
-@@ -53,6 +53,7 @@ def list_by_path(manifest_name, path, cache):
-     :param manifest_name: MANIFEST_FILE or STACK_FILE, ``str``
-     :param path: path to list resources in, ``str``
-     :param cache: path cache to update. Maps resource name to directory path, ``{str: str}``
-+    :param recurse: search recursively in subdirectories ``bool``
-     :returns: complete list of resources in ROS environment, ``[str]``
-     """
-     resources = []
-@@ -89,9 +90,15 @@ def list_by_path(manifest_name, path, cache):
-             # optimization for stacks.
-             del dirs[:]
-             continue #leaf     
--        elif 'rospack_nosubdirs' in files:
-+        elif 'rospack_nosubdirs' in files or not recurse:
-             del dirs[:]
-             continue  #leaf
-+        elif 'rospack_norecurse' in files:
-+            for sd in dirs:
-+                spath = os.path.join(d, sd)
-+                resources += list_by_path(manifest_name, spath, cache, False)
-+            del dirs[:]
-+            continue
-         # remove hidden dirs (esp. .svn/.git)
-         [dirs.remove(di) for di in dirs if di[0] == '.']
-     return resources

diff --git a/dev-python/rospkg/rospkg-1.0.41.ebuild b/dev-python/rospkg/rospkg-1.0.41-r1.ebuild
similarity index 82%
rename from dev-python/rospkg/rospkg-1.0.41.ebuild
rename to dev-python/rospkg/rospkg-1.0.41-r1.ebuild
index 9939d92..666d51a 100644
--- a/dev-python/rospkg/rospkg-1.0.41.ebuild
+++ b/dev-python/rospkg/rospkg-1.0.41-r1.ebuild
@@ -39,18 +39,7 @@ DEPEND="${RDEPEND}
 		dev-python/coverage[${PYTHON_USEDEP}]
 	)
 "
-PATCHES=(
-	"${FILESDIR}/norecurse.patch"
-)
 
 python_test() {
 	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
 }
-
-src_install() {
-	distutils-r1_src_install
-
-	# Avoid recursing into /usr/share when looking for packages.
-	dodir /usr/share
-	touch "${ED}/usr/share/rospack_norecurse"
-}

diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild
index 5185441..666d51a 100644
--- a/dev-python/rospkg/rospkg-9999.ebuild
+++ b/dev-python/rospkg/rospkg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -39,18 +39,7 @@ DEPEND="${RDEPEND}
 		dev-python/coverage[${PYTHON_USEDEP}]
 	)
 "
-PATCHES=(
-	"${FILESDIR}/norecurse.patch"
-)
 
 python_test() {
 	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
 }
-
-src_install() {
-	distutils-r1_src_install
-
-	# Avoid recursing into /usr/share when looking for packages.
-	dodir /usr/share
-	touch "${ED}/usr/share/rospack_norecurse"
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/rospkg/files/, dev-python/rospkg/
@ 2017-02-28 11:27 Alexis Ballier
  0 siblings, 0 replies; 8+ messages in thread
From: Alexis Ballier @ 2017-02-28 11:27 UTC (permalink / raw
  To: gentoo-commits

commit:     b74bbdb103793752fe430918e31a13825c58fc1b
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 11:04:00 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 11:26:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b74bbdb1

dev-python/rospkg: strip ros_packages/ from path when updating the cache

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-python/rospkg/files/gentoo.patch                      | 15 +++++++++++++++
 .../rospkg/{rospkg-9999.ebuild => rospkg-1.1.0-r1.ebuild} |  1 +
 dev-python/rospkg/rospkg-9999.ebuild                      |  1 +
 3 files changed, 17 insertions(+)

diff --git a/dev-python/rospkg/files/gentoo.patch b/dev-python/rospkg/files/gentoo.patch
new file mode 100644
index 0000000000..5a9e7738b3
--- /dev/null
+++ b/dev-python/rospkg/files/gentoo.patch
@@ -0,0 +1,15 @@
+Strip ros_packages/ from paths. ros_packages is only for avoiding to crawl the
+whole /usr but the real one in the path without it.
+
+Index: rospkg-1.1.0/src/rospkg/rospack.py
+===================================================================
+--- rospkg-1.1.0.orig/src/rospkg/rospack.py
++++ rospkg-1.1.0/src/rospkg/rospack.py
+@@ -59,6 +59,7 @@ def list_by_path(manifest_name, path, ca
+     path = os.path.abspath(path)
+     basename = os.path.basename
+     for d, dirs, files in os.walk(path, topdown=True, followlinks=True):
++        d = d.replace('ros_packages/', '')
+         if 'CATKIN_IGNORE' in files:
+             del dirs[:]
+             continue  # leaf

diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-1.1.0-r1.ebuild
similarity index 96%
copy from dev-python/rospkg/rospkg-9999.ebuild
copy to dev-python/rospkg/rospkg-1.1.0-r1.ebuild
index 56908705af..6ed953cac5 100644
--- a/dev-python/rospkg/rospkg-9999.ebuild
+++ b/dev-python/rospkg/rospkg-1.1.0-r1.ebuild
@@ -37,6 +37,7 @@ DEPEND="${RDEPEND}
 		dev-python/coverage[${PYTHON_USEDEP}]
 	)
 "
+PATCHES=( "${FILESDIR}/gentoo.patch" )
 
 python_test() {
 	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die

diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild
index 56908705af..6ed953cac5 100644
--- a/dev-python/rospkg/rospkg-9999.ebuild
+++ b/dev-python/rospkg/rospkg-9999.ebuild
@@ -37,6 +37,7 @@ DEPEND="${RDEPEND}
 		dev-python/coverage[${PYTHON_USEDEP}]
 	)
 "
+PATCHES=( "${FILESDIR}/gentoo.patch" )
 
 python_test() {
 	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/rospkg/files/, dev-python/rospkg/
@ 2019-12-11 15:26 Alexis Ballier
  0 siblings, 0 replies; 8+ messages in thread
From: Alexis Ballier @ 2019-12-11 15:26 UTC (permalink / raw
  To: gentoo-commits

commit:     465dadec0b854f7e7e7cdfa9b13ad8186b5ddfbb
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 11 14:07:18 2019 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Dec 11 15:26:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=465dadec

dev-python/rospkg: use yaml.safe_load

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 dev-python/rospkg/files/yaml_load.patch | 52 +++++++++++++++++++++++++++++++++
 dev-python/rospkg/rospkg-1.2.0.ebuild   |  2 +-
 dev-python/rospkg/rospkg-9999.ebuild    |  2 +-
 3 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/dev-python/rospkg/files/yaml_load.patch b/dev-python/rospkg/files/yaml_load.patch
new file mode 100644
index 00000000000..f56b6db59ad
--- /dev/null
+++ b/dev-python/rospkg/files/yaml_load.patch
@@ -0,0 +1,52 @@
+Index: rospkg-1.2.0/src/rospkg/distro.py
+===================================================================
+--- rospkg-1.2.0.orig/src/rospkg/distro.py
++++ rospkg-1.2.0/src/rospkg/distro.py
+@@ -192,14 +192,14 @@ def load_distro(source_uri):
+         if os.path.isfile(source_uri):
+             # load rosdistro file
+             with open(source_uri) as f:
+-                raw_data = yaml.load(f.read())
++                raw_data = yaml.safe_load(f.read())
+         else:
+             try:
+                 request = urlopen(source_uri)
+             except Exception as e:
+                 raise ResourceNotFound('%s (%s)' % (str(e), source_uri))
+             try:
+-                raw_data = yaml.load(request)
++                raw_data = yaml.safe_load(request)
+             except ValueError:
+                 raise ResourceNotFound(source_uri)
+         if not type(raw_data) == dict:
+Index: rospkg-1.2.0/test/test_rospkg_distro.py
+===================================================================
+--- rospkg-1.2.0.orig/test/test_rospkg_distro.py
++++ rospkg-1.2.0/test/test_rospkg_distro.py
+@@ -315,7 +315,7 @@ def test_load_distro_simple():
+ 
+     assert distro.release_name == 'simple', distro.release_name
+     assert distro.version == '1', distro.version
+-    assert yaml.load(open(p)) == distro.raw_data, distro.raw_data
++    assert yaml.safe_load(open(p)) == distro.raw_data, distro.raw_data
+     assert set(distro.variants.keys()) == set(['base'])
+     assert set(distro.stacks.keys()) == set(['stack1'])
+ 
+@@ -334,7 +334,7 @@ def test_load_distro_diamondback():
+ 
+     assert distro.release_name == 'diamondback', distro.release_name
+     assert distro.version == 'r8596', distro.version
+-    assert yaml.load(open(p)) == distro.raw_data, distro.raw_data
++    assert yaml.safe_load(open(p)) == distro.raw_data, distro.raw_data
+     assert set(distro.variants.keys()) == set(diamondback_variants)
+     assert set(distro.stacks.keys()) == set(diamondback_stacks), set(distro.stacks.keys()) ^ set(diamondback_stacks)
+ 
+@@ -350,7 +350,7 @@ def test_load_distro_diamondback():
+ 
+ def test__load_variants():
+     from rospkg.distro import _load_variants
+-    raw_data = yaml.load("""variants:
++    raw_data = yaml.safe_load("""variants:
+ - ros-base:
+     stacks: [ros, ros_comm]
+ - ros-full:

diff --git a/dev-python/rospkg/rospkg-1.2.0.ebuild b/dev-python/rospkg/rospkg-1.2.0.ebuild
index bb6a7366b4a..49c3524f1d4 100644
--- a/dev-python/rospkg/rospkg-1.2.0.ebuild
+++ b/dev-python/rospkg/rospkg-1.2.0.ebuild
@@ -42,7 +42,7 @@ DEPEND="${RDEPEND} ${BDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
-PATCHES=( "${FILESDIR}/gentoo.patch" )
+PATCHES=( "${FILESDIR}/gentoo.patch" "${FILESDIR}/yaml_load.patch" )
 
 python_test() {
 	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die

diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild
index bb6a7366b4a..49c3524f1d4 100644
--- a/dev-python/rospkg/rospkg-9999.ebuild
+++ b/dev-python/rospkg/rospkg-9999.ebuild
@@ -42,7 +42,7 @@ DEPEND="${RDEPEND} ${BDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
-PATCHES=( "${FILESDIR}/gentoo.patch" )
+PATCHES=( "${FILESDIR}/gentoo.patch" "${FILESDIR}/yaml_load.patch" )
 
 python_test() {
 	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/rospkg/files/, dev-python/rospkg/
@ 2020-03-29  7:31 Michał Górny
  0 siblings, 0 replies; 8+ messages in thread
From: Michał Górny @ 2020-03-29  7:31 UTC (permalink / raw
  To: gentoo-commits

commit:     dc9da7ffe2c399ae57974a164dee6bedebdeef04
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 07:17:40 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 07:31:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc9da7ff

dev-python/rospkg: Remove redundant versions

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/rospkg/Manifest             |  2 --
 dev-python/rospkg/files/gentoo.patch   | 15 -----------
 dev-python/rospkg/rospkg-1.1.10.ebuild | 49 ----------------------------------
 dev-python/rospkg/rospkg-1.1.9.ebuild  | 49 ----------------------------------
 4 files changed, 115 deletions(-)

diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
index a12f2364d91..3d7146dfd9e 100644
--- a/dev-python/rospkg/Manifest
+++ b/dev-python/rospkg/Manifest
@@ -1,3 +1 @@
-DIST rospkg-1.1.10.tar.gz 90434 BLAKE2B 1eb128d7e3f6d07e8309ecf5ea6c4340afcbb6f0618fd4628543c046003782750c5013c13ff2ed17018abc6efc6ce2042ccf2c6dccea8933be7045ddfe3f4522 SHA512 54b1b0ca4683b9388989501781239cf35873f2bf2028d176718f624999835b21e44f0cc5988624b37f7172d21f0c01aa336d35a884753c842098e558c37ac6c8
-DIST rospkg-1.1.9.tar.gz 90412 BLAKE2B 4cca7d1ebfcba495aafd766f0d720a6bc6e5aade0bff098d4a1cbab3b55c7a720de7d1f97edf806a93cc21eeda4cac86e844b5e3b23f85cbcb7b328fd07da222 SHA512 d33005e29313ba06959189f8f563361fd9523c2368855f260347b4c509d8b4053f74db3e2cf5986031653d647ded097f272f65d617da93e13cf77a906cb56ca6
 DIST rospkg-1.2.0.tar.gz 90516 BLAKE2B 0c1d993c70f0ad383ab457c846416a22b9adf9611704a918c3765659231846749228073ea04950ddfdbe13f7e51f87ce5d17c1488f995e846a6590a0f9549efd SHA512 f059259a38b8b2281496a69f8a55fdd31a11e91583babb82e574363c40c90221a4abb7c1d7a5ed6be3b2389ee6aaf08b4e016260c73dd779f8c7993e6eba78db

diff --git a/dev-python/rospkg/files/gentoo.patch b/dev-python/rospkg/files/gentoo.patch
deleted file mode 100644
index 5a9e7738b39..00000000000
--- a/dev-python/rospkg/files/gentoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Strip ros_packages/ from paths. ros_packages is only for avoiding to crawl the
-whole /usr but the real one in the path without it.
-
-Index: rospkg-1.1.0/src/rospkg/rospack.py
-===================================================================
---- rospkg-1.1.0.orig/src/rospkg/rospack.py
-+++ rospkg-1.1.0/src/rospkg/rospack.py
-@@ -59,6 +59,7 @@ def list_by_path(manifest_name, path, ca
-     path = os.path.abspath(path)
-     basename = os.path.basename
-     for d, dirs, files in os.walk(path, topdown=True, followlinks=True):
-+        d = d.replace('ros_packages/', '')
-         if 'CATKIN_IGNORE' in files:
-             del dirs[:]
-             continue  # leaf

diff --git a/dev-python/rospkg/rospkg-1.1.10.ebuild b/dev-python/rospkg/rospkg-1.1.10.ebuild
deleted file mode 100644
index f8ef1bca937..00000000000
--- a/dev-python/rospkg/rospkg-1.1.10.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the ROS package system"
-HOMEPAGE="http://wiki.ros.org/rospkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-	# Needed for tests
-	S="${WORKDIR}/${PN}"
-	EGIT_CHECKOUT_DIR="${S}"
-else
-	SRC_URI="https://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND} ${BDEPEND}
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
-
-python_test() {
-	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
-}

diff --git a/dev-python/rospkg/rospkg-1.1.9.ebuild b/dev-python/rospkg/rospkg-1.1.9.ebuild
deleted file mode 100644
index f8ef1bca937..00000000000
--- a/dev-python/rospkg/rospkg-1.1.9.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the ROS package system"
-HOMEPAGE="http://wiki.ros.org/rospkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-	# Needed for tests
-	S="${WORKDIR}/${PN}"
-	EGIT_CHECKOUT_DIR="${S}"
-else
-	SRC_URI="https://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND} ${BDEPEND}
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
-
-python_test() {
-	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/rospkg/files/, dev-python/rospkg/
@ 2020-04-14 12:54 Alexis Ballier
  0 siblings, 0 replies; 8+ messages in thread
From: Alexis Ballier @ 2020-04-14 12:54 UTC (permalink / raw
  To: gentoo-commits

commit:     4274c4df40af7e72ad02e8bc597f2207adaf791e
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 14 12:53:06 2020 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Apr 14 12:54:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4274c4df

Revert "dev-python/rospkg: Remove redundant versions"

This reverts commit dc9da7ffe2c399ae57974a164dee6bedebdeef04.

Closes: https://bugs.gentoo.org/715382
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 dev-python/rospkg/Manifest             |  2 ++
 dev-python/rospkg/files/gentoo.patch   | 15 +++++++++++
 dev-python/rospkg/rospkg-1.1.10.ebuild | 49 ++++++++++++++++++++++++++++++++++
 dev-python/rospkg/rospkg-1.1.9.ebuild  | 49 ++++++++++++++++++++++++++++++++++
 4 files changed, 115 insertions(+)

diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
index 3d7146dfd9e..a12f2364d91 100644
--- a/dev-python/rospkg/Manifest
+++ b/dev-python/rospkg/Manifest
@@ -1 +1,3 @@
+DIST rospkg-1.1.10.tar.gz 90434 BLAKE2B 1eb128d7e3f6d07e8309ecf5ea6c4340afcbb6f0618fd4628543c046003782750c5013c13ff2ed17018abc6efc6ce2042ccf2c6dccea8933be7045ddfe3f4522 SHA512 54b1b0ca4683b9388989501781239cf35873f2bf2028d176718f624999835b21e44f0cc5988624b37f7172d21f0c01aa336d35a884753c842098e558c37ac6c8
+DIST rospkg-1.1.9.tar.gz 90412 BLAKE2B 4cca7d1ebfcba495aafd766f0d720a6bc6e5aade0bff098d4a1cbab3b55c7a720de7d1f97edf806a93cc21eeda4cac86e844b5e3b23f85cbcb7b328fd07da222 SHA512 d33005e29313ba06959189f8f563361fd9523c2368855f260347b4c509d8b4053f74db3e2cf5986031653d647ded097f272f65d617da93e13cf77a906cb56ca6
 DIST rospkg-1.2.0.tar.gz 90516 BLAKE2B 0c1d993c70f0ad383ab457c846416a22b9adf9611704a918c3765659231846749228073ea04950ddfdbe13f7e51f87ce5d17c1488f995e846a6590a0f9549efd SHA512 f059259a38b8b2281496a69f8a55fdd31a11e91583babb82e574363c40c90221a4abb7c1d7a5ed6be3b2389ee6aaf08b4e016260c73dd779f8c7993e6eba78db

diff --git a/dev-python/rospkg/files/gentoo.patch b/dev-python/rospkg/files/gentoo.patch
new file mode 100644
index 00000000000..5a9e7738b39
--- /dev/null
+++ b/dev-python/rospkg/files/gentoo.patch
@@ -0,0 +1,15 @@
+Strip ros_packages/ from paths. ros_packages is only for avoiding to crawl the
+whole /usr but the real one in the path without it.
+
+Index: rospkg-1.1.0/src/rospkg/rospack.py
+===================================================================
+--- rospkg-1.1.0.orig/src/rospkg/rospack.py
++++ rospkg-1.1.0/src/rospkg/rospack.py
+@@ -59,6 +59,7 @@ def list_by_path(manifest_name, path, ca
+     path = os.path.abspath(path)
+     basename = os.path.basename
+     for d, dirs, files in os.walk(path, topdown=True, followlinks=True):
++        d = d.replace('ros_packages/', '')
+         if 'CATKIN_IGNORE' in files:
+             del dirs[:]
+             continue  # leaf

diff --git a/dev-python/rospkg/rospkg-1.1.10.ebuild b/dev-python/rospkg/rospkg-1.1.10.ebuild
new file mode 100644
index 00000000000..f8ef1bca937
--- /dev/null
+++ b/dev-python/rospkg/rospkg-1.1.10.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 pypy3 )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the ROS package system"
+HOMEPAGE="http://wiki.ros.org/rospkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+	# Needed for tests
+	S="${WORKDIR}/${PN}"
+	EGIT_CHECKOUT_DIR="${S}"
+else
+	SRC_URI="https://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND} ${BDEPEND}
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+PATCHES=( "${FILESDIR}/gentoo.patch" )
+
+python_test() {
+	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
+}

diff --git a/dev-python/rospkg/rospkg-1.1.9.ebuild b/dev-python/rospkg/rospkg-1.1.9.ebuild
new file mode 100644
index 00000000000..f8ef1bca937
--- /dev/null
+++ b/dev-python/rospkg/rospkg-1.1.9.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 pypy3 )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the ROS package system"
+HOMEPAGE="http://wiki.ros.org/rospkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+	# Needed for tests
+	S="${WORKDIR}/${PN}"
+	EGIT_CHECKOUT_DIR="${S}"
+else
+	SRC_URI="https://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND} ${BDEPEND}
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+PATCHES=( "${FILESDIR}/gentoo.patch" )
+
+python_test() {
+	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/rospkg/files/, dev-python/rospkg/
@ 2023-01-24 20:20 Jakov Smolić
  0 siblings, 0 replies; 8+ messages in thread
From: Jakov Smolić @ 2023-01-24 20:20 UTC (permalink / raw
  To: gentoo-commits

commit:     f18a1453eb18abf002ff76ce948b013c7a94c191
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 17:20:27 2023 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 20:17:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f18a1453

dev-python/rospkg: treeclean

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-python/rospkg/Manifest            |  1 -
 dev-python/rospkg/files/gentoo.patch  | 15 -------------
 dev-python/rospkg/metadata.xml        | 11 ----------
 dev-python/rospkg/rospkg-1.4.0.ebuild | 41 -----------------------------------
 dev-python/rospkg/rospkg-9999.ebuild  | 41 -----------------------------------
 5 files changed, 109 deletions(-)

diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
deleted file mode 100644
index fb28f34d948c..000000000000
--- a/dev-python/rospkg/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST rospkg-1.4.0.tar.gz 91707 BLAKE2B 02ee199a5f59d1256561cda0e9a6f05e40337a604bfba34d076cd09812fb4cd2f253785e894e9590de86226e8e250d77f50f18c4ffb2857c69095f329c7aa58e SHA512 4e4a40961ed1cfba0746069725378414dc61d3f55e479e7af5efa211419e34e44f5964f8ab41a8c4c9e9b74ae275fd29cf6ffda0eab66b6a0ec7fc7066719797

diff --git a/dev-python/rospkg/files/gentoo.patch b/dev-python/rospkg/files/gentoo.patch
deleted file mode 100644
index 5a9e7738b390..000000000000
--- a/dev-python/rospkg/files/gentoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Strip ros_packages/ from paths. ros_packages is only for avoiding to crawl the
-whole /usr but the real one in the path without it.
-
-Index: rospkg-1.1.0/src/rospkg/rospack.py
-===================================================================
---- rospkg-1.1.0.orig/src/rospkg/rospack.py
-+++ rospkg-1.1.0/src/rospkg/rospack.py
-@@ -59,6 +59,7 @@ def list_by_path(manifest_name, path, ca
-     path = os.path.abspath(path)
-     basename = os.path.basename
-     for d, dirs, files in os.walk(path, topdown=True, followlinks=True):
-+        d = d.replace('ros_packages/', '')
-         if 'CATKIN_IGNORE' in files:
-             del dirs[:]
-             continue  # leaf

diff --git a/dev-python/rospkg/metadata.xml b/dev-python/rospkg/metadata.xml
deleted file mode 100644
index c01ba35d0853..000000000000
--- a/dev-python/rospkg/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-infrastructure/rospkg</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/dev-python/rospkg/rospkg-1.4.0.ebuild b/dev-python/rospkg/rospkg-1.4.0.ebuild
deleted file mode 100644
index 4e4d4e300823..000000000000
--- a/dev-python/rospkg/rospkg-1.4.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-DESCRIPTION="Standalone Python library for the ROS package system"
-HOMEPAGE="https://wiki.ros.org/rospkg"
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg"
-	inherit git-r3
-
-	S="${WORKDIR}/${PN}"
-	EGIT_CHECKOUT_DIR="${S}"
-else
-	SRC_URI="https://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-PATCHES=(
-	"${FILESDIR}/gentoo.patch"
-)
-
-distutils_enable_tests pytest

diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild
deleted file mode 100644
index 4e4d4e300823..000000000000
--- a/dev-python/rospkg/rospkg-9999.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-DESCRIPTION="Standalone Python library for the ROS package system"
-HOMEPAGE="https://wiki.ros.org/rospkg"
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg"
-	inherit git-r3
-
-	S="${WORKDIR}/${PN}"
-	EGIT_CHECKOUT_DIR="${S}"
-else
-	SRC_URI="https://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-PATCHES=(
-	"${FILESDIR}/gentoo.patch"
-)
-
-distutils_enable_tests pytest


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2023-01-24 20:20 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-16 21:33 [gentoo-commits] repo/gentoo:master commit in: dev-python/rospkg/files/, dev-python/rospkg/ Alexis Ballier
  -- strict thread matches above, loose matches on Subject: below --
2016-02-23 18:38 Alexis Ballier
2016-10-07 15:55 Alexis Ballier
2017-02-28 11:27 Alexis Ballier
2019-12-11 15:26 Alexis Ballier
2020-03-29  7:31 Michał Górny
2020-04-14 12:54 Alexis Ballier
2023-01-24 20:20 Jakov Smolić

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox