From 025c782a4bdec0ec856ba222ee5bfadc7df0ce6b Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Sun, 30 May 2021 01:35:11 +0000 Subject: Adding metadata --- .../symengine/files/symengine-0.7.2-metadata.patch | 68 ++++++++++++++++++++++ dev-python/symengine/symengine-0.7.2-r1.ebuild | 55 ----------------- dev-python/symengine/symengine-0.7.2-r2.ebuild | 59 +++++++++++++++++++ 3 files changed, 127 insertions(+), 55 deletions(-) create mode 100644 dev-python/symengine/files/symengine-0.7.2-metadata.patch delete mode 100644 dev-python/symengine/symengine-0.7.2-r1.ebuild create mode 100644 dev-python/symengine/symengine-0.7.2-r2.ebuild (limited to 'dev-python/symengine') diff --git a/dev-python/symengine/files/symengine-0.7.2-metadata.patch b/dev-python/symengine/files/symengine-0.7.2-metadata.patch new file mode 100644 index 000000000000..965751a41e7a --- /dev/null +++ b/dev-python/symengine/files/symengine-0.7.2-metadata.patch @@ -0,0 +1,68 @@ +From 01b2f6255e05a808b14a9541b7a762277e409edb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Sat, 29 May 2021 19:37:04 +0200 +Subject: [PATCH] Fix python_requires to unbreak installed package metadata + +The '>=3.6.*' entry in python_requires is invalid and results in broken +metadata being installed. This in turn causes distlib to break. +To reproduce: + + $ pip install distlib symengine + $ python -c "import distlib.database; \ + distlib.database.DistributionPath().get_distribution('symengine')" + Traceback (most recent call last): + File "/tmp/venv3/lib/python3.9/site-packages/distlib/metadata.py", line 677, in __init__ + self._data = json.loads(data) + File "/usr/lib/python3.9/json/__init__.py", line 346, in loads + return _default_decoder.decode(s) + File "/usr/lib/python3.9/json/decoder.py", line 337, in decode + obj, end = self.raw_decode(s, idx=_w(s, 0).end()) + File "/usr/lib/python3.9/json/decoder.py", line 355, in raw_decode + raise JSONDecodeError("Expecting value", s, err.value) from None + json.decoder.JSONDecodeError: Expecting value: line 1 column 1 (char 0) + + During handling of the above exception, another exception occurred: + + Traceback (most recent call last): + File "", line 1, in + File "/tmp/venv3/lib/python3.9/site-packages/distlib/database.py", line 240, in get_distribution + self._generate_cache() + File "/tmp/venv3/lib/python3.9/site-packages/distlib/database.py", line 167, in _generate_cache + for dist in self._yield_distributions(): + File "/tmp/venv3/lib/python3.9/site-packages/distlib/database.py", line 148, in _yield_distributions + metadata = Metadata(fileobj=stream, scheme='legacy') + File "/tmp/venv3/lib/python3.9/site-packages/distlib/metadata.py", line 686, in __init__ + self._legacy = LegacyMetadata(fileobj=StringIO(data), + File "/tmp/venv3/lib/python3.9/site-packages/distlib/metadata.py", line 261, in __init__ + self.read_file(fileobj) + File "/tmp/venv3/lib/python3.9/site-packages/distlib/metadata.py", line 359, in read_file + self.set(field, value) + File "/tmp/venv3/lib/python3.9/site-packages/distlib/metadata.py", line 459, in set + if not scheme.is_valid_constraint_list(value): + File "/tmp/venv3/lib/python3.9/site-packages/distlib/version.py", line 716, in is_valid_constraint_list + return self.is_valid_matcher('dummy_name (%s)' % s) + File "/tmp/venv3/lib/python3.9/site-packages/distlib/version.py", line 703, in is_valid_matcher + self.matcher(s) + File "/tmp/venv3/lib/python3.9/site-packages/distlib/version.py", line 115, in __init__ + raise ValueError('\'.*\' not allowed for ' + ValueError: '.*' not allowed for '>=' constraints +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 8e64d93..7b2a2d7 100644 +--- a/setup.py ++++ b/setup.py +@@ -222,7 +222,7 @@ setup(name="symengine", + author_email="symengine@googlegroups.com", + license="MIT", + url="https://github.com/symengine/symengine.py", +- python_requires='>=3.6.*,<4', ++ python_requires='>=3.6,<4', + zip_safe=False, + cmdclass = cmdclass, + classifiers=[ +-- +2.31.1 + diff --git a/dev-python/symengine/symengine-0.7.2-r1.ebuild b/dev-python/symengine/symengine-0.7.2-r1.ebuild deleted file mode 100644 index 20d3ca5cf5eb..000000000000 --- a/dev-python/symengine/symengine-0.7.2-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - -inherit distutils-r1 - -MY_P=${PN}.py-${PV} -DESCRIPTION="Python wrappers to the symengine C++ library" -HOMEPAGE="https://github.com/symengine/symengine.py/" -SRC_URI=" - https://github.com/symengine/symengine.py/archive/v${PV}.tar.gz - -> ${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux" - -BDEPEND=" - dev-util/cmake - dev-python/cython[${PYTHON_USEDEP}] - test? ( - dev-python/sympy[${PYTHON_USEDEP}] - ) -" -# See bug #786582 for symengine constraint -RDEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] - >=sci-libs/symengine-$(ver_cut 1-2) -" - -distutils_enable_tests pytest - -# the C library installs the same docs -DOCS=() - -src_prepare() { - default - - # Don't install tests - > "${S}/symengine/tests/CMakeLists.txt" || die -} - -python_test() { - cd "${BUILD_DIR}" || die - epytest -} - -python_install() { - distutils-r1_python_install - python_optimize -} diff --git a/dev-python/symengine/symengine-0.7.2-r2.ebuild b/dev-python/symengine/symengine-0.7.2-r2.ebuild new file mode 100644 index 000000000000..4145fdad27ec --- /dev/null +++ b/dev-python/symengine/symengine-0.7.2-r2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) + +inherit distutils-r1 + +MY_P=${PN}.py-${PV} +DESCRIPTION="Python wrappers to the symengine C++ library" +HOMEPAGE="https://github.com/symengine/symengine.py/" +SRC_URI=" + https://github.com/symengine/symengine.py/archive/v${PV}.tar.gz + -> ${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux" + +BDEPEND=" + dev-util/cmake + dev-python/cython[${PYTHON_USEDEP}] + test? ( + dev-python/sympy[${PYTHON_USEDEP}] + ) +" +# See bug #786582 for symengine constraint +RDEPEND=" + dev-python/numpy[${PYTHON_USEDEP}] + >=sci-libs/symengine-$(ver_cut 1-2) +" + +distutils_enable_tests pytest + +# the C library installs the same docs +DOCS=() + +PATCHES=( + "${FILESDIR}"/${P}-metadata.patch +) + +src_prepare() { + default + + # Don't install tests + > "${S}/symengine/tests/CMakeLists.txt" || die +} + +python_test() { + cd "${BUILD_DIR}" || die + epytest +} + +python_install() { + distutils-r1_python_install + python_optimize +} -- cgit v1.3.1