gentoo auto-resync : 06:11:2022 - 15:20:09

4 files changed, 16 insertions, 123 deletions

diff --git a/dev-python/qiskit-terra/Manifest b/dev-python/qiskit-terra/Manifest
index b4b6abb7aeca..715197a222d7 100644
--- a/dev-python/qiskit-terra/Manifest
+++ b/dev-python/qiskit-terra/Manifest
@@ -1,4 +1,3 @@
-AUX qiskit-terra-0.19.2-test-corrections.patch 1730 BLAKE2B 7fe634eefa9d1548c11b2dfd12c70972d2d8a789e7975aca85966105cd3b899d9a0bbed133fae765c9be3f806f146e6248a4b2409fc1f5449cf5bf15f9ab2dc4 SHA512 e3d3dafdb9165073dabace613cc82d48144e8a0bc2f21d41421614430b636237bd11e398ee741a4e1641f8cfa4df938b5c7e51c263e1fc6685670c2bd62830b6
 DIST ahash-0.7.6.crate 38030 BLAKE2B aca3661477fcd7822d6d10970151e05c28e1615f8cd7ddaac064b15102027e404b19b0f3f16dd76145048594ea1c22ae27dd08cc05c411efbae9ec7a1ef55ce9 SHA512 61354688b6fb096359faefb6f34be958cd2215d56b88c22c737d24183eaad433f811bc9e64f927e4852c87d2799c22fda82b55cfbef2ed6357ff74f0c4ffec68
 DIST ahash-0.8.0.crate 39776 BLAKE2B 577f82ca509d5c04e25d8dbf1d0929a2d4ffd9314b13eca4f05229cdf62f678a8284bc3cc422776bb0bec8a6db6178b5e8f7f7430043ca6fed9593ea34710272 SHA512 97f85602b516ddc30509ec16402f7e83065034c93224b4421b53fc3ff03301b59c2548608bfcd5147f04d5100d491c0f8c5c38361a7d6684c79a4d7e029ba826
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
@@ -39,7 +38,6 @@ DIST pyo3-build-config-0.16.6.crate 28891 BLAKE2B 26667482bf9f5b140daab9728f5896
 DIST pyo3-ffi-0.16.6.crate 60756 BLAKE2B 148e67de195577a1676c80be1a5538d80cf25b0d9eac9facfdcd223dc40484a9c3c7c84377f727e83e50118fa803591acc1d800b93adf29c91e6a15154c2856c SHA512 97c69900e2b355a002d10e48883cc8d4d9245d07f956087fb9c3b0ecfb9039c84c3f3a23f17caf28c637c4522f0fe252fbbb16b543825e4f724ee19232a34d22
 DIST pyo3-macros-0.16.6.crate 8453 BLAKE2B 518809b1236149f14b264d48f642e873aea2b22edb655cf4cf4d6307d2eeb7544228b80ca7559397d3483c837ae2ea9f772a26563d01a95613dad0a1a704c1e9 SHA512 95b6898da9974ef232b04197e47ea4e7d60de9f817da9a9995f07b05ca74965df2b2e8e8267d616b665b04ab810b93ca17255b20df89ac9c71014e5c9fd3a9f1
 DIST pyo3-macros-backend-0.16.6.crate 49252 BLAKE2B 9fc531507d4f9d0e7ed183987fbabd043f7c31afe6488c53c6100d98e75e5296e9ee7cc4eb14798967ac62e7d8c31d602eac5166699058def384e4f029a3cf0b SHA512 49d82cff8762eeb27d8220aa98b2be43f614445f156212d45abef052e347ba2f4a7930e7c5c8a9843ea895ac5c223afc6527d036a9cad00efff9bda18907b019
-DIST qiskit-terra-0.19.2.gh.tar.gz 9536647 BLAKE2B 966370a782179512f3c4cd209f604f536ac4ac503f4805681d5729f4d6df4020bbaa5a2beb2fc393506eaa67a81666254375f14b827e07e1c1478a381fde5b45 SHA512 d02c028a86927610f1bca63830cb489069e68e016ed744a4092a96ddde163ea8ca1071048fc82b1807d4136e1fb2b0fcdde6d1a639ffc2ebe7c99dfd50c2e3d4
 DIST qiskit-terra-0.22.0.gh.tar.gz 9243589 BLAKE2B 208f554de7fd6c11e76879a8c4c08f27859f1dd729494c3ab372e73e5205def0f97a5dac16bd26f632a80428d5ead1797509f67e78983eebdc34d092158a5124 SHA512 c7e901035e3bf57df7765ec84a1344663c8763c3da6b372202dde1abd9a840d5dc0f30b91d0fcc8516af28921c1fcedc84959e147f8dbfc372497a7d25a8c5a6
 DIST quote-1.0.21.crate 28030 BLAKE2B 547344ba9272874f5fbb4bd27a69ef5be99823e10e1318afe71971b18f37e9c73d54168f16efb82c53a332e4874c80a82ea951fb2c85fad50cdfe783622b79fc SHA512 0728eb4df7e1f7c4d32ab08c901c2c969db8eb46b03bcec3e4956a4f6b360939d32abc6b6ebd7a31058e8e9b69c3d995a24cb484f93656f05b4ee963be1c74fc
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
@@ -66,6 +64,5 @@ DIST windows_i686_gnu-0.36.1.crate 818115 BLAKE2B fdb78cf88e1049d1ed6c474f870dfd
 DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f89ea7d910ccf9512c067b7bf5c6c825208ce4a36e9864c0cbca137f523983eb46e58e4bd01054cecd7ac7126d2ba9f67ac0c SHA512 02bb1507981229422498ce29f6c777d5e412358040128f84b09d948ccddf0461b078a0a20cc7f6ab7da8595121bb369453ae9ea1f0506aab715662e8c631e737
 DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
 DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
-EBUILD qiskit-terra-0.19.2.ebuild 2476 BLAKE2B 0b69a0e4f96fd344e8a9a342bb013db5cfd7a7d03eb41a621d657b9ebce7de6f4aa5340aace825d70382ef7db54fa0bcf4e6aaaf131ef6ce415122c252efd78b SHA512 e1d76df908d3fd5975afec991fd0cb13dc31950f1c7107d9e53c0cebca3299546857c82a64df14dc50f1f7c337c9eb84855fd7618cf7734a5da403e72fd2c8fc
-EBUILD qiskit-terra-0.22.0.ebuild 3889 BLAKE2B b64cd6a4ec951deb1364f76c77f74f52c48ba520ae6e58d662d9cfd1343440b0d9a22a36f9df25dd92aa214629b2fbe63d21c55792d694cb97fd7cbb52d13c81 SHA512 acd910e98924a804f46633a4e6079571fd570b7acc5c89cf587891cdf0ff4afb07196c77c0fa3453c919440451101d38071b45c587727aa7b9ad0da77ea698db
+EBUILD qiskit-terra-0.22.0-r1.ebuild 3632 BLAKE2B df80e4075d21230e3d89f29776efdf04ec33668f4190b22dc463206a60cff49b5544336dad09a1844045b59c8c88eaf727c0c9600077bae843cbf2598ac551e6 SHA512 09ac8b4ca6342bc08b8126b9ef3c74c2e1e8c25d998a10d524eff2cd2451d900444d437540f0a4f6a242c68b510c0cc33877d3dcb9ed102581c2c8ac3f658f04
 MISC metadata.xml 1099 BLAKE2B 4d2ae544b77d18aafe53ad0bfdc7bc32b9656eb4096d8f2ed0c2e71e8718d260d1030207753cd4e0b10748ec7508813f84a5232e7d491348be2c7ca1fcc5d860 SHA512 113bee16467977079ee15aab442d9255f9d3d3ad29dc27f2082b1f9b902856ce827aff722f988d4a9da2bc8762523002d8acb5702271ef87c188990c2b677038
diff --git a/dev-python/qiskit-terra/files/qiskit-terra-0.19.2-test-corrections.patch b/dev-python/qiskit-terra/files/qiskit-terra-0.19.2-test-corrections.patch
deleted file mode 100644
index ec44ebe75faa..000000000000
--- a/dev-python/qiskit-terra/files/qiskit-terra-0.19.2-test-corrections.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/test/python/qobj/test_pulse_converter.py b/test/python/qobj/test_pulse_converter.py
-index ea5b77e78..cde568ecf 100644
---- a/test/python/qobj/test_pulse_converter.py
-+++ b/test/python/qobj/test_pulse_converter.py
-@@ -341,7 +341,8 @@ class TestQobjToInstructionConverter(QiskitTestCase):
- 
-         self.assertEqual(evaluated_instruction.start_time, 1)
-         self.assertEqual(evaluated_instruction.duration, 1)
--        self.assertEqual(evaluated_instruction.instructions[0][-1], instruction)
-+        self.assertEqual(evaluated_instruction.instructions[0][-1].channel, instruction.channel)
-+        self.assertAlmostEqual(evaluated_instruction.instructions[0][-1].frequency, instruction.frequency)
- 
-     def test_delay(self):
-         """Test converted qobj from Delay."""
-diff --git a/test/randomized/test_transpiler_equivalence.py b/test/randomized/test_transpiler_equivalence.py
-index 302760279..1d0a3e16f 100644
---- a/test/randomized/test_transpiler_equivalence.py
-+++ b/test/randomized/test_transpiler_equivalence.py
-@@ -21,7 +21,7 @@ from hypothesis.stateful import Bundle, RuleBasedStateMachine
- 
- import hypothesis.strategies as st
- 
--from qiskit import execute, transpile, Aer
-+from qiskit import execute, transpile, BasicAer
- from qiskit import QuantumCircuit, QuantumRegister, ClassicalRegister
- from qiskit.circuit import Measure, Reset, Gate, Barrier
- from qiskit.test.mock import (
-@@ -98,7 +98,7 @@ class QCircuitMachine(RuleBasedStateMachine):
-     qubits = Bundle("qubits")
-     clbits = Bundle("clbits")
- 
--    backend = Aer.get_backend("qasm_simulator")
-+    backend = BasicAer.get_backend("qasm_simulator")
-     max_qubits = int(backend.configuration().n_qubits / 2)
- 
-     def __init__(self):
diff --git a/dev-python/qiskit-terra/qiskit-terra-0.19.2.ebuild b/dev-python/qiskit-terra/qiskit-terra-0.19.2.ebuild
deleted file mode 100644
index 54fdccc634c0..000000000000
--- a/dev-python/qiskit-terra/qiskit-terra-0.19.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Terra is the foundation on which Qiskit is built"
-HOMEPAGE="https://github.com/Qiskit/qiskit-terra"
-SRC_URI="https://github.com/Qiskit/qiskit-terra/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+visualization"
-KEYWORDS="~amd64"
-
-BDEPEND=">=dev-python/cython-0.27.1[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/ddt-1.4.4[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-4.24.3[${PYTHON_USEDEP}]
-		>=dev-python/networkx-2.2[${PYTHON_USEDEP}]
-		app-text/poppler[png]
-		>=sci-libs/scikit-learn-0.20.0[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	>=dev-python/rustworkx-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
-	>=dev-python/ply-3.10[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.5[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.3[${PYTHON_USEDEP}]
-	>=dev-python/dill-0.3[${PYTHON_USEDEP}]
-	>=dev-python/python-constraint-1.4[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/symengine-0.8[${PYTHON_USEDEP}]
-	>=dev-python/tweedledum-1.1[${PYTHON_USEDEP}]
-	visualization? (
-		>=dev-python/matplotlib-3.3[${PYTHON_USEDEP}]
-		>=dev-python/ipywidgets-7.3.0[${PYTHON_USEDEP}]
-		dev-python/pydot[${PYTHON_USEDEP}]
-		>=dev-python/pillow-4.2.1[${PYTHON_USEDEP}]
-		>=dev-python/pylatexenc-1.4[${PYTHON_USEDEP}]
-		>=dev-python/seaborn-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.4[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-# Small issues with the tests.
-# qiskit.Aer module depends on qiskit-terra, it cannot be used,
-# and an exact comparison of float switched to approximate comparison.
-PATCHES=( "${FILESDIR}/qiskit-terra-0.19.2-test-corrections.patch" )
-
-python_test() {
-	# We have to hide the source code directory so tests
-	# do not use these, but instead the compiled library.
-	mv qiskit qiskit.hidden || die
-
-	# Some small tests are failing which test optional features.
-	# Why they fail is still under investigation.
-	# transpiler_equivalence tests take too long time, they are also skipped.
-	epytest -k 'not (TestOptions and test_copy) and not TestUnitarySynthesisPlugin and not test_transpiler_equivalence and not (TestPauliSumOp and test_to_instruction)'
-
-	mv qiskit.hidden qiskit || die
-}
diff --git a/dev-python/qiskit-terra/qiskit-terra-0.22.0.ebuild b/dev-python/qiskit-terra/qiskit-terra-0.22.0-r1.ebuild
index 7a0c507d8577..b25eb56cf16e 100644
--- a/dev-python/qiskit-terra/qiskit-terra-0.22.0.ebuild
+++ b/dev-python/qiskit-terra/qiskit-terra-0.22.0-r1.ebuild
@@ -123,20 +123,22 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-# Small issues with the tests.
-# qiskit.Aer module depends on qiskit-terra, it cannot be used,
-# and an exact comparison of float switched to approximate comparison.
-#PATCHES=( "${FILESDIR}/qiskit-terra-0.19.2-test-corrections.patch" )
+src_prepare() {
+	find -name '*.py' -exec sed -i -e 's:retworkx:rustworkx:' {} + || die
+	distutils-r1_src_prepare
+}
 
 python_test() {
-	# We have to hide the source code directory so tests
-	# do not use these, but instead the compiled library.
-	mv qiskit qiskit.hidden || die
-
-	# Some small tests are failing which test optional features.
-	# Why they fail is still under investigation.
-	# transpiler_equivalence tests take too long time, they are also skipped.
-	epytest -n "$(makeopts_jobs)" -k 'not (TestOptions and test_copy) and not TestUnitarySynthesisPlugin and not test_transpiler_equivalence and not (TestPauliSumOp and test_to_instruction)'
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/python/transpiler/test_unitary_synthesis_plugin.py::TestUnitarySynthesisPlugin
+		test/python/transpiler/test_unitary_synthesis.py::TestUnitarySynthesis::test_two_qubit_synthesis_not_pulse_optimal
+	)
+	local EPYTEST_IGNORE=(
+		# TODO, also apparently slow
+		test/randomized/test_transpiler_equivalence.py
+	)
 
-	mv qiskit.hidden qiskit || die
+	rm -rf qiskit || die
+	epytest -p xdist -n "$(makeopts_jobs)"
 }