From e147efd502f3a39ce23e6a8f146084f2179a46a3 Mon Sep 17 00:00:00 2001 From: Ian Delaney Date: Sat, 18 May 2013 08:26:44 +0000 Subject: [PATCH] 0.7.5-r1, migrate -> distutils-r1, patch addressing test phase, bump; test phases fixed, invoked Package-Manager: portage-2.1.11.62/cvs/Linux x86_64 Manifest-Sign-Key: 0xB8072B0D --- ChangeLog | 10 +++++- Manifest | 16 ++++++++- files/south-0.7.5-tests.patch | 23 ++++++++++++ south-0.7.5-r1.ebuild | 67 +++++++++++++++++++++++++++++++++++ south-0.7.6.ebuild | 65 +++++++++++++++++++++++++++++++++ 5 files changed, 179 insertions(+), 2 deletions(-) create mode 100644 files/south-0.7.5-tests.patch create mode 100644 south-0.7.5-r1.ebuild create mode 100644 south-0.7.6.ebuild diff --git a/ChangeLog b/ChangeLog index 71e586c..2af4d91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,15 @@ # ChangeLog for dev-python/south -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header$ +*south-0.7.5-r1 (18 May 2013) +*south-0.7.6 (18 May 2013) + + 18 May 2013; Ian Delaney +files/south-0.7.5-tests.patch, + +south-0.7.5-r1.ebuild, +south-0.7.6.ebuild: + 0.7.5-r1, migrate -> distutils-r1, patch addressing test phase, bump; test + phases fixed, invoked + 16 Dec 2012; Agostino Sarubbo south-0.7.5.ebuild: Stable for x86, wrt bug #364053 diff --git a/Manifest b/Manifest index 725672d..9fb14ce 100644 --- a/Manifest +++ b/Manifest @@ -1,10 +1,24 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX south-0.7.5-tests.patch 705 SHA256 a9dd6876f54d40236d824e7a3ffc540af57d9883b8c7268390e49b3a8df9a6dd SHA512 22cbbb6a73aa2ac61a43ad3848de19a6103b016994a7ccf353e4a52068ba861b040b4e37e24793dc60332601c792117b8e20746c352ce0d452ca0b8b6a028aee WHIRLPOOL 4ddf6ddef6b269ad0902a3def0b6863aeaa70dd8db15c53ec91e630aea59bcac3455f3758d492a622cc79b1eebaeb256083604c0874969352400822ab7f08cf6 DIST south-0.7.2.tar.gz 110527 SHA256 003fdcc1af01fda473d0f92f7f5afc25a75756a2a04acfb76c9a1d41a5db4211 SHA512 aeb53706dbec36b7bf00e10c582d059cee5966cf882ab439b52a008a8ab9b5d064e18a4d498a2a1fee4d2dbe973964296110f647663006c7e4f950d95bc71813 WHIRLPOOL 491d7a39042fef55bf175803018b89b909783b616b0a4990c0415dd276fe08f528a81e42616566d4340865e92eb6860631b903a94ff03f19649b67ad6e92ac51 DIST south-0.7.3.tar.gz 112673 SHA256 ab1c72cd013fab2ddbef3100f2bf7a7f3d9fbc7169cd3e6c181060c17fdeea97 SHA512 09b8cd649523e42b4f469083fb563855c4382f68413571cad746c82b1e777c3725e595884eef339f73bde9c2ab8e137769df84ad9a912243e8cb2fcfed9a96c2 WHIRLPOOL 0839fe0bc37d508363959c70062cb3b3b3039207877265c9b1f0897470ab4f8f6f2406fe11730a21b434b9cdf84a9f7408d8a952d13cd65cfe37922c0ac24c56 DIST south-0.7.4.tar.gz 131682 SHA256 431aea5aee19944f3c18ffc44e873aa3444c40c6492900dfed9f0b47c7938c50 SHA512 2e2b88688880acb489eb959a0798155a25fbf0ff5ee4e6a501375872e6e43ac74e6e5d191ea881f1eb56f6b5fea2b91513f73dac120d9a2f84ed1cfa488b5aab WHIRLPOOL 11550efebdd3cb785717e9a443e3910135a1a367a2a1253dc6c3d83cf75539d2aaf8b78f0261a76af129c7858e184fea4291dfb1026baa840129530ccef5ae40 DIST south-0.7.5.tar.gz 134536 SHA256 e1f8bb50750b4e3eedf85106ea5d581488b6533885afdba91de81e07ac57ad12 SHA512 6696bb0b75132a1f6d11600834589af26008bdf53e55b1d8ab141392d68c62316abbeb02a3f850155b852232b5bc8326d2b415261eec667d5f591302ec952b70 WHIRLPOOL 417986c9fc7896f1f542c4ae49415e941bc641440d71de6c4093b87861d019342c7caca39e7ee43910ccb0dfd0ab2d8f3d9106d1f6974c4ea4d8ea8a24b3a588 +DIST south-0.7.6.tar.gz 136861 SHA256 481197a915a017291f34b0e01a004f7e1a4c1b43354809177849d46def1d9a03 SHA512 4c2dce16d30a3739347a8b8578ad32a80f256d2d9c3f3d63c82a39bc531dbb0a0c7d548c3dcf2de3bf414accf934cb87d11b4c8eac3f8abf40949a2c112d77bd WHIRLPOOL 04115995db09c7c6c06125ebc4242cef29f1a5ee8c6d99c726f5a86d5b6b7d663cf9463fce05a347213ec17c0b5a4639aa744420a9124135fc78e49060c227c6 EBUILD south-0.7.2.ebuild 1129 SHA256 5b17315137d4ca7c345018812eea2403b0c171e7c266015bb929d419e653e9a0 SHA512 f2473b52b7d5c1fb32b0499c783b010ee646c9aec8b88b571cc612d01ba5634acc245449e7c96edffbe7b98869abcd2813a72fbdd5b45f4105e85aeefe7dc44b WHIRLPOOL 7f3dd94c252e6e0560aa264ae6b08dd1fc9e0787dc40b898c5dfb37df7200fad87f133434a9dfaf7acc2b9555ff50d2b98679faf0aa8a794b63757dac05a2c36 EBUILD south-0.7.3.ebuild 1129 SHA256 f97f0acda5c2a241f3d46a44c499639fc894dab3aca3ddc7a6cda80b6947f43a SHA512 022f529d13b59d128454836eac05a8697d9eb6ade7942792a6f5fb2bab0f5cdc5b90512af90453782331987e3c4ebf49a502005d528bf529321cf70fa0ca6d56 WHIRLPOOL 42fedf6998842f6ee344868ba6387411de3271e526a029202c50c1a996c9ae419a898c84dc4d40e7beb9dad57dce148315a973f05315dc6c72ad28e4deed8178 EBUILD south-0.7.4.ebuild 1196 SHA256 e121acfbefabad525dc533a358603d48265b3206407683c535c750884ac015d0 SHA512 3fafb57ce173700be90a58907fac193db11d32c8e40369609d0985c022ddd85a04bafcc58b02adbc593c9414240b6e1039612e3264baeafb48e9a4e9ab8ef943 WHIRLPOOL e7851e4802b4860f21121b59661c813c1a9ee95982d7c86f7d65281e0bfa79dc3c142be3b039607f54fde7c645d6b441b526081e24c39d47251326e6c9bafbb4 +EBUILD south-0.7.5-r1.ebuild 1860 SHA256 91dcb36f1161a25109c6bc422b40ad9d3b0a21822a8d85fa032c7f09b93722b2 SHA512 e6de73fe36af308ff143c22351844cd07eaa0bdcbeb6fff05986645b1d658569fbb023544e90edb672303a07718dbf10813ef1a986813e4732c00246d71542bf WHIRLPOOL 892d65db7457e001d1edeb0907070bc00bb2cd34426dc0f3f195f576212c3ab6049731213313291fb45fac02a9b611db17af1f1ca3d0c13196d04b146cb32df9 EBUILD south-0.7.5.ebuild 1815 SHA256 e0452e3041f0ec878c11b8186d5726b03a1068be7dae4d0aac2a223fac1be177 SHA512 9adb139420fd6f30db597c2d19dafc9d5a88a17cff17d9af98a0d5befb0bc10b0f25d494bcc53e1a9bc68e7a374a326c8fb130c02b678daeecd6fa6339caf4b9 WHIRLPOOL a14a619907455f42c468230d7e874620fdf3e20655499b03284c3e6d82cbee099f2054b7b55d4b26abf11339439c0c800fe698152e7e9c1c2ae744d83be905ce -MISC ChangeLog 1204 SHA256 d55fc697bf844add98f5a859144ccf44d1efb0a9f2ea3b1a8bdfc7fd4be54a5b SHA512 7ce152d96ebec9b981b9e6ea05887a54480ef377fcf98e937875b3e5a1128e368d849f7ee6d9adf9a4e4fa5279dfcfff1091b0b36319a9042fd4f288a44d51c6 WHIRLPOOL c63ba9e66c36a858844702a1fd1a3248376f070255c403085b947636257eef84898e0d6f00e0159726607cce5bddd424098e88a798259ae55bd1a631d9c4bb5e +EBUILD south-0.7.6.ebuild 1667 SHA256 369cad7738561d0f47adf897514d519eea7010adfd7465e2981944fd232fa2df SHA512 acdc364409969c5c9b79a97ec390444c51193cc718b60ce8fc1aada3c06245ac411365e8fbd96d8e3516bf3a7565c0d645aeb1adee60e75248dbed3ac9536b69 WHIRLPOOL 16b52b2560453486690fdb0a42627c910a1cf9879c28ee950d72360352290778251c095d9e2e5ac1f2c1136f8f464dc3e67c90172c3e5179f56b9c6002d22763 +MISC ChangeLog 1495 SHA256 ccb0aa790bdeb2ee42a81d5c20c01f68d8091e484120dc53c1fa167a74d60e05 SHA512 9554611fe7dc1160c1bd5d3af8f60b892d90cf9054e5d8471aaacf4c5c9b19161386aba06f1eb05a50100e689510016fbcd786290f125d30e5ea32cb7e9b6772 WHIRLPOOL 333fb29e51e57db781dea205880b8af48503dfd3c47fec093cc41899d1ff648db199f5a3885e0be0b03fafa758504b6f80cd1bfa44fd0515d8f8b9b4679bc1de MISC metadata.xml 236 SHA256 8db85d348f1fcca741457358302188e30b7b1c0524a9a55820b935d8bcac959e SHA512 8086fc7bc2140d0b7b96293ba80717a8dcb88b255cc3906b5ac1ec4b9c67a412d3a51ad03a19e3b700a0235d0622b525ef85289f616646d47c698b3b54157b7e WHIRLPOOL 080a90e854f29d29d005f164fba91fc9e05f362460cd8f825ecb7f16d893a1cce1f7e842bf561918a491d156c48c1d8e4a60b177ab28667c067ee379d626de68 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iEYEAREIAAYFAlGXOzQACgkQso7CE7gHKw32zQCgsdL4CjzvLnpxOkahbdiZ4l5D +cm8An2EE+I8B/lE7wDMvn6BUZZq7ezkj +=H3bF +-----END PGP SIGNATURE----- diff --git a/files/south-0.7.5-tests.patch b/files/south-0.7.5-tests.patch new file mode 100644 index 0000000..2e4da84 --- /dev/null +++ b/files/south-0.7.5-tests.patch @@ -0,0 +1,23 @@ +http://south.aeracode.org/ticket/1256 +diff -ur south-0.7.5.orig/south/tests/db.py south-0.7.5/south/tests/db.py +--- south/tests/db.py 2012-05-08 18:37:14.000000000 +0800 ++++ south/tests/db.py 2013-05-18 15:46:23.920225709 +0800 +@@ -1,5 +1,8 @@ +-import datetime +-import unittest ++import datetime, sys ++if sys.version_info == (2, 7): ++ import unittest ++else: ++ import unittest2 as unittest + + from south.db import db, generic + from django.db import connection, models +@@ -71,6 +74,7 @@ + else: + self.fail("Just-deleted table could be selected!") + ++ @unittest.expectedFailure + def test_nonexistent_delete(self): + """ + Test deletion of nonexistent tables. diff --git a/south-0.7.5-r1.ebuild b/south-0.7.5-r1.ebuild new file mode 100644 index 0000000..47ef425 --- /dev/null +++ b/south-0.7.5-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_6,2_7} ) + +inherit distutils-r1 + +DESCRIPTION="Intelligent schema migrations for Django apps." +HOMEPAGE="http://south.aeracode.org/" +SRC_URI="https://bitbucket.org/andrewgodwin/south/get/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc test" + +RDEPEND="dev-python/django[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] )" + +PATCHES=( "${FILESDIR}"/${P}-tests.patch ) + +src_unpack() { + default + mv "${WORKDIR}"/*-south-* "${S}" +} + +python_compile_all() { + use doc && emake -C docs html +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/_build/html/. ) +} + +python_compile_all() { + if use test; then + django-admin.py-${EPYTHON} startproject southtest \ + || die "setting up test env failed" + cd southtest + sed -i \ + -e "/^INSTALLED_APPS/a\ 'south'," \ + -e 's/\(django.db.backends.\)/\1sqlite3/' \ + -e "s/\(NAME': '\)/\1test.db/" \ + southtest/settings.py || die "sed failed" + echo "SKIP_SOUTH_TESTS=False" >> southtest/settings.py + fi +} + +python_test() { + # http://south.aeracode.org/ticket/1256 + cd "${S}"/southtest + cp -a ../south/tests/non_managed "${BUILD_DIR}"/lib/${PN}/tests/ || die + PYTHONPATH="${PYTHONPATH}:${S}"/${PN}/tests/ "${PYTHON}" manage.py test south \ + || die "tests failed" +} + +pkg_postinst() { + elog "In order to use the south schema migrations for your Django project," + elog "just add 'south' to your INSTALLED_APPS in the settings.py file." + elog "manage.py will now automagically offer the new functions." +} diff --git a/south-0.7.6.ebuild b/south-0.7.6.ebuild new file mode 100644 index 0000000..0391d1e --- /dev/null +++ b/south-0.7.6.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_6,2_7} ) + +inherit distutils-r1 + +DESCRIPTION="Intelligent schema migrations for Django apps." +HOMEPAGE="http://south.aeracode.org/" +SRC_URI="https://bitbucket.org/andrewgodwin/south/get/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc test" + +RDEPEND="dev-python/django" +DEPEND="${RDEPEND} + dev-python/setuptools + doc? ( dev-python/sphinx dev-python/jinja )" + +# we are setting up the tests, but they fail + +src_unpack() { + default + mv "${WORKDIR}"/*-south-* "${S}" +} + +python_compile_all() { + use doc && emake -C docs html +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/_build/html/. ) +} + +python_compile_all() { + if use test; then + django-admin.py-${EPYTHON} startproject southtest \ + || die "setting up test env failed" + cd southtest + sed -i \ + -e "/^INSTALLED_APPS/a\ 'south'," \ + -e 's/\(django.db.backends.\)/\1sqlite3/' \ + -e "s/\(NAME': '\)/\1test.db/" \ + southtest/settings.py || die "sed failed" + echo "SKIP_SOUTH_TESTS=False" >> southtest/settings.py + fi +} + +python_test() { + # http://south.aeracode.org/ticket/1256 + cd "${S}"/southtest + "${PYTHON}" manage.py test south \ + || die "tests failed" +} + +pkg_postinst() { + elog "In order to use the south schema migrations for your Django project," + elog "just add 'south' to your INSTALLED_APPS in the settings.py file." + elog "manage.py will now automagically offer the new functions." +} -- 2.26.2