diff options
| -rw-r--r-- | dev-python/starcluster/Manifest | 2 | ||||
| -rw-r--r-- | dev-python/starcluster/files/starcluster-0.94-requires.patch | 16 | ||||
| -rw-r--r-- | dev-python/starcluster/starcluster-0.95.3.ebuild (renamed from dev-python/starcluster/starcluster-0.94.3.ebuild) | 22 |
3 files changed, 14 insertions, 26 deletions
diff --git a/dev-python/starcluster/Manifest b/dev-python/starcluster/Manifest index 76de3c1..dc3c7a1 100644 --- a/dev-python/starcluster/Manifest +++ b/dev-python/starcluster/Manifest @@ -1 +1 @@ -DIST StarCluster-0.94.3.tar.gz 2361186 SHA256 b490ff72c0423fa2cb053289851af74422e148ac418ddc072333bbf1f7810679 SHA512 4a69017654cb7ea9d3ece5477fcfc6575e05855b8a1b78a5298e274d10e49aa32c53816f3a9c5484573dc8ad444b402b99c47572c90d06fcdbdcd4e82dbc182e WHIRLPOOL 64249af3d7899950256c4d80a4985c90d3ad2c91de14256e8e797d059f8836029d2c035e58e2426b28804179b3e167000f33b4a2574778a7ee077c045fcd9f6d +DIST StarCluster-0.95.3.tar.gz 2388166 SHA256 f88efabd4f4b0d4ac3de4f5199d10165bf07427c541ef8b6f3ba5bc53098175b SHA512 90e234fe37492fcab2be1aa043eecd38ea3fed4767fc55ceff4055b421fac6d8df726f0ec0bc5c612dd8a9add84cf9afd20f086d7ae2bca89c4490608a52b610 WHIRLPOOL a2188a79f49f65a07cd2745bea7b4ee401e5a8902f9c2f906e903bef7f4875afd4a836eb4082309713922babe111b44b8cafe3261ee259ec90c95ff2d6077148 diff --git a/dev-python/starcluster/files/starcluster-0.94-requires.patch b/dev-python/starcluster/files/starcluster-0.94-requires.patch deleted file mode 100644 index e5d26fc..0000000 --- a/dev-python/starcluster/files/starcluster-0.94-requires.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/setup.py b/setup.py -index b6c4f06..52f7ece 100644 ---- a/setup.py -+++ b/setup.py -@@ -30,9 +30,9 @@ try: - extra = dict(test_suite="starcluster.tests", - tests_require="nose", - install_requires=["paramiko>=1.10.1", "boto>=2.9.8", -- "workerpool>=0.9.2", "Jinja2>=2.7", -+ "workerpool>=0.9.2", "Jinja2>=2.6", - "decorator>=3.4.0", "pyasn1>=0.1.7", -- "iptools>=0.6.1", "optcomplete>=1.2-devel"], -+ "iptools>=0.6.1", "optcomplete>=1.2"], - include_package_data=True, - entry_points=dict(console_scripts=console_scripts), - zip_safe=False) diff --git a/dev-python/starcluster/starcluster-0.94.3.ebuild b/dev-python/starcluster/starcluster-0.95.3.ebuild index 5fe22cd..569f005 100644 --- a/dev-python/starcluster/starcluster-0.94.3.ebuild +++ b/dev-python/starcluster/starcluster-0.95.3.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/starcluster/starcluster-0.93.3-r1.ebuild,v 1.1 2013/04/19 13:56:41 idella4 Exp $ +# $Header: dev-python/starcluster-0.95.3.ebuild 2014/03/20 jtriley EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) -DISTUTILS_SRC_TEST="nosetests" +DISTUTILS_SRC_TEST="py.test" inherit distutils-r1 bash-completion-r1 + MY_PN=StarCluster MY_P=${MY_PN}-${PV} @@ -20,14 +21,16 @@ KEYWORDS="~amd64 ~x86" SLOT="0" IUSE="doc bash-completion epydoc" -RDEPEND=">=dev-python/paramiko-1.11.0[${PYTHON_USEDEP}] - >=dev-python/boto-2.9.8[${PYTHON_USEDEP}] - >=dev-python/jinja-2.6[${PYTHON_USEDEP}] +RDEPEND=">=dev-python/paramiko-1.12.1[${PYTHON_USEDEP}] + >=dev-python/boto-2.23.0[${PYTHON_USEDEP}] + >=dev-python/jinja-2.7[${PYTHON_USEDEP}] >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}] - >=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}] >=dev-python/workerpool-0.9.2[${PYTHON_USEDEP}] >=dev-python/iptools-0.6.1[${PYTHON_USEDEP}] - >=dev-python/optcomplete-1.2" + >=dev-python/iso8601-0.1.8[${PYTHON_USEDEP}] + >=dev-python/pycrypto-2.5[${PYTHON_USEDEP}] + >=dev-python/scp-0.7.1[${PYTHON_USEDEP}] + >=dev-python/optcomplete-1.2[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} doc? ( dev-python/sphinx[${PYTHON_USEDEP}] dev-python/epydoc[${PYTHON_USEDEP}] @@ -49,6 +52,7 @@ python_compile_all() { } use epydoc && mkdocs } + python_install_all() { distutils-r1_python_install_all use bash-completion && newbashcomp completion/${PN}-completion.sh ${PN} @@ -61,5 +65,5 @@ python_install_all() { } python_test() { - nosetests || die -v ${PN}/tests || die + py.test || die -v ${PN}/tests || die } |