summaryrefslogtreecommitdiff
path: root/dev-python/vcstools
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python/vcstools')
-rw-r--r--dev-python/vcstools/Manifest4
-rw-r--r--dev-python/vcstools/metadata.xml1
-rw-r--r--dev-python/vcstools/vcstools-0.1.42.ebuild56
3 files changed, 30 insertions, 31 deletions
diff --git a/dev-python/vcstools/Manifest b/dev-python/vcstools/Manifest
index 32b2c50160ce..c8cb224562de 100644
--- a/dev-python/vcstools/Manifest
+++ b/dev-python/vcstools/Manifest
@@ -1,4 +1,4 @@
AUX yaml.patch 1063 BLAKE2B 33d954db0dfb7caf5db07bdc287ff8f7fdb74edad7f92ea5ae3ec1076fd02077e3c87f2d12907a6eb9e419b506bafab7ca84dd0c2ca282aa08d24eccd3054ff8 SHA512 c2fa16dd567792cf7b31e1bc3a22d647ac40f4e3302c74e61202b8cc1bdb099031029ed8090ad27d54aed7d93052cc099a6bdc2e8849194ade2db44bea44eb5d
DIST vcstools-0.1.42.tar.gz 65979 BLAKE2B 2deb29116e891bc93410e4a8f58938009140d01baaa834cccfdba2be3243d98bb11507fd134284bc1dbeca1434ea0eeaf2ed332dcb579bbacf1bc92815f8623d SHA512 1b54270c878684862eb607c2e445fe24d8edfdd8ea2cc75e899044d9e8e89a882fd2dd6fb7825553f83003ae7af08850c18fdeaabaa107a6bfdb2759b32e8fa6
-EBUILD vcstools-0.1.42.ebuild 1453 BLAKE2B 57c78b7c380d3d4b3d232a09cc856547fcb3d5fe7c2dc6c103de91ea852c4f639785063be96ed11e967d510981e2bf19981f34d58a4f0695448fb2d8966945fb SHA512 cb794b9e1f28895294f103bc274340d49e8f7f33d8e45d7f8e47fb4757ada8931763d41e429313f13fc71be09c91c616ddef37ecf17c9acde11e645a6b1b89eb
-MISC metadata.xml 378 BLAKE2B d94a7471d130aefe6be2c2299319f9a5fd57cc129c7b2f3889ab4a864178b181b6444f2730d29bddf2a2ddc6f15236064e880b18ac647a1286420a965743dc84 SHA512 9774428122870650957af369e917433f3b4034a82f8051aa17cc4833a573940be5351ee5e8ad92fcb27df749cd2ab575677d872b1f0523ddf3392fc3045e58ac
+EBUILD vcstools-0.1.42.ebuild 1248 BLAKE2B b5451e3f6de775e826546b2ef23ed3c837599ffb485ee1bbf81e4714b315fcbae86c37368580feb35990b5806aacf9aa2fa0ddfb260a406245d17b9da9d9568c SHA512 2996c36fd3f6a61f138d8c4ae66650e379a9be383c101db6324434de4d3b440c2425676d10c8dc64d2c4d7eb12ba42adf2877de5bc7df8a4f4f36abcdd16de70
+MISC metadata.xml 402 BLAKE2B 4396bf3f04fde671260984d3d11d08891325305a4a83b3fa1a99775227de87eeb5c4a40e9e82b993f7546a65fcd5230408d6db6e317265f5c660511813e473bc SHA512 80ba7bb0fbb262d518711f23f03088871e04fc08769cb476c72681f8778f1306857217b3360b49df2524faa4a97dc4f9dab5edb6f95c9479ff02ca52b67f788f
diff --git a/dev-python/vcstools/metadata.xml b/dev-python/vcstools/metadata.xml
index c100430dcab9..4a8bec5b97bd 100644
--- a/dev-python/vcstools/metadata.xml
+++ b/dev-python/vcstools/metadata.xml
@@ -5,6 +5,7 @@
<email>ros@gentoo.org</email>
<name>Gentoo ROS Project</name>
</maintainer>
+ <stabilize-allarches/>
<upstream>
<remote-id type="github">vcstools/vcstools</remote-id>
<remote-id type="pypi">vcstools</remote-id>
diff --git a/dev-python/vcstools/vcstools-0.1.42.ebuild b/dev-python/vcstools/vcstools-0.1.42.ebuild
index 080412941179..beea876d5506 100644
--- a/dev-python/vcstools/vcstools-0.1.42.ebuild
+++ b/dev-python/vcstools/vcstools-0.1.42.ebuild
@@ -2,58 +2,56 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8} )
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/vcstools/vcstools"
-fi
+PYTHON_COMPAT=( python3_{8..10} )
-inherit ${SCM} distutils-r1
+inherit distutils-r1
DESCRIPTION="Python library for interacting with various VCS systems"
HOMEPAGE="https://wiki.ros.org/vcstools"
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
-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
+SRC_URI="
+ http://download.ros.org/downloads/${PN}/${P}.tar.gz
+ https://github.com/vcstools/vcstools/archive/${PV}.tar.gz -> ${P}.tar.gz
+"
LICENSE="BSD"
SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~arm"
RDEPEND="
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
"
-DEPEND="${RDEPEND}"
BDEPEND="test? (
- dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
dev-vcs/git
- dev-vcs/bzr
dev-vcs/mercurial
dev-vcs/subversion
)
"
+
PATCHES=( "${FILESDIR}/yaml.patch" )
-python_test() {
+distutils_enable_tests nose
+
+src_prepare() {
+ # Those fail because of broken upstream testing
+ rm test/test_bzr.py || die
+ sed -e 's/test_checkout_timeout/_&/' -i test/test_git.py || die
+
+ distutils-r1_src_prepare
+}
+
+src_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"
+ git config --global user.email "foo@example.com" || die
+ git config --global user.name "Foo Bar" || die
# 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"
+ cat > ~/.hgrc <<- EOF || die
+ [ui]
+ username = Your Name <your@mail.com>
+ EOF
- nosetests --with-coverage --cover-package vcstools || die
+ distutils-r1_src_test
}