From 61044571b76d87a2eec42d36c9b7addf3e66e000 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 26 Feb 2023 03:55:42 +0000 Subject: gentoo auto-resync : 26:02:2023 - 03:55:42 --- dev-python/Manifest.gz | Bin 260092 -> 260101 bytes dev-python/cangjie/Manifest | 2 +- dev-python/cangjie/cangjie-1.3-r1.ebuild | 2 +- dev-python/leechcorepyc/Manifest | 4 + .../files/leechcorepyc-2.14.0-cflags.patch | 13 ++ .../files/leechcorepyc-2.14.0-respect-CC.patch | 38 +++++ dev-python/leechcorepyc/leechcorepyc-2.14.0.ebuild | 35 ++++ dev-python/qiskit-aer/Manifest | 3 +- .../files/qiskit-aer-0.11.2-terra-test.patch | 45 ++++++ dev-python/qiskit-aer/qiskit-aer-0.11.2-r1.ebuild | 36 +++-- dev-python/qiskit-terra/Manifest | 2 +- .../qiskit-terra/qiskit-terra-0.23.2-r1.ebuild | 177 +++++++++++++++++++++ dev-python/qiskit-terra/qiskit-terra-0.23.2.ebuild | 174 -------------------- dev-python/seaborn/Manifest | 3 + .../files/seaborn-0.12.2-matplotlib-3.7.patch | 19 +++ dev-python/seaborn/seaborn-0.12.2.ebuild | 44 +++++ 16 files changed, 404 insertions(+), 193 deletions(-) create mode 100644 dev-python/leechcorepyc/files/leechcorepyc-2.14.0-cflags.patch create mode 100644 dev-python/leechcorepyc/files/leechcorepyc-2.14.0-respect-CC.patch create mode 100644 dev-python/leechcorepyc/leechcorepyc-2.14.0.ebuild create mode 100644 dev-python/qiskit-aer/files/qiskit-aer-0.11.2-terra-test.patch create mode 100644 dev-python/qiskit-terra/qiskit-terra-0.23.2-r1.ebuild delete mode 100644 dev-python/qiskit-terra/qiskit-terra-0.23.2.ebuild create mode 100644 dev-python/seaborn/files/seaborn-0.12.2-matplotlib-3.7.patch create mode 100644 dev-python/seaborn/seaborn-0.12.2.ebuild (limited to 'dev-python') diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz index 852a31c5af51..6802808201d6 100644 Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ diff --git a/dev-python/cangjie/Manifest b/dev-python/cangjie/Manifest index 5a049a36f158..2fd95a9ea49c 100644 --- a/dev-python/cangjie/Manifest +++ b/dev-python/cangjie/Manifest @@ -1,3 +1,3 @@ DIST cangjie-1.3.tar.xz 237156 BLAKE2B a94f51df82136edddeeeecb729737a7be1cf4677c86df153ba86b436a404615156e6fe43d6efbb6ae602982763a4cd8ea09850882942a70a3a3737075bde0c01 SHA512 633b0040740105573fe72811c2f763756b67784330520ecadd5e0b24fc51e414f54a71f03444940f20c8a4943a14b65e2f1d18339696e2ea5cf659de8592df2a -EBUILD cangjie-1.3-r1.ebuild 1042 BLAKE2B 5ff05c8393a703fb73751a5529061cea886aa7849a1df362ed7541cbeb63436ebc5ecc9dc5b9c68f7ea64a3cd31a339d17788241d6dfc6428b6c0afaac607e21 SHA512 f7de6122d803e5a7b954321e7fe586225280ade932eb7c51c1bbce9e47bbf415b85dfb06649fa45bbf7dcdb9aa22cb11c4b4b807f6b63475ca11470c89794398 +EBUILD cangjie-1.3-r1.ebuild 1042 BLAKE2B e604b960038b34ff852d90f20d4a594835d91911de037683e3a39840b2d741bd6e046d416cde9002f03ecdb27dcbfb904a0b7f4f36eb1ba4051b6524156dc5f0 SHA512 88ed12a4a607200adb6cdeb4b91dcc45941362ddbba25a99e7001dea6bc4dbc2a64f3358de7da56db8b93cc8bf60eb709b0df6adfa952dfaab725fb1149959e0 MISC metadata.xml 364 BLAKE2B dce6d381b1a12df2864183389ada9a7ecc5ef46607a7a0ef23648ca8c08ddfe4bdce3fe05344241beee1fad69b288b85dae091a981fe002f32c70b4c52cfcce5 SHA512 4eaa64649508d536e76d86a5bb83df294a2393e90c9ae0ffdb9d04c52350eeafc80b2453edc9e5b524b42c97b6d112ca0d1617c5b127e6d2ef98b530b76eaba3 diff --git a/dev-python/cangjie/cangjie-1.3-r1.ebuild b/dev-python/cangjie/cangjie-1.3-r1.ebuild index 46a884d11511..26af275effb7 100644 --- a/dev-python/cangjie/cangjie-1.3-r1.ebuild +++ b/dev-python/cangjie/cangjie-1.3-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit autotools python-r1 DESCRIPTION="Python wrapper for libcangjie" diff --git a/dev-python/leechcorepyc/Manifest b/dev-python/leechcorepyc/Manifest index 799bd4d38c2a..ef9bd3cd6a09 100644 --- a/dev-python/leechcorepyc/Manifest +++ b/dev-python/leechcorepyc/Manifest @@ -1,4 +1,8 @@ AUX leechcorepyc-2.12.0-respect-CC.patch 1649 BLAKE2B 8a29af78a677fd3fef24192620c01057c72de7950897b51ee9735f3f078df60fee1bb51dbf96a9e131437bb0d2552f429118ac188caa9a9580399300e1fcf7ef SHA512 29e792fdb87f05f7e625f7214b9fa50745acf66dd4c210e517c21f40b3824fce5b322ba8b5acb106fc1355a562cf613e5e3d94bc3042c32982b3cf6d7b1985ec +AUX leechcorepyc-2.14.0-cflags.patch 748 BLAKE2B 1151e6dbda48ed5e842b1960048bd10a38467b2bfda7478f54590f22a46aa4909720bc5d3d5ba46bed333ebf1cd8002df418581f17dcfbbe8c989a752b34402e SHA512 b3a81db5375f89f028639517150d0bc0a835fda31d5560070e001a855fd4f188ca3cbbf7855f5ca2a9d821b92e3ae0d57017ee2b2cc41a93c2687da0b0321eb0 +AUX leechcorepyc-2.14.0-respect-CC.patch 1518 BLAKE2B 67446ded63f4a9b7e0f267cb0fe7b19e987f3077354d5ce293a60619313d7f9c6ab3e01a400217526c6ad204c5a8b0abaef0ad636fa2bda81aa11338eb621047 SHA512 63e13954e2e248a2dc980e122884063eba63b910159eb0e57135d3a4a5eedfbc01ee75c114ded22c320d94ac335c70482d572c1f82254ae07882480434ecc795 DIST leechcorepyc-2.13.0.tar.gz 123152 BLAKE2B 8a3ae5b0f0d52296ef71bbbea5140f9dec6abd379ae2a1b0e3a418090a11e5196731b1c4cba5320d4058c562911366cc9dd84f3a30f58ddc7c66362a9b39af8f SHA512 1420f635bebafe1e07cb5f0ade3e6b141433d4a72ec165713f959dc19e05f42a86440c5c99dd5d759aee221ee478e91e7161541cebe11be6dfa286fad79843ae +DIST leechcorepyc-2.14.0.tar.gz 124463 BLAKE2B 26b7581da76ab3f8981e956ab2f64de2094cc906788455e38784fb50dbad31b8b14de2f510cb49b9c1e842e2a66effd44a2db94cb6ef9e7ec9f11c3af0d9434c SHA512 c7d1d50727023f6b34bbc9682dba9bc70ae69962dcd5c326612a0dcd48a2a90ecfe674391559271d65d7720d755edde02342fb999e53ad54f8095c589060b901 EBUILD leechcorepyc-2.13.0.ebuild 819 BLAKE2B 789d253948cb2962e0913d07bf33b49c826960622b7a70656633ab72a63c4c516d15284dea68cb3d6d81630791b93ef79ce2a764d325a6e723ce16ac2996e8c1 SHA512 3a01fd6ada1707ec61b4aa3bddb949d6291f07a368787af1e4c82eb8ca043cd7853e8fadaf63552aaabc06730451e2a23cce37ff201f6f14f69cd755f7f7735c +EBUILD leechcorepyc-2.14.0.ebuild 862 BLAKE2B f5b046dd7efce49145a9fb6b9a248d3d0f9dcd072673a05f23fde391120491fecf9331afa1cd5a5a2632e3c336b6d707fbeba33c42502add074d44ca7ea84b5d SHA512 25bbf9aac0a33166d37537c2ebc02fec7e5e08386ca64688d81dab04fe1c3647b5d149d527a549556f31fc1ead7b9ba74db8c5cc4745828cf7361f3dd0eef9a4 MISC metadata.xml 683 BLAKE2B e85f13b83acf28fc6d59876fad2576afe741065c754680650adcb7acd1068410469de969ab4ee28ef5d9e7ff448c615293cf3f4713b4211c22dbb1b13d7f5947 SHA512 cff010f9f6dafcb3379a0de5ae0c98b974e605cf4e3a0131657832da2f0609e62cf07d3da84327b8c1272eb4cad64218e6c3f0231ec2402b3801e2453a10e76c diff --git a/dev-python/leechcorepyc/files/leechcorepyc-2.14.0-cflags.patch b/dev-python/leechcorepyc/files/leechcorepyc-2.14.0-cflags.patch new file mode 100644 index 000000000000..945f4e41e1c1 --- /dev/null +++ b/dev-python/leechcorepyc/files/leechcorepyc-2.14.0-cflags.patch @@ -0,0 +1,13 @@ +Bug: https://bugs.gentoo.org/893824 +--- a/leechcore/Makefile ++++ b/leechcore/Makefile +@@ -6,7 +6,8 @@ + # CFLAGS += -fsanitize=address -fsanitize=leak -fno-omit-frame-pointer -fsanitize=undefined -fsanitize=bounds-strict -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow + # CFLAGS += -fsanitize=pointer-compare -fsanitize=pointer-subtract -fanalyzer + # DEBUG FLAGS ABOVE +-CFLAGS += -fPIE -fPIC -pie -fstack-protector -D_FORTIFY_SOURCE=2 -O1 -Wl,-z,noexecstack ++CFLAGS := -D_FORTIFY_SOURCE=2 ${CFLAGS} ++CFLAGS += -fPIE -fPIC -pie -Wl,-z,noexecstack + CFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -Wno-unused-value -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast + LDFLAGS += -g -ldl -shared + DEPS = leechcore.h diff --git a/dev-python/leechcorepyc/files/leechcorepyc-2.14.0-respect-CC.patch b/dev-python/leechcorepyc/files/leechcorepyc-2.14.0-respect-CC.patch new file mode 100644 index 000000000000..4fdebf98d445 --- /dev/null +++ b/dev-python/leechcorepyc/files/leechcorepyc-2.14.0-respect-CC.patch @@ -0,0 +1,38 @@ +--- a/leechcore/Makefile ++++ b/leechcore/Makefile +@@ -1,5 +1,6 @@ +-CC=gcc +-CFLAGS += -I. -D LINUX -D _GNU_SOURCE -shared -fPIC -fvisibility=hidden -pthread `pkg-config libusb-1.0 --libs --cflags` ++CC?=gcc ++PKG_CONFIG ?= pkg-config ++CFLAGS += -I. -D LINUX -D _GNU_SOURCE -shared -fPIC -fvisibility=hidden -pthread `$(PKG_CONFIG) libusb-1.0 --libs --cflags` + # DEBUG FLAGS BELOW + # export ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:detect_invalid_pointer_pairs=2 + # CFLAGS += -g -O0 -Wextra -Wno-unused-parameter -Wno-cast-function-type +--- a/leechcore_device_rawtcp/Makefile ++++ b/leechcore_device_rawtcp/Makefile +@@ -1,4 +1,4 @@ +-CC=gcc ++CC?=gcc + CFLAGS += -I. -I../includes -D LINUX -shared -fPIC -fvisibility=hidden + LDFLAGS += -g -shared + DEPS = +--- a/leechcore_device_sp605tcp/Makefile ++++ b/leechcore_device_sp605tcp/Makefile +@@ -1,4 +1,4 @@ +-CC=gcc ++CC?=gcc + CFLAGS += -I. -I../includes -D LINUX -shared -fPIC -fvisibility=hidden + LDFLAGS += -g -shared + DEPS = +--- a/leechcore_ft601_driver_linux/Makefile ++++ b/leechcore_ft601_driver_linux/Makefile +@@ -1,5 +1,6 @@ +-CC=gcc +-CFLAGS += -I. -D LINUX -shared -fPIC -fvisibility=hidden `pkg-config libusb-1.0 --libs --cflags` ++CC?=gcc ++PKG_CONFIG ?= pkg-config ++CFLAGS += -I. -D LINUX -shared -fPIC -fvisibility=hidden `$(PKG_CONFIG) libusb-1.0 --libs --cflags` + LDFLAGS += -g -shared + DEPS = leechcore_ft601_driver_linux.h + OBJ = fpga_libusb.o leechcore_ft601_driver_linux.o diff --git a/dev-python/leechcorepyc/leechcorepyc-2.14.0.ebuild b/dev-python/leechcorepyc/leechcorepyc-2.14.0.ebuild new file mode 100644 index 000000000000..bf736abb4c7b --- /dev/null +++ b/dev-python/leechcorepyc/leechcorepyc-2.14.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) + +inherit distutils-r1 toolchain-funcs + +DESCRIPTION="Python binding for LeechCore Physical Memory Acquisition Library" +HOMEPAGE="https://github.com/ufrisk/LeechCore" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +# leechcorepyc ships with a bundled version of the LeechCore library. So we +# don't depend on the library here. But we must be aware this module doesn't +# use the system library. +DEPEND="virtual/libusb:=" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-2.14.0-respect-CC.patch" + "${FILESDIR}/${PN}-2.14.0-cflags.patch" +) + +src_configure() { + tc-export CC + + distutils-r1_src_configure +} diff --git a/dev-python/qiskit-aer/Manifest b/dev-python/qiskit-aer/Manifest index 7f1eb358be78..8dec90289572 100644 --- a/dev-python/qiskit-aer/Manifest +++ b/dev-python/qiskit-aer/Manifest @@ -1,4 +1,5 @@ AUX qiskit-aer-0.10.3-remove-cmake-dependency.patch 253 BLAKE2B 7b5da68c4a6c64ea4b3f0a0ff1a52294783762d8b34f3b7facbbe5bb2657b5cbe0e502ed01ea6c1b4135985391c5d6bc8fccfc34164bb6a88bbaf1e3aa9b3968 SHA512 6d9a14d7c04292efcbb3f7f8abdfa1f1efeeeb081b5775f01162f95fcc9c0f6465863058dd88374b0bb2525dc4fdc3b7408100b3ac990109554b2d77b3a93223 +AUX qiskit-aer-0.11.2-terra-test.patch 1728 BLAKE2B bafee3006858ff064285f95a6c275ef83794eb6650b02964b043a6a3f0bd0c3aeaeffc854404ce19d89277328374486e5483d78c22583485b93ffa65b877420d SHA512 9d84dec047247d152aaad053633d0d88cc3cc02e621a1a409a73aa84f502748609abe57657058bf2bc6c0818b6385734556d1ef60a2ea2cfa9019c74208286b1 DIST qiskit-aer-0.11.2.gh.tar.gz 6707283 BLAKE2B ae32a469d23a31f202b9f970c59e9efb76c290243bce6179b0a58590d671f6dec0428245131e7cb2966b818dae9fbe7e7078a63fac107572e9e7d4a66e47a539 SHA512 48b28f6c54c898bb3984062ec772373e90899fd436c8e00f0c4abd57b6b98ea6c647283445fe551bd516483b66d25c9861ef519f01a0d1ddc6b3ddbce07bc56a -EBUILD qiskit-aer-0.11.2-r1.ebuild 2653 BLAKE2B e289b50039ca081b83034f044d0e9bb392d92bf2172e5211693cd4bb2b4ac55712bc81dbb241362a3025c0809a82c88462d8a5a233218b2c92b451195752b41e SHA512 44cbaa0a59e72b11ad91c21b6eff01110b330d39be108b227d1faa6462ada34b8f55f46265994708e6137f0366a4cb5579a1c631a9c73c2e0315169d232d2d8b +EBUILD qiskit-aer-0.11.2-r1.ebuild 3018 BLAKE2B b3f17b2018fa0f22f427632010430e4b1dde4a26e2b5636ded1b391656590fed5322ab8ef014b928a34f69b5ea41b20acc9a4c59d6b60056d27a505bd0130d9c SHA512 dde6e31c11fa5892500a6ae06f3d46a1fc0bf5d2441004eef47bf31f9af878403008afc90d920e6d8343b5d51d7a5493e0445957566fe84ea14eb08b310245de MISC metadata.xml 1049 BLAKE2B e2118dc211ac8f42115959dde943a32331b4186524ef4a5a1343d8798a329e1d0de5f9a52a9c1212ec6af39392993378c6422424488782747ffbf4ab1e63d25e SHA512 bc4c9a19376938e973bedbdff0bbe95edb98c78b75d03f2a12985558a5cd5d0ceb934c43371438dd597a8d4fb8879d5483aeb8d806ac4d9b73b704d1232086b8 diff --git a/dev-python/qiskit-aer/files/qiskit-aer-0.11.2-terra-test.patch b/dev-python/qiskit-aer/files/qiskit-aer-0.11.2-terra-test.patch new file mode 100644 index 000000000000..e9f65dd6a42a --- /dev/null +++ b/dev-python/qiskit-aer/files/qiskit-aer-0.11.2-terra-test.patch @@ -0,0 +1,45 @@ +https://github.com/Qiskit/qiskit-aer/commit/cec5c11513118fa8d701e2bef1376dc3db7263c3 + +From cec5c11513118fa8d701e2bef1376dc3db7263c3 Mon Sep 17 00:00:00 2001 +From: Jun Doi +Date: Fri, 27 Jan 2023 18:55:59 +0900 +Subject: [PATCH] Fix test_aer_statevector (#1710) + +* fix test_aer_statevector + +* add plot directive to docs + +* fix test_aer_statevector and remove reno + +Co-authored-by: Hiroshi Horii +--- a/docs/conf.py ++++ b/docs/conf.py +@@ -67,6 +67,7 @@ extensions = [ + 'sphinx_tabs.tabs', + 'jupyter_sphinx', + 'reno.sphinxext', ++ 'matplotlib.sphinxext.plot_directive', + ] + html_static_path = ['_static'] + templates_path = ['_templates'] +--- a/test/terra/states/test_aer_statevector.py ++++ b/test/terra/states/test_aer_statevector.py +@@ -1347,13 +1347,14 @@ class TestAerStatevector(common.QiskitAerTestCase): + ([-1, 1j], ["-", "+i"]), + ([1e-16 + 1j], ["i"]), + ([-1 + 1e-16 * 1j], ["-"]), +- ([-1, -1 - 1j], ["-", "+ (-1 - i)"]), ++ ([-1, -1 - 1j], ["-", "+(-1 - i)"]), + ([np.sqrt(2) / 2, np.sqrt(2) / 2], ["\\frac{\\sqrt{2}}{2}", "+\\frac{\\sqrt{2}}{2}"]), + ([1 + np.sqrt(2)], ["(1 + \\sqrt{2})"]), + ] +- for numbers, latex_terms in cases: +- terms = numbers_to_latex_terms(numbers) +- self.assertListEqual(terms, latex_terms) ++ with self.assertWarns(DeprecationWarning): ++ for numbers, latex_terms in cases: ++ terms = numbers_to_latex_terms(numbers, 15) ++ self.assertListEqual(terms, latex_terms) + + def test_statevector_draw_latex_regression(self): + """Test numerical rounding errors are not printed""" diff --git a/dev-python/qiskit-aer/qiskit-aer-0.11.2-r1.ebuild b/dev-python/qiskit-aer/qiskit-aer-0.11.2-r1.ebuild index f9de54e64534..07d45fbdb52d 100644 --- a/dev-python/qiskit-aer/qiskit-aer-0.11.2-r1.ebuild +++ b/dev-python/qiskit-aer/qiskit-aer-0.11.2-r1.ebuild @@ -4,9 +4,9 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) -inherit distutils-r1 +inherit distutils-r1 multiprocessing DESCRIPTION="High performance simulator for quantum circuits that includes noise models" HOMEPAGE=" @@ -35,7 +35,11 @@ DEPEND=" virtual/cblas[eselect-ldso] sci-libs/openblas[eselect-ldso] " - +RDEPEND=" + ${DEPEND} + >=dev-python/qiskit-terra-0.21.0[${PYTHON_USEDEP}] + >=dev-python/scipy-1.0[${PYTHON_USEDEP}] +" BDEPEND=" >=dev-util/cmake-3.17 >=dev-python/scikit-build-0.11.0[${PYTHON_USEDEP}] @@ -43,21 +47,19 @@ BDEPEND=" test? ( dev-python/ddt[${PYTHON_USEDEP}] dev-python/fixtures[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] ) " -RDEPEND=" - ${DEPEND} - >=dev-python/qiskit-terra-0.21.0[${PYTHON_USEDEP}] - >=dev-python/scipy-1.0[${PYTHON_USEDEP}] -" +PATCHES=( + # Remove cmake dependency from setup.py because of + # invalid dependency description. We put this dependency check in BDEPEND. + "${FILESDIR}/qiskit-aer-0.10.3-remove-cmake-dependency.patch" + "${FILESDIR}/qiskit-aer-0.11.2-terra-test.patch" +) distutils_enable_tests pytest -# Remove cmake dependency from setup.py because of -# invalid dependency description. We put this dependency check in BDEPEND. -PATCHES=( "${FILESDIR}/qiskit-aer-0.10.3-remove-cmake-dependency.patch" ) - check_openblas() { local libdir=$(get_libdir) me="openblas" @@ -75,7 +77,7 @@ check_openblas() { pkg_setup() { if use test; then check_openblas - if [ $? -ne 0 ]; then + if [[ $? -ne 0 ]]; then die "Set blas implementation to openblas using 'eselect blas set openblas'!" fi fi @@ -92,11 +94,15 @@ python_prepare_all() { python_test() { local EPYTEST_DESELECT=( # TODO - test/terra/states/test_aer_statevector.py::TestAerStatevector::test_number_to_latex_terms + test/terra/states/test_aer_statevector.py::TestAerStatevector::test_drawings + + # TODO: GLIBCXX_ASSERTIONS, bug #897758 + test/terra/backends/aer_simulator/test_algorithms.py::TestAlgorithms::test_extended_stabilizer_sparse_output_probs + test/terra/backends/aer_simulator/test_options.py::TestOptions::test_mps_options ) rm -rf qiskit_aer || die - epytest -s + epytest -n "$(makeopts_jobs)" -s } pkg_postinst() { diff --git a/dev-python/qiskit-terra/Manifest b/dev-python/qiskit-terra/Manifest index acaf67443100..e63c0936df4e 100644 --- a/dev-python/qiskit-terra/Manifest +++ b/dev-python/qiskit-terra/Manifest @@ -86,5 +86,5 @@ DIST windows_x86_64_gnu-0.42.0.crate 692493 BLAKE2B e00eae443cfed300480924465426 DIST windows_x86_64_gnullvm-0.42.0.crate 357906 BLAKE2B 02e08e696f18105f0c131fcf5db046ec945cb21ede76d2da477589e15d062ca6f04906dac80fdd2ef9fcda9244490aad86b401d0156eb6b65ba3599098e8cfe7 SHA512 242e11b4a0d50a0ffe8d0e26e971de30ef4d29260ae6749403d39cb4278297a240c1ec4112bb38151cbb11a6f3c8a743e84cd75b6a76adfeaee8e623649c9ecf DIST windows_x86_64_msvc-0.42.0.crate 659377 BLAKE2B f01dbfcb86dcb7301790a1a704661864378021cbb92b147fdfcee978b7011bb770441c481b439985c298816c524c6a11f21a7bd81115e65882fa000a28566bcd SHA512 94d6554ae293785d2fc9dc9d53480c98bc08ab2b78bd8684a0606e7e0ec156a454c1a653d214c21de382bc7ab5d898e45000ed73e6110f679da513ffabbf3cb9 EBUILD qiskit-terra-0.22.3-r1.ebuild 4029 BLAKE2B 7a9785ed07276a2ee063ca8616fb0625ac400ea90170d9419cf72d50c8a0a7e95593d53a6373acf43cdcebc7b35c2820205ab7f0b287634c7bc46a7b6520abc7 SHA512 c8e84e53e8aa832c29550fef67187bbb47fb2aa1434adf93668c8d3383e42e089d04eded49ae205f4fb8e65b55f59083d606e77e711804e55902313097d5d718 -EBUILD qiskit-terra-0.23.2.ebuild 4733 BLAKE2B d8a032465f549962fe2f0bc6662a60395cc6ebbf7b6d33091a983f10d55a2902638c636ce293228d94a8432bb6e6a52d17dddb4613717502aae42b7f02292a8e SHA512 e0180e6b6b0f433abac801f0771fad9a48c9f672436669b27ae130741dfd14044a051dbe3141ebf0d1083fbc4dfe5ab8e597b49ad315450726c5cff52d5fce5f +EBUILD qiskit-terra-0.23.2-r1.ebuild 4794 BLAKE2B ef322c8b61707beb7ef7e9702c50bfb611e26c468b66de46fd1a9fe0a026104bc4bbbf131b80fc402c0419398e1ca8f42420d765150f20b05de8756f5557d160 SHA512 fb78516570e4b1defab4a27c69dee55d93d2f959005342e56a2cea3d0399c7ab3d0d03136ce014bc53983b859da937ac1fcab76b58e113d4b33b6301e57b6381 MISC metadata.xml 1099 BLAKE2B 4d2ae544b77d18aafe53ad0bfdc7bc32b9656eb4096d8f2ed0c2e71e8718d260d1030207753cd4e0b10748ec7508813f84a5232e7d491348be2c7ca1fcc5d860 SHA512 113bee16467977079ee15aab442d9255f9d3d3ad29dc27f2082b1f9b902856ce827aff722f988d4a9da2bc8762523002d8acb5702271ef87c188990c2b677038 diff --git a/dev-python/qiskit-terra/qiskit-terra-0.23.2-r1.ebuild b/dev-python/qiskit-terra/qiskit-terra-0.23.2-r1.ebuild new file mode 100644 index 000000000000..c3eb8a31ec2f --- /dev/null +++ b/dev-python/qiskit-terra/qiskit-terra-0.23.2-r1.ebuild @@ -0,0 +1,177 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" + ahash-0.7.6 + ahash-0.8.0 + autocfg-1.1.0 + bitflags-1.3.2 + cfg-if-1.0.0 + crossbeam-channel-0.5.6 + crossbeam-deque-0.8.2 + crossbeam-epoch-0.9.11 + crossbeam-utils-0.8.12 + either-1.8.0 + fixedbitset-0.4.2 + getrandom-0.2.8 + hashbrown-0.11.2 + hashbrown-0.12.3 + hermit-abi-0.1.19 + indexmap-1.7.0 + indoc-1.0.7 + libc-0.2.137 + libm-0.2.5 + lock_api-0.4.9 + matrixmultiply-0.3.2 + memoffset-0.6.5 + memoffset-0.8.0 + ndarray-0.15.6 + num-bigint-0.4.3 + num-complex-0.4.2 + num-integer-0.1.45 + num-traits-0.2.15 + num_cpus-1.13.1 + numpy-0.18.0 + once_cell-1.16.0 + parking_lot-0.12.1 + parking_lot_core-0.9.4 + petgraph-0.6.2 + ppv-lite86-0.2.16 + priority-queue-1.2.0 + proc-macro2-1.0.47 + pyo3-0.18.1 + pyo3-build-config-0.18.1 + pyo3-ffi-0.18.1 + pyo3-macros-0.18.1 + pyo3-macros-backend-0.18.1 + quote-1.0.21 + rand-0.8.5 + rand_chacha-0.3.1 + rand_core-0.6.4 + rand_distr-0.4.3 + rand_pcg-0.3.1 + rawpointer-0.2.1 + rayon-1.6.0 + rayon-core-1.10.1 + redox_syscall-0.2.16 + rustc-hash-1.1.0 + rustworkx-core-0.12.1 + scopeguard-1.1.0 + smallvec-1.10.0 + syn-1.0.103 + target-lexicon-0.12.4 + unicode-ident-1.0.5 + unindent-0.1.10 + version_check-0.9.4 + wasi-0.11.0+wasi-snapshot-preview1 + windows-sys-0.42.0 + windows_aarch64_gnullvm-0.42.0 + windows_aarch64_msvc-0.42.0 + windows_i686_gnu-0.42.0 + windows_i686_msvc-0.42.0 + windows_x86_64_gnu-0.42.0 + windows_x86_64_gnullvm-0.42.0 + windows_x86_64_msvc-0.42.0 +" + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) + +inherit cargo distutils-r1 multiprocessing optfeature + +DESCRIPTION="Terra is the foundation on which Qiskit is built" +HOMEPAGE=" + https://github.com/Qiskit/qiskit-terra/ + https://pypi.org/project/qiskit-terra/ +" +SRC_URI=" + https://github.com/Qiskit/qiskit-terra/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz + $(cargo_crate_uris) +" + +LICENSE="Apache-2.0" +# Dependent crate licenses +LICENSE+=" + Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 MIT + Unicode-DFS-2016 + || ( LGPL-3 MPL-2.0 ) +" +SLOT="0" +IUSE="+visualization" +KEYWORDS="~amd64" + +RDEPEND=" + >=dev-python/rustworkx-0.12.0[${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}] + 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}] + ) +" +BDEPEND=" + >=dev-python/cython-0.27.1[${PYTHON_USEDEP}] + test? ( + app-text/poppler[png] + >=dev-python/ddt-1.4.4[${PYTHON_USEDEP}] + >=dev-python/hypothesis-4.24.3[${PYTHON_USEDEP}] + >=dev-python/networkx-2.2[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + dev-python/qiskit-aer[${PYTHON_USEDEP}] + >=sci-libs/scikit-learn-0.20.0[${PYTHON_USEDEP}] + ) +" + +# Files built without CFLAGS/LDFLAGS, acceptable for rust +QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/qiskit/_accelerate.*.so" + +distutils_enable_tests pytest + +python_test() { + 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 + + # TestOptions::test_copy - TypeError: argument of type 'Options' is not iterable + test/python/providers/test_options.py::TestOptions::test_copy + + # DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('mpl_toolkits')`. + test/python/test_version.py::TestVersion::test_qiskit_version + + # Hangs + # Broken by https://github.com/Qiskit/qiskit-terra/pull/8952? + test/python/compiler/test_transpiler.py::TestTranspileParallel::test_parallel_dispatch_4_3 + test/python/compiler/test_transpiler.py::TestTranspileParallel::test_parallel_with_target_4_3 + ) + local EPYTEST_IGNORE=( + # TODO, also apparently slow + test/randomized/test_transpiler_equivalence.py + ) + + rm -rf qiskit || die + # Run the Python test suite rather than everything under test/ which + # includes the 'randomized' suite. Upstream run that in a separate CI job. + # Note: use -p timeout --timeout 500 if debugging hanging tests. + epytest -p xdist -n "$(makeopts_jobs)" test/python +} + +pkg_postinst() { + optfeature "qiskit.circuit.classicalfunction support" dev-python/tweedledum +} diff --git a/dev-python/qiskit-terra/qiskit-terra-0.23.2.ebuild b/dev-python/qiskit-terra/qiskit-terra-0.23.2.ebuild deleted file mode 100644 index 3d1bdc2d0aba..000000000000 --- a/dev-python/qiskit-terra/qiskit-terra-0.23.2.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CRATES=" - ahash-0.7.6 - ahash-0.8.0 - autocfg-1.1.0 - bitflags-1.3.2 - cfg-if-1.0.0 - crossbeam-channel-0.5.6 - crossbeam-deque-0.8.2 - crossbeam-epoch-0.9.11 - crossbeam-utils-0.8.12 - either-1.8.0 - fixedbitset-0.4.2 - getrandom-0.2.8 - hashbrown-0.11.2 - hashbrown-0.12.3 - hermit-abi-0.1.19 - indexmap-1.7.0 - indoc-1.0.7 - libc-0.2.137 - libm-0.2.5 - lock_api-0.4.9 - matrixmultiply-0.3.2 - memoffset-0.6.5 - memoffset-0.8.0 - ndarray-0.15.6 - num-bigint-0.4.3 - num-complex-0.4.2 - num-integer-0.1.45 - num-traits-0.2.15 - num_cpus-1.13.1 - numpy-0.18.0 - once_cell-1.16.0 - parking_lot-0.12.1 - parking_lot_core-0.9.4 - petgraph-0.6.2 - ppv-lite86-0.2.16 - priority-queue-1.2.0 - proc-macro2-1.0.47 - pyo3-0.18.1 - pyo3-build-config-0.18.1 - pyo3-ffi-0.18.1 - pyo3-macros-0.18.1 - pyo3-macros-backend-0.18.1 - quote-1.0.21 - rand-0.8.5 - rand_chacha-0.3.1 - rand_core-0.6.4 - rand_distr-0.4.3 - rand_pcg-0.3.1 - rawpointer-0.2.1 - rayon-1.6.0 - rayon-core-1.10.1 - redox_syscall-0.2.16 - rustc-hash-1.1.0 - rustworkx-core-0.12.1 - scopeguard-1.1.0 - smallvec-1.10.0 - syn-1.0.103 - target-lexicon-0.12.4 - unicode-ident-1.0.5 - unindent-0.1.10 - version_check-0.9.4 - wasi-0.11.0+wasi-snapshot-preview1 - windows-sys-0.42.0 - windows_aarch64_gnullvm-0.42.0 - windows_aarch64_msvc-0.42.0 - windows_i686_gnu-0.42.0 - windows_i686_msvc-0.42.0 - windows_x86_64_gnu-0.42.0 - windows_x86_64_gnullvm-0.42.0 - windows_x86_64_msvc-0.42.0 -" - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..10} ) - -inherit cargo distutils-r1 multiprocessing - -DESCRIPTION="Terra is the foundation on which Qiskit is built" -HOMEPAGE=" - https://github.com/Qiskit/qiskit-terra/ - https://pypi.org/project/qiskit-terra/ -" -SRC_URI=" - https://github.com/Qiskit/qiskit-terra/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz - $(cargo_crate_uris) -" - -LICENSE="Apache-2.0" -# Dependent crate licenses -LICENSE+=" - Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 MIT - Unicode-DFS-2016 - || ( LGPL-3 MPL-2.0 ) -" -SLOT="0" -IUSE="+visualization" -KEYWORDS="~amd64" - -RDEPEND=" - >=dev-python/rustworkx-0.12.0[${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}] - ) -" -BDEPEND=" - >=dev-python/cython-0.27.1[${PYTHON_USEDEP}] - test? ( - app-text/poppler[png] - >=dev-python/ddt-1.4.4[${PYTHON_USEDEP}] - >=dev-python/hypothesis-4.24.3[${PYTHON_USEDEP}] - >=dev-python/networkx-2.2[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - dev-python/qiskit-aer[${PYTHON_USEDEP}] - >=sci-libs/scikit-learn-0.20.0[${PYTHON_USEDEP}] - ) -" - -# Files built without CFLAGS/LDFLAGS, acceptable for rust -QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/qiskit/_accelerate.*.so" - -distutils_enable_tests pytest - -python_test() { - 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 - - # TestOptions::test_copy - TypeError: argument of type 'Options' is not iterable - test/python/providers/test_options.py::TestOptions::test_copy - - # DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('mpl_toolkits')`. - test/python/test_version.py::TestVersion::test_qiskit_version - - # Hangs - # Broken by https://github.com/Qiskit/qiskit-terra/pull/8952? - test/python/compiler/test_transpiler.py::TestTranspileParallel::test_parallel_dispatch_4_3 - test/python/compiler/test_transpiler.py::TestTranspileParallel::test_parallel_with_target_4_3 - ) - local EPYTEST_IGNORE=( - # TODO, also apparently slow - test/randomized/test_transpiler_equivalence.py - ) - - rm -rf qiskit || die - # Run the Python test suite rather than everything under test/ which - # includes the 'randomized' suite. Upstream run that in a separate CI job. - # Note: use -p timeout --timeout 500 if debugging hanging tests. - epytest -p xdist -n "$(makeopts_jobs)" test/python -} diff --git a/dev-python/seaborn/Manifest b/dev-python/seaborn/Manifest index 21cd42ac5041..52956333da99 100644 --- a/dev-python/seaborn/Manifest +++ b/dev-python/seaborn/Manifest @@ -1,3 +1,6 @@ +AUX seaborn-0.12.2-matplotlib-3.7.patch 753 BLAKE2B c4015d94eb336b8dadb29a1e56d3b1ba6e5f2134774b2bd99ed09a00025394adaa52093373578e27c4db08f28a62f4eac0a8b89b73dc7cdf818155c037b682ee SHA512 3dd36909ab7c933e4dbaee0f73a1b1e29b1b57057e59ade7fccadf4324b307c90578f018ce56b9a1294c067f367298819e4d397fdcb794f1e40cd2eb7b2057b1 DIST seaborn-0.12.0.tar.gz 1407601 BLAKE2B 3da8db0a0c08a40a3969a2ffce248f5521b4c7c93ecf0f014850093ef48331326454572ceea6ee1133805bf92540b0d2acecdfb7cb789d238f743b30e6a28947 SHA512 b2b06a22d48f19ace2448f465ca5e700f3486971d9fb86e85a1a8c9e2956b904e5f4c2c8075f848299b182cf8f69b2fac22366fedbd8012b9c44adc0bcb7e060 +DIST seaborn-0.12.2.tar.gz 1439798 BLAKE2B cf6903b1a2d27516bcafe46cabc81ea9fac80666394a6a82516630f9ac60afc7e9d31817e029cda9a08da04c0a37ce0244ad23acda16bca3283532ddb0fbdb71 SHA512 988a9922ee301b655911efa38905674b7dd15e7f7b157ad67f5befaeb02db492553f8bd6133b54d2dd7970b8dbbfd92d81d1faea3fa618247ebcaeb98620a060 EBUILD seaborn-0.12.0.ebuild 766 BLAKE2B 04950be78b6406e0d37cdb27b965be44d6e12d10f14271832bccc3fb8ec047fbda4ab641c22e296bcfb9498458afb3fb42c4413debffaca1f1aea98fbc7f5677 SHA512 a9b8be3f4f46cd07811e8e93c3f63a558c9c32d34af1d15c4953a2e0536b2cc0b2275519f3c979ae0e28a05cc9ae10ab2dbc4f5a665854c8033c8c033548da61 +EBUILD seaborn-0.12.2.ebuild 906 BLAKE2B 41e5ad03f0ef99a1e4960402e96c4507269ac7a9820b620bb4a35aa7ce216d554a6ee125174d9dbcbdcb5110ee5ff74ccbc3acad5c0161ac2d361609feb6f1d3 SHA512 887af46521d2f043385314ce95648bd1b1dca56ec62c9488624ab5672873a3c777362395fe838b5394fd80987901e902ddc240c078694229018742d87d55a069 MISC metadata.xml 1510 BLAKE2B 897785b5160185a2e2566495abb52d7a9136def9ea267601ea3719e0c5246c48ef09c4485674fa7c50202def865fe032df42a61396d95a097aafa82bfdeec05d SHA512 54374e04284143b80c0e97968ca9f31dc763ff4e14800a3ced4ed852722144cf89ebe5867b044597c8566a47d4e5e63359b7976bf6681cd4cf67aabcee7cf8a4 diff --git a/dev-python/seaborn/files/seaborn-0.12.2-matplotlib-3.7.patch b/dev-python/seaborn/files/seaborn-0.12.2-matplotlib-3.7.patch new file mode 100644 index 000000000000..dbc4908321d9 --- /dev/null +++ b/dev-python/seaborn/files/seaborn-0.12.2-matplotlib-3.7.patch @@ -0,0 +1,19 @@ +https://github.com/mwaskom/seaborn/commit/db7ae11750fc2dfb695457239708448d54e9b8cd + +From db7ae11750fc2dfb695457239708448d54e9b8cd Mon Sep 17 00:00:00 2001 +From: Michael Waskom +Date: Wed, 25 Jan 2023 16:58:26 -0500 +Subject: [PATCH] Update test to reflect change in matplotlib 3.7 (#3236) + +--- a/tests/test_axisgrid.py ++++ b/tests/test_axisgrid.py +@@ -331,7 +331,7 @@ def test_subplot_kws(self): + g = ag.FacetGrid(self.df, despine=False, + subplot_kws=dict(projection="polar")) + for ax in g.axes.flat: +- assert "PolarAxesSubplot" in str(type(ax)) ++ assert "PolarAxes" in ax.__class__.__name__ + + def test_gridspec_kws(self): + ratios = [3, 1, 2] + diff --git a/dev-python/seaborn/seaborn-0.12.2.ebuild b/dev-python/seaborn/seaborn-0.12.2.ebuild new file mode 100644 index 000000000000..276eda23158c --- /dev/null +++ b/dev-python/seaborn/seaborn-0.12.2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=flit +PYTHON_COMPAT=( python3_{9..11} ) +inherit distutils-r1 multiprocessing pypi + +DESCRIPTION="Statistical data visualization" +HOMEPAGE="https://seaborn.pydata.org https://github.com/mwaskom/seaborn" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + +RDEPEND=" + dev-python/matplotlib[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pandas[${PYTHON_USEDEP}] + dev-python/statsmodels[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] ) +" + +PATCHES=( + "${FILESDIR}"/${P}-matplotlib-3.7.patch +) + +distutils_enable_tests pytest + +src_test() { + cat > matplotlibrc <<- EOF || die + backend : Agg + EOF + + distutils-r1_src_test +} + +python_test() { + epytest -n "$(makeopts_jobs)" +} -- cgit v1.2.3