upgrade test deps, test phase

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 58 insertions, 13 deletions

diff --git a/dev-python/sqlalchemy/ChangeLog b/dev-python/sqlalchemy/ChangeLog
index 5b5d43888e18..cc7f7887277e 100644
--- a/dev-python/sqlalchemy/ChangeLog
+++ b/dev-python/sqlalchemy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/sqlalchemy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/ChangeLog,v 1.130 2014/07/29 10:38:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/ChangeLog,v 1.131 2014/07/30 02:08:48 idella4 Exp $
+
+  30 Jul 2014; Ian Delaney <idella4@gentoo.org> +files/0.9.7-test-fix.patch,
+  sqlalchemy-0.9.7.ebuild:
+  upgrade test deps, test phase
 
   29 Jul 2014; Jeroen Roovers <jer@gentoo.org> sqlalchemy-0.7.9.ebuild:
   Stable for HPPA (bug #518468).
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index a4288751bc16..80facd35b758 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 0.9.7-test-fix.patch 1453 SHA256 4c78479dfda8ba88f9c2aa1d54e2b4b38d3bff2ae2c3a391f9bb6892706a75f8 SHA512 71c83a7d1411230d92a5a393d70da18a2e56c2dfb3e0221af41e77f8fa108070c778b5010f14abfffd866fff9939e710b3792c5ee4609990eb74d8655f83f0bd WHIRLPOOL a7ac8c3fe7d0af947f9c0f268ba3a2137ea4ec551489a7c9d2d6cde863dcd4a1cfc9e1f68db001dd8658619781c8281c904a7aacf3ad20f012e623ce83e2554f
 AUX lru_cache_timestamping.patch 1088 SHA256 e4bbc35e94b5091f9abb1cede122d2773bfa3f96a21a62a090fb1c1733a9f0ac SHA512 9d7ad6990b312dec26ede2c1c0717447cb034c4d701435aa278dd9d0214115c6d94d02c6a608c0aab0e28da69c3bfa7cf8bc1c9d61b3bc3dfdca1eb47f63eda8 WHIRLPOOL 149302829080935d5f620c7d6f97cb939b027b944f24c5d5650e009cbbe1bdba8ce2f7172eb2ca761b5a3ab1513c078710f679ccd61b23909423e4b2c1b0ae10
 AUX sqlalchemy-0.7-logging.handlers.patch 466 SHA256 3e2034457bbd4f4cd775f41cad156e27006c0b87cb3bec502b9b405a969d1099 SHA512 a09af91fdd6a1cc9f219c9b45fbe2fa5d9a675d2c2dc769545af52fda44ced40f673426975a09dd943e6ba5087cf0c0caa771c106e0eb755c3ed97c4ddc267fa WHIRLPOOL 8691dd7dbb09a45296dc6890644b06de63bd779cefbfe7b90d2d5753d7d752c5f6836151e26734090e69e928deb396b9a7c70fe8c980bf1a8442e623211ebdc6
 AUX sqlalchemy-0.8.1-pypy-fixtests.patch 1899 SHA256 b0ce43c79adf3aa04ec33b87780e4e3132379ee572bb29487eb02ac3f2fde439 SHA512 746e08c1b745fcb0c41be1e6df8e3d95fbe7a037dfbc7aae8b0178973c7977a78f6ffbca1900dbecc8854633a93dc13b34c5df5c50cef1b075e95a2ab3ed5715 WHIRLPOOL 2fb7c28d5f9aecd18217f072dd1a5fa23bdfd4a67b57854dc82cecd4eb0b1582baaa36278777d4f4c1fde736716bdbdd83a94a2650182256a57ac1d9d9219131
@@ -29,13 +30,13 @@ EBUILD sqlalchemy-0.9.1.ebuild 2223 SHA256 1172eb4136ae09a13e948ea4049403ae86081
 EBUILD sqlalchemy-0.9.2.ebuild 2312 SHA256 21cbc34dc49e229f995c4402e6a9e1ee6ab88c8a4b607506950e697cf1aad6c8 SHA512 36a43522b475bef890e0a83a6233414fabba5f0821162b933ac9c7023cbd6d2f5729b13d5bbdeb3fb5324f06d4caa05a8ab5c7802c6618fcf499108af2a4d2f9 WHIRLPOOL 912345e44a5434b1b796022e991819ba525640784d8e32fd817cd04602bd7b050425c3f2fa36a7220a6e32f3a13977776be7d762e0f02fd4fe2c9e42ffcd585e
 EBUILD sqlalchemy-0.9.4.ebuild 2379 SHA256 5a5c8fdce112ff97ef2421671c027bf0af60c0654fe56e065bb978267b601f0e SHA512 eb2473af4665745df8bf2656e4210d0509d5bd5bad077544e18a6a192726a118146d5403546b2c881204ff53798af2142758155952beef8d1dd8d5520cedf54c WHIRLPOOL 075e0651777d712b0916cbc23b9f101626dbbfbbb8d5cbf424682656c52dbe962b5863db10250540eefc273fefdab0d67dff0fa7f5b783e47fa7af67475b80fa
 EBUILD sqlalchemy-0.9.6.ebuild 2377 SHA256 fe6572e39a40afb53a4aa372959b91aea1539104a965e4b02f84b66f5725d693 SHA512 2470988428761638a8cc96a161396c0d59fb27bd64efa76411ca8fd2e41408e1c820e4c47fcafea2f1f4fddd3401031ad4d4df9e072378e673e22cb5858e37e9 WHIRLPOOL d96888f963677310ab49b1d1ed66834e1d90539738150a80950cf4d381d45dbd2d09193a77d01732354c035a004a605d13e0c5789e7bf5db7634875390d2251d
-EBUILD sqlalchemy-0.9.7.ebuild 2328 SHA256 daac112403715ac78053947c4e37dba4835a069b7ad353ae099c9b16a931099d SHA512 e5f2eae30e66491df74c56dec7044bfdbe19fe6ec4e1bfaaff4a3c2b939ad36f8d94eba4b04a24cb8bb61b4692e6810ea02a999742dce0e1ae31c37c63be343a WHIRLPOOL 1c0370cf2d4aeca5efa2dd257c26895d65f04262713844ed22e7662c2e5c905d742cc0d90068b86aff26a071399c7f672cc7cfbb577fac77095c531f63b06439
-MISC ChangeLog 19256 SHA256 03647a5c143263cfa421234ed2ba1e4b980cb97f6ebf612adbf7dbc047a887c0 SHA512 68677bbc39d4bfa9ee18ea00e201213ec51a102f9bd02fa34c0d6a76654c10d73e76d420361392c5f8f2bc29a721110103ffdccd79434a7dd223c52fa0c963e6 WHIRLPOOL c1e06da17756aacb0d0127422d2bc859d712057724b3ba065acc39b866297775955b19acd130d245fcca76d97f17e4bf1e8ddc424bdfb786294a6aae9aab2ba1
+EBUILD sqlalchemy-0.9.7.ebuild 2543 SHA256 f2bd42ca08f672e8ff3d50fbf570f8b37f464a15608b18ebe93a1a61335ed643 SHA512 1460a0d7a4add398b00a306f0e6fd89223bb6e41c91480aa9fa07b3f0f7d35b7512444f1a2ae672b0059d052e04f9edd239ed9e6195bd88049364cc15ce99a86 WHIRLPOOL 06dde5892f9a9e3927e4cfc932b4269d6b3cafbded3cb0a6fe9710c5edf34c65b4bd0eaf344a9e237955e4b76c6917dbcf8c9b7d8605c46d76f530581369cbd5
+MISC ChangeLog 19397 SHA256 fee06455eede9eb67c5dc3a2a4afced63bea14884e1bc3bf12b300e5a870b7e9 SHA512 f67fad21f781c779a55bb8acd2d40f14cf789708468bf45f0cfdb336edb3296b54b614199a59074458aaf16b1a41056e88cfc5dc2f170dc034b1fb550babfc37 WHIRLPOOL c8f7279c3831a16cb789715a85789f087e131980bddfcb19a6b417bac6719f0418152def537d3a3dafb2089419a7637210a79f3ef7f7c47f6b0bbaa5bceb2fa3
 MISC metadata.xml 233 SHA256 77ca0910fec09997d5679f4de22c824a0b0de12d9ac12b253ad544ae7357f720 SHA512 1521eab2401d4b820c053a13680ec44b9bf4931516f4f4c1508ca92b288bf6cae2db36a875ddc5c2475e862c16d3e92cb662c093958950ead4eb72e463abcff6 WHIRLPOOL 9279e4a60e5c11a72f329dcc13bd9c18d3bbfc1fcaab98f46df1336835f407a8471b4a76b61e74a5fa1bb8e24156cd5e3c2e8418752a412479f37b6193b74ec6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlPXeZwACgkQVWmRsqeSphMaBQCfbkLaGrazBIwlG8eDenppLd5S
-aQEAn2FTWdY6XGl/wg720POQGF8Pwl7+
-=S/O8
+iEYEAREIAAYFAlPYUaYACgkQso7CE7gHKw2fYACeKgWHqfS7jz9INZEd8rM9kYHu
+FEcAn0LQ1uZmaldHRurb5e6o4SzZT9Gs
+=h+4g
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sqlalchemy/files/0.9.7-test-fix.patch b/dev-python/sqlalchemy/files/0.9.7-test-fix.patch
new file mode 100644
index 000000000000..ca1809bb832d
--- /dev/null
+++ b/dev-python/sqlalchemy/files/0.9.7-test-fix.patch
@@ -0,0 +1,38 @@
+From 405c223ae50e78dacac08783c414619db20df0b7 Mon Sep 17 00:00:00 2001
+From: Mike Bayer <mike_mp@zzzcomputing.com>
+Date: Tue, 29 Jul 2014 13:32:05 -0400
+Subject: [PATCH] - Fixed 0.9.7 regression caused by :ticket:`3067` in
+ conjunction with a mis-named unit test such that so-called "schema" types
+ like :class:`.Boolean` and :class:`.Enum` could no longer be pickled. fixes
+ #3144
+
+diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py
+index 6114460..6cbf583 100644
+--- a/lib/sqlalchemy/sql/elements.py
++++ b/lib/sqlalchemy/sql/elements.py
+@@ -3276,6 +3276,9 @@ class _defer_name(_truncated_label):
+         else:
+             return super(_defer_name, cls).__new__(cls, value)
+ 
++    def __reduce__(self):
++        return self.__class__, (util.text_type(self), )
++
+ 
+ class _defer_none_name(_defer_name):
+     """indicate a 'deferred' name that was ultimately the value None."""
+diff --git a/test/sql/test_types.py b/test/sql/test_types.py
+index 03d3997..efa0f90 100644
+--- a/test/sql/test_types.py
++++ b/test/sql/test_types.py
+@@ -234,9 +234,9 @@ class TypeAffinityTest(fixtures.TestBase):
+         assert t1.dialect_impl(d)._type_affinity is postgresql.UUID
+ 
+ 
+-class PickleMetadataTest(fixtures.TestBase):
++class PickleTypesTest(fixtures.TestBase):
+ 
+-    def testmeta(self):
++    def test_pickle_types(self):
+         for loads, dumps in picklers():
+             column_types = [
+                 Column('Boo', Boolean()),
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.9.7.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.9.7.ebuild
index 61bb31446ae0..dbd333cced24 100644
--- a/dev-python/sqlalchemy/sqlalchemy-0.9.7.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-0.9.7.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.9.7.ebuild,v 1.1 2014/07/29 07:03:28 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.9.7.ebuild,v 1.2 2014/07/30 02:08:48 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
 PYTHON_REQ_USE="sqlite?"
 
-inherit distutils-r1 eutils flag-o-matic
+inherit distutils-r1 flag-o-matic
 
 MY_PN="SQLAlchemy"
 MY_P="${MY_PN}-${PV/_}"
@@ -25,13 +25,14 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		sqlite? ( >=dev-db/sqlite-3.3.13 )"
 
 DEPEND="${RDEPEND}
-	test? (
+	test? (	( || ( dev-python/pytest[${PYTHON_USEDEP}] >=dev-python/nose-0.10.4[${PYTHON_USEDEP}] ) )
 		>=dev-db/sqlite-3.3.13
-		>=dev-python/nose-0.10.4[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 	)"
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}"/${PV}-test-fix.patch )
+
 python_prepare_all() {
 	# Disable tests hardcoding function call counts specific to Python versions.
 	rm -r test/aaa_profiling || die
@@ -54,8 +55,9 @@ python_test() {
 	if [[ "${EPYTHON}" == "python3.2" ]]; then
 		2to3 --no-diffs -w test
 	fi
-	"${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
-
+	# Recently upstream elected to make the testsuite also pytest capable
+	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
+	py.test test || die "Testsuite failed under ${EPYTHON}"
 	popd > /dev/null
 }