From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 53B2415800F for ; Tue, 24 Jan 2023 20:20:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1AEC0E0896; Tue, 24 Jan 2023 20:20:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EC09AE0896 for ; Tue, 24 Jan 2023 20:20:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AB4CC340E98 for ; Tue, 24 Jan 2023 20:20:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 01FD689F for ; Tue, 24 Jan 2023 20:20:08 +0000 (UTC) From: "Jakov Smolić" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jakov Smolić" Message-ID: <1674591467.e30738b18bdd38e1da484c50f3b846d1f811d348.jsmolic@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/rosdistro/, dev-python/rosdistro/files/, profiles/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/rosdistro/Manifest dev-python/rosdistro/files/yaml.patch dev-python/rosdistro/metadata.xml dev-python/rosdistro/rosdistro-0.8.3.ebuild dev-python/rosdistro/rosdistro-9999.ebuild profiles/package.mask X-VCS-Directories: dev-python/rosdistro/files/ dev-python/rosdistro/ profiles/ X-VCS-Committer: jsmolic X-VCS-Committer-Name: Jakov Smolić X-VCS-Revision: e30738b18bdd38e1da484c50f3b846d1f811d348 X-VCS-Branch: master Date: Tue, 24 Jan 2023 20:20:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 65d0f3f6-40a4-4f7b-8f18-8cbc5bd0851b X-Archives-Hash: d9bee80008bd8539dc169df015e6b018 commit: e30738b18bdd38e1da484c50f3b846d1f811d348 Author: Jakov Smolić gentoo org> AuthorDate: Tue Jan 24 17:20:43 2023 +0000 Commit: Jakov Smolić gentoo org> CommitDate: Tue Jan 24 20:17:47 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e30738b1 dev-python/rosdistro: treeclean Signed-off-by: Jakov Smolić gentoo.org> dev-python/rosdistro/Manifest | 1 - dev-python/rosdistro/files/yaml.patch | 252 ---------------------------- dev-python/rosdistro/metadata.xml | 11 -- dev-python/rosdistro/rosdistro-0.8.3.ebuild | 46 ----- dev-python/rosdistro/rosdistro-9999.ebuild | 46 ----- profiles/package.mask | 1 - 6 files changed, 357 deletions(-) diff --git a/dev-python/rosdistro/Manifest b/dev-python/rosdistro/Manifest deleted file mode 100644 index 29265cfd33c5..000000000000 --- a/dev-python/rosdistro/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST rosdistro-0.8.3.tar.gz 61665 BLAKE2B 2d5084409d8222cd277a710a06616fa914a35fb6750e32df7bdee6b7b0285df1b15648b8255cda4aa5867dba3611c5ea294db4711ebf2cc38a11648092623aab SHA512 19e248497b4001c522a84a52d768bc9f20a08020c88574d1a8345cf2173dc2aadd8a1480d4fddf2285ac579ee69dd0b6d4b930333cd6a9cbe32708efed2e5747 diff --git a/dev-python/rosdistro/files/yaml.patch b/dev-python/rosdistro/files/yaml.patch deleted file mode 100644 index 2f81a0218b89..000000000000 --- a/dev-python/rosdistro/files/yaml.patch +++ /dev/null @@ -1,252 +0,0 @@ -Index: rosdistro-0.8.0/scripts/rosdistro_convert -=================================================================== ---- rosdistro-0.8.0.orig/scripts/rosdistro_convert -+++ rosdistro-0.8.0/scripts/rosdistro_convert -@@ -58,7 +58,7 @@ def get_targets(): - url = BASE_SRC_URL + '/releases/targets.yaml' - print('Load "%s"' % url) - yaml_str = load_url(url) -- data = yaml.load(yaml_str) -+ data = yaml.safe_load(yaml_str) - targets = {} - for d in data: - targets[d.keys()[0]] = d.values()[0] -@@ -69,13 +69,13 @@ def convert_release(dist_name, targets): - url = BASE_SRC_URL + '/releases/%s.yaml' % dist_name - print('Load "%s"' % url) - yaml_str = load_url(url) -- input_ = yaml.load(yaml_str) -+ input_ = yaml.safe_load(yaml_str) - - # improve conversion performance by reusing results from last run - last_dist = None - if os.path.exists(dist_name + '/release.yaml'): - with open(dist_name + '/release.yaml', 'r') as f: -- last_data = yaml.load(f.read()) -+ last_data = yaml.safe_load(f.read()) - last_dist = ReleaseFile(dist_name, last_data) - - output = {} -@@ -162,7 +162,7 @@ def convert_source(dist_name): - url = BASE_SRC_URL + '/releases/%s-devel.yaml' % dist_name - print('Load "%s"' % url) - yaml_str = load_url(url) -- input_ = yaml.load(yaml_str) -+ input_ = yaml.safe_load(yaml_str) - - output = {} - output['type'] = 'source' -@@ -207,7 +207,7 @@ def convert_doc(dist_name): - if filename.endswith('.rosinstall'): - name = os.path.splitext(os.path.basename(filename))[0] - with open(os.path.join(doc_base, filename)) as f: -- data = yaml.load(f) -+ data = yaml.safe_load(f) - if name.endswith('_depends'): - rosinstall_depends[name] = data - else: -Index: rosdistro-0.8.0/scripts/rosdistro_migrate_to_rep_141 -=================================================================== ---- rosdistro-0.8.0.orig/scripts/rosdistro_migrate_to_rep_141 -+++ rosdistro-0.8.0/scripts/rosdistro_migrate_to_rep_141 -@@ -18,7 +18,7 @@ import yaml - - - def migrate(index_yaml): -- data = yaml.load(open(index_yaml, 'r')) -+ data = yaml.safe_load(open(index_yaml, 'r')) - assert data['type'] == 'index' - assert data['version'] == 1 - data['version'] = 2 -@@ -75,7 +75,7 @@ def generate_repos_url(repos_url, doc_ur - data['repositories'] = {} - - # migrate release stuff -- release_data = yaml.load(open(release_url, 'r')) -+ release_data = yaml.safe_load(open(release_url, 'r')) - assert release_data['type'] == 'release' - assert release_data['version'] == 1 - -@@ -100,7 +100,7 @@ def generate_repos_url(repos_url, doc_ur - data['repositories'][repo_name] = repo_data - - # migrate doc stuff -- doc_data = yaml.load(open(doc_url, 'r')) -+ doc_data = yaml.safe_load(open(doc_url, 'r')) - assert doc_data['type'] == 'doc' - assert doc_data['version'] == 1 - -@@ -111,7 +111,7 @@ def generate_repos_url(repos_url, doc_ur - data['repositories'][repo_name]['doc'] = get_dict_parts(doc_repo_data, ['type', 'url', 'version']) - - # migrate source stuff -- source_data = yaml.load(open(source_url, 'r')) -+ source_data = yaml.safe_load(open(source_url, 'r')) - assert source_data['type'] == 'source' - assert source_data['version'] == 1 - -@@ -137,10 +137,10 @@ def update_cache(index_yaml, distro_name - if not isinstance(yaml_str, str): - yaml_str = yaml_str.decode('utf-8') - f.close() -- cache_data = yaml.load(yaml_str) -+ cache_data = yaml.safe_load(yaml_str) - - del cache_data['release_file'] -- distribution_data = yaml.load(open(os.path.join(base, distribution_file), 'r')) -+ distribution_data = yaml.safe_load(open(os.path.join(base, distribution_file), 'r')) - cache_data['distribution_file'] = distribution_data - - cache_data['release_package_xmls'] = cache_data['package_xmls'] -Index: rosdistro-0.8.0/scripts/rosdistro_migrate_to_rep_143 -=================================================================== ---- rosdistro-0.8.0.orig/scripts/rosdistro_migrate_to_rep_143 -+++ rosdistro-0.8.0/scripts/rosdistro_migrate_to_rep_143 -@@ -10,7 +10,7 @@ import yaml - - - def migrate(index_yaml): -- data = yaml.load(open(index_yaml, 'r')) -+ data = yaml.safe_load(open(index_yaml, 'r')) - assert data['type'] == 'index' - assert data['version'] == 2 - data['version'] = 3 -Index: rosdistro-0.8.0/src/rosdistro/develdistro.py -=================================================================== ---- rosdistro-0.8.0.orig/src/rosdistro/develdistro.py -+++ rosdistro-0.8.0/src/rosdistro/develdistro.py -@@ -8,7 +8,7 @@ import yaml - class DevelDistro: - def __init__(self, name): - url = urlopen('https://raw.github.com/ros/rosdistro/master/releases/{0}-devel.yaml'.format(name)) -- distro = yaml.load(url.read())['repositories'] -+ distro = yaml.safe_load(url.read())['repositories'] - self.repositories = {} - for name, data in distro.iteritems(): - repo = DevelDistroRepo(name, data) -Index: rosdistro-0.8.0/src/rosdistro/legacy.py -=================================================================== ---- rosdistro-0.8.0.orig/src/rosdistro/legacy.py -+++ rosdistro-0.8.0/src/rosdistro/legacy.py -@@ -122,7 +122,7 @@ def get_release_cache(index, dist_name): - f.close() - else: - raise NotImplementedError('The url of the cache must end with either ".yaml" or ".yaml.gz"') -- data = yaml.load(yaml_str) -+ data = yaml.safe_load(yaml_str) - return ReleaseCache(dist_name, data) - - -Index: rosdistro-0.8.0/src/rosdistro/rosdistro.py -=================================================================== ---- rosdistro-0.8.0.orig/src/rosdistro/rosdistro.py -+++ rosdistro-0.8.0/src/rosdistro/rosdistro.py -@@ -161,7 +161,7 @@ class RosDistroFile: - - # parse ros distro file - distro_url = urlopen('https://raw.github.com/ros/rosdistro/master/releases/%s.yaml' % name) -- distro = yaml.load(distro_url.read())['repositories'] -+ distro = yaml.safe_load(distro_url.read())['repositories'] - - # loop over all repo's - for repo_name, data in distro.iteritems(): -@@ -338,7 +338,7 @@ class RosDependencies: - - tar = tarfile.open(fh.name, 'r') - data = tar.extractfile(self.file_name) -- deps = yaml.load(data.read()) -+ deps = yaml.safe_load(data.read()) - if not deps \ - or 'cache_version' not in deps \ - or deps['cache_version'] != CACHE_VERSION \ -Index: rosdistro-0.8.0/test/test_distribution.py -=================================================================== ---- rosdistro-0.8.0.orig/test/test_distribution.py -+++ rosdistro-0.8.0/test/test_distribution.py -@@ -12,7 +12,7 @@ FILES_DIR = os.path.normpath(os.path.joi - def test_distribution_file(): - url = 'file://' + FILES_DIR + '/foo/distribution.yaml' - yaml_str = load_url(url) -- data = yaml.load(yaml_str) -+ data = yaml.safe_load(yaml_str) - dist_file = DistributionFile('foo', data) - _validate_dist_file(dist_file) - -Index: rosdistro-0.8.0/test/test_doc.py -=================================================================== ---- rosdistro-0.8.0.orig/test/test_doc.py -+++ rosdistro-0.8.0/test/test_doc.py -@@ -12,7 +12,7 @@ FILES_DIR = os.path.normpath(os.path.joi - def test_doc_file(): - url = 'file://' + FILES_DIR + '/foo/distribution.yaml' - yaml_str = load_url(url) -- data = yaml.load(yaml_str) -+ data = yaml.safe_load(yaml_str) - doc_file = DocFile('foo', data) - _validate_doc_file(doc_file) - -Index: rosdistro-0.8.0/test/test_doc_build.py -=================================================================== ---- rosdistro-0.8.0.orig/test/test_doc_build.py -+++ rosdistro-0.8.0/test/test_doc_build.py -@@ -12,7 +12,7 @@ FILES_DIR = os.path.normpath(os.path.joi - def test_doc_build_file(): - url = 'file://' + FILES_DIR + '/foo/doc-build.yaml' - yaml_str = load_url(url) -- data = yaml.load(yaml_str) -+ data = yaml.safe_load(yaml_str) - DocBuildFile('foo', data) - - -Index: rosdistro-0.8.0/test/test_release.py -=================================================================== ---- rosdistro-0.8.0.orig/test/test_release.py -+++ rosdistro-0.8.0/test/test_release.py -@@ -12,7 +12,7 @@ FILES_DIR = os.path.normpath(os.path.joi - def test_release_file(): - url = 'file://' + FILES_DIR + '/foo/distribution.yaml' - yaml_str = load_url(url) -- data = yaml.load(yaml_str) -+ data = yaml.safe_load(yaml_str) - rel_file = ReleaseFile('foo', data) - _validate_rel_file(rel_file) - -Index: rosdistro-0.8.0/test/test_release_build.py -=================================================================== ---- rosdistro-0.8.0.orig/test/test_release_build.py -+++ rosdistro-0.8.0/test/test_release_build.py -@@ -12,7 +12,7 @@ FILES_DIR = os.path.normpath(os.path.joi - def test_release_build_file(): - url = 'file://' + FILES_DIR + '/foo/release-build.yaml' - yaml_str = load_url(url) -- data = yaml.load(yaml_str) -+ data = yaml.safe_load(yaml_str) - ReleaseBuildFile('foo', data) - - -Index: rosdistro-0.8.0/test/test_source.py -=================================================================== ---- rosdistro-0.8.0.orig/test/test_source.py -+++ rosdistro-0.8.0/test/test_source.py -@@ -12,7 +12,7 @@ FILES_DIR = os.path.normpath(os.path.joi - def test_source_file(): - url = 'file://' + FILES_DIR + '/foo/distribution.yaml' - yaml_str = load_url(url) -- data = yaml.load(yaml_str) -+ data = yaml.safe_load(yaml_str) - src_file = SourceFile('foo', data) - _validate_src_file(src_file) - -Index: rosdistro-0.8.0/test/test_source_build.py -=================================================================== ---- rosdistro-0.8.0.orig/test/test_source_build.py -+++ rosdistro-0.8.0/test/test_source_build.py -@@ -12,7 +12,7 @@ FILES_DIR = os.path.normpath(os.path.joi - def test_source_build_file(): - url = 'file://' + FILES_DIR + '/foo/source-build.yaml' - yaml_str = load_url(url) -- data = yaml.load(yaml_str) -+ data = yaml.safe_load(yaml_str) - SourceBuildFile('foo', data) - - diff --git a/dev-python/rosdistro/metadata.xml b/dev-python/rosdistro/metadata.xml deleted file mode 100644 index 99c66b99bc49..000000000000 --- a/dev-python/rosdistro/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - ros@gentoo.org - Gentoo ROS Project - - - ros-infrastructure/rosdistro - - diff --git a/dev-python/rosdistro/rosdistro-0.8.3.ebuild b/dev-python/rosdistro/rosdistro-0.8.3.ebuild deleted file mode 100644 index c00ff94b09a0..000000000000 --- a/dev-python/rosdistro/rosdistro-0.8.3.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..10} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdistro" -fi - -inherit ${SCM} distutils-r1 - -DESCRIPTION="Tools to work with catkinized rosdistro files" -HOMEPAGE="https://wiki.ros.org/rosdistro" -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" -else - SRC_URI="https://github.com/ros-infrastructure/rosdistro/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm" -fi - -LICENSE="BSD" -SLOT="0" - -RDEPEND=" - dev-python/catkin_pkg[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}]" -BDEPEND=" - test? ( - dev-python/mock[${PYTHON_USEDEP}] - ) -" -PATCHES=( "${FILESDIR}/yaml.patch" ) - -distutils_enable_tests nose - -src_prepare() { - # Requires network access - rm -f test/test_manifest_providers.py - default -} diff --git a/dev-python/rosdistro/rosdistro-9999.ebuild b/dev-python/rosdistro/rosdistro-9999.ebuild deleted file mode 100644 index c00ff94b09a0..000000000000 --- a/dev-python/rosdistro/rosdistro-9999.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..10} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdistro" -fi - -inherit ${SCM} distutils-r1 - -DESCRIPTION="Tools to work with catkinized rosdistro files" -HOMEPAGE="https://wiki.ros.org/rosdistro" -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" -else - SRC_URI="https://github.com/ros-infrastructure/rosdistro/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm" -fi - -LICENSE="BSD" -SLOT="0" - -RDEPEND=" - dev-python/catkin_pkg[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}]" -BDEPEND=" - test? ( - dev-python/mock[${PYTHON_USEDEP}] - ) -" -PATCHES=( "${FILESDIR}/yaml.patch" ) - -distutils_enable_tests nose - -src_prepare() { - # Requires network access - rm -f test/test_manifest_providers.py - default -} diff --git a/profiles/package.mask b/profiles/package.mask index 15e4e7dbd723..de5eb35b3dc7 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -368,7 +368,6 @@ dev-python/ament_package dev-python/catkin_pkg dev-python/osrf_pycommon dev-python/python_orocos_kdl -dev-python/rosdistro # Michał Górny (2022-12-23) # Packages that still use dev-python/nose and have no revdeps.