summaryrefslogtreecommitdiff
path: root/dev-python/vcstools
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python/vcstools')
-rw-r--r--dev-python/vcstools/Manifest6
-rw-r--r--dev-python/vcstools/files/yaml.patch25
-rw-r--r--dev-python/vcstools/vcstools-0.1.40.ebuild58
-rw-r--r--dev-python/vcstools/vcstools-0.1.42.ebuild10
-rw-r--r--dev-python/vcstools/vcstools-9999.ebuild58
5 files changed, 33 insertions, 124 deletions
diff --git a/dev-python/vcstools/Manifest b/dev-python/vcstools/Manifest
index bd81c1ae543b..69b22ef6bcb2 100644
--- a/dev-python/vcstools/Manifest
+++ b/dev-python/vcstools/Manifest
@@ -1,6 +1,4 @@
-DIST vcstools-0.1.40.tar.gz 62109 BLAKE2B a5347ba62031e602421f26b081e26e55549e92fc4a0648b58a3c4c3b0134b91dba096604f83edcc51a99c989e60fa51e8af2f9ecbf992500a6e942c19da9c82c SHA512 7cd062f3c72b27f78361d3000ed8951b1723ea7dd99bf05ea711e8a8b93c42c2acebdfd6c7cf7384730c708da11bd0d2712a54e538dd833eafbcef46f23857cd
+AUX yaml.patch 1063 BLAKE2B 33d954db0dfb7caf5db07bdc287ff8f7fdb74edad7f92ea5ae3ec1076fd02077e3c87f2d12907a6eb9e419b506bafab7ca84dd0c2ca282aa08d24eccd3054ff8 SHA512 c2fa16dd567792cf7b31e1bc3a22d647ac40f4e3302c74e61202b8cc1bdb099031029ed8090ad27d54aed7d93052cc099a6bdc2e8849194ade2db44bea44eb5d
DIST vcstools-0.1.42.tar.gz 65979 BLAKE2B 2deb29116e891bc93410e4a8f58938009140d01baaa834cccfdba2be3243d98bb11507fd134284bc1dbeca1434ea0eeaf2ed332dcb579bbacf1bc92815f8623d SHA512 1b54270c878684862eb607c2e445fe24d8edfdd8ea2cc75e899044d9e8e89a882fd2dd6fb7825553f83003ae7af08850c18fdeaabaa107a6bfdb2759b32e8fa6
-EBUILD vcstools-0.1.40.ebuild 1396 BLAKE2B 2911206f1e7d91b3551728434b783492ffe0a649ae002de716c025888e2f83145a0126c7163b785c76de6a20122fc7b957ddf05e9d093116b506147af1001f6a SHA512 3261819d9202c5dc324433434535163ee8ecd95607230198693f0dc6b79269e92e4d58a19c1c0af1dcc30fbcc97845f47fc6e8edb8bf9f5ff602655d992aaf09
-EBUILD vcstools-0.1.42.ebuild 1396 BLAKE2B 2911206f1e7d91b3551728434b783492ffe0a649ae002de716c025888e2f83145a0126c7163b785c76de6a20122fc7b957ddf05e9d093116b506147af1001f6a SHA512 3261819d9202c5dc324433434535163ee8ecd95607230198693f0dc6b79269e92e4d58a19c1c0af1dcc30fbcc97845f47fc6e8edb8bf9f5ff602655d992aaf09
-EBUILD vcstools-9999.ebuild 1396 BLAKE2B 2911206f1e7d91b3551728434b783492ffe0a649ae002de716c025888e2f83145a0126c7163b785c76de6a20122fc7b957ddf05e9d093116b506147af1001f6a SHA512 3261819d9202c5dc324433434535163ee8ecd95607230198693f0dc6b79269e92e4d58a19c1c0af1dcc30fbcc97845f47fc6e8edb8bf9f5ff602655d992aaf09
+EBUILD vcstools-0.1.42.ebuild 1473 BLAKE2B 582d879431fe29da3b7b5429bc22db89b5d1d0e4c3daba3277884512da23a69e68be26d16ee478d9bb3e12b69c67402b8c47387f497bd576727ef685073a7e11 SHA512 ae62c8ca5f9b43d912bfdb8debe9b8075edb59d19c48356856d6247f4f2187849693a38fda5f824fe455d79cbff4a9e133cb8ea9cd65255cbe48f81e03d4fb70
MISC metadata.xml 331 BLAKE2B 11f0b79892ca57b4abcbd3e0538168569338972295dc250516dabf12f650416d013be219d17401ae24129ba40bea056e4831940982ae6b0368046e1efbb76974 SHA512 dbc3f8205ab4e4788a33377fd00d438a9bcc4558ff02989f20befb19de690428d377ca8e0450a47bfdc8654f74123e0e4b02a9a26ffe4f27e1a737266f5cf918
diff --git a/dev-python/vcstools/files/yaml.patch b/dev-python/vcstools/files/yaml.patch
new file mode 100644
index 000000000000..727131bc5618
--- /dev/null
+++ b/dev-python/vcstools/files/yaml.patch
@@ -0,0 +1,25 @@
+https://github.com/vcstools/vcstools/issues/158
+https://bugs.gentoo.org/698668
+
+Index: vcstools-0.1.42/src/vcstools/tar.py
+===================================================================
+--- vcstools-0.1.42.orig/src/vcstools/tar.py
++++ vcstools-0.1.42/src/vcstools/tar.py
+@@ -77,7 +77,7 @@ class TarClient(VcsClientBase):
+ """
+ if self.detect_presence():
+ with open(self.metadata_path, 'r') as metadata_file:
+- metadata = yaml.load(metadata_file.read())
++ metadata = yaml.full_load(metadata_file.read())
+ if 'url' in metadata:
+ return metadata['url']
+ return None
+@@ -165,7 +165,7 @@ class TarClient(VcsClientBase):
+
+ if self.detect_presence():
+ with open(self.metadata_path, 'r') as metadata_file:
+- metadata = yaml.load(metadata_file.read())
++ metadata = yaml.full_load(metadata_file.read())
+ if 'version' in metadata:
+ return metadata['version']
+ return None
diff --git a/dev-python/vcstools/vcstools-0.1.40.ebuild b/dev-python/vcstools/vcstools-0.1.40.ebuild
deleted file mode 100644
index 388682fd4ace..000000000000
--- a/dev-python/vcstools/vcstools-0.1.40.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/vcstools/vcstools"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Python library for interacting with various VCS systems"
-HOMEPAGE="http://wiki.ros.org/vcstools"
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
- https://github.com/vcstools/vcstools/archive/${PV}.tar.gz -> ${P}.tar.gz
- "
- KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-vcs/git
- dev-vcs/bzr
- dev-vcs/mercurial
- dev-vcs/subversion
- )
-"
-
-python_test() {
- # From travis.yml
- # Set git config to silence some stuff in the tests
- git config --global user.email "foo@example.com"
- git config --global user.name "Foo Bar"
- # Set the hg user
- echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
- # Set the bzr user
- bzr whoami "Your Name <name@example.com>"
- #git config --global user.email "you@example.com"
- #git config --global user.name "Your Name"
-
- nosetests --with-coverage --cover-package vcstools || die
-}
diff --git a/dev-python/vcstools/vcstools-0.1.42.ebuild b/dev-python/vcstools/vcstools-0.1.42.ebuild
index 388682fd4ace..721071fc589c 100644
--- a/dev-python/vcstools/vcstools-0.1.42.ebuild
+++ b/dev-python/vcstools/vcstools-0.1.42.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
SCM=""
if [ "${PV#9999}" != "${PV}" ] ; then
@@ -27,13 +27,14 @@ fi
LICENSE="BSD"
SLOT="0"
IUSE="test"
+RESTRICT="!test? ( test )"
RDEPEND="
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
"
-DEPEND="${RDEPEND}
- test? (
+DEPEND="${RDEPEND}"
+BDEPEND="test? (
dev-python/nose[${PYTHON_USEDEP}]
dev-vcs/git
dev-vcs/bzr
@@ -41,6 +42,7 @@ DEPEND="${RDEPEND}
dev-vcs/subversion
)
"
+PATCHES=( "${FILESDIR}/yaml.patch" )
python_test() {
# From travis.yml
diff --git a/dev-python/vcstools/vcstools-9999.ebuild b/dev-python/vcstools/vcstools-9999.ebuild
deleted file mode 100644
index 388682fd4ace..000000000000
--- a/dev-python/vcstools/vcstools-9999.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/vcstools/vcstools"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Python library for interacting with various VCS systems"
-HOMEPAGE="http://wiki.ros.org/vcstools"
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
- https://github.com/vcstools/vcstools/archive/${PV}.tar.gz -> ${P}.tar.gz
- "
- KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-vcs/git
- dev-vcs/bzr
- dev-vcs/mercurial
- dev-vcs/subversion
- )
-"
-
-python_test() {
- # From travis.yml
- # Set git config to silence some stuff in the tests
- git config --global user.email "foo@example.com"
- git config --global user.name "Foo Bar"
- # Set the hg user
- echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
- # Set the bzr user
- bzr whoami "Your Name <name@example.com>"
- #git config --global user.email "you@example.com"
- #git config --global user.name "Your Name"
-
- nosetests --with-coverage --cover-package vcstools || die
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-08 03:59:44 +0000