* [gentoo-commits] repo/gentoo:master commit in: sci-biology/biopython/files/, sci-biology/biopython/
@ 2017-01-02 22:09 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2017-01-02 22:09 UTC (permalink / raw
To: gentoo-commits
commit: 8ffc5a1942e322e42d57a77eb5d89a9a15501ae9
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 2 21:51:34 2017 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan 2 22:09:05 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ffc5a19
sci-biology/biopython: Drop old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-biology/biopython/Manifest | 2 -
sci-biology/biopython/biopython-1.65.ebuild | 56 ----------------------
sci-biology/biopython/biopython-1.66.ebuild | 56 ----------------------
.../files/biopython-1.65-test-fix-backport.patch | 40 ----------------
4 files changed, 154 deletions(-)
diff --git a/sci-biology/biopython/Manifest b/sci-biology/biopython/Manifest
index 9e5a8d9..415ede8 100644
--- a/sci-biology/biopython/Manifest
+++ b/sci-biology/biopython/Manifest
@@ -1,3 +1 @@
-DIST biopython-1.65.tar.gz 12641342 SHA256 463cc81db84e9bfcdfb15629511c81ed556a6c0287e670dbfe80f03c65d2a88e SHA512 2a9c6a89d0279374c243938d13bfdd6f2b124a08afbfb0c262e1e4827c48a141fb9941f4cdb960f76b523f0ac152095a8c6ea566d9b469ce9daf8a7e7993f7af WHIRLPOOL 40757938c0eb7e30c9609ef5aa2d397fa21ad92cd20c9b6300cde1b381a0e6c21e4ebb7f4d25bf02651789437d7d86341154b907ccc0007759c17939f2e29da2
-DIST biopython-1.66.tar.gz 13724754 SHA256 5178ea3b343b1d8710f39205386093e5369ed653aa020e1b0c4b7622a59346c1 SHA512 6bb01f1058728f957527447df82ffbb9027e74564e81c8308b3404d033a0f12fef50da05b343bd4c4eae98508931eedc9c4bc23b2efdf36bbb49f1557fa52d71 WHIRLPOOL 0cfe3f4829ec72afa466b17cf6745cc334105713ebeeb06019e2df94acc1289aeb07a7bba70a50afeae00de90c48d2455a1af8cf26f916ceb4c0ab92a4a05fbd
DIST biopython-1.68.tar.gz 14445813 SHA256 d1dc09d1ddc8e90833f507cf09f80fa9ee1537d319058d1c44fe9c09be3d0c1f SHA512 0ca994475654bb68ff326c8e86cbd4547cd87b42e1633dda039ad668e1298884b22e169f6b25ab514e929861334a93b7db6d057a3486cea9997ca2de95c61a69 WHIRLPOOL 9348354d0063efe0f9051f46e3be60540c5df21a43c094d74e64d37279736921d890cd639c904336eb21b2996e9948b8a050017b77569d2333ac80aa5b8bf156
diff --git a/sci-biology/biopython/biopython-1.65.ebuild b/sci-biology/biopython/biopython-1.65.ebuild
deleted file mode 100644
index 64bb66c..00000000
--- a/sci-biology/biopython/biopython-1.65.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 pypy )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Python modules for computational molecular biology"
-HOMEPAGE="http://www.biopython.org/ https://pypi.python.org/pypi/biopython/"
-SRC_URI="http://www.biopython.org/DIST/${P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
- dev-python/matplotlib[$(python_gen_usedep 'python*')]
- dev-python/networkx[$(python_gen_usedep 'python*')]
- dev-python/numpy[$(python_gen_usedep 'python*')]
- dev-python/rdflib[$(python_gen_usedep 'python*')]
- dev-python/pygraphviz[$(python_gen_usedep 'python2*')]
- dev-python/reportlab[$(python_gen_usedep 'python*')]
- media-gfx/pydot[$(python_gen_usedep 'python2*')]
- "
-DEPEND="${RDEPEND}
- sys-devel/flex"
-
-DOCS=( CONTRIB DEPRECATED NEWS README Doc/. )
-
-PATCHES=( "${FILESDIR}"/${P}-test-fix-backport.patch )
-
-python_test() {
- [[ ${EPYTHON} == pypy ]] && return
- cd Tests || die
- ${PYTHON} run_tests.py || die
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- dodir /usr/share/${PN}
- cp -r --preserve=mode Scripts Tests "${ED}"/usr/share/${PN} || die
-}
-
-pkg_postinst() {
- elog "For database support you need to install:"
- optfeature "MySQL" dev-python/mysql-python
- optfeature "PostGreSQL" dev-python/psycopg
- echo
- elog "Some applications need extra packages:"
- optfeature "EMBOSS (The European Molecular Biology Open Software Suite)" sci-biology/emboss
-}
diff --git a/sci-biology/biopython/biopython-1.66.ebuild b/sci-biology/biopython/biopython-1.66.ebuild
deleted file mode 100644
index 1e6a2a4..00000000
--- a/sci-biology/biopython/biopython-1.66.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Python modules for computational molecular biology"
-HOMEPAGE="http://www.biopython.org/ https://pypi.python.org/pypi/biopython/"
-SRC_URI="http://www.biopython.org/DIST/${P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
- dev-python/matplotlib[$(python_gen_usedep 'python*')]
- dev-python/networkx[$(python_gen_usedep 'python*')]
- dev-python/numpy[$(python_gen_usedep 'python*')]
- dev-python/rdflib[$(python_gen_usedep 'python*')]
- dev-python/pygraphviz[$(python_gen_usedep 'python2*')]
- dev-python/reportlab[$(python_gen_usedep 'python*')]
- media-gfx/pydot[$(python_gen_usedep 'python2*')]
- "
-DEPEND="${RDEPEND}
- sys-devel/flex"
-
-DOCS=( CONTRIB DEPRECATED NEWS README Doc/. )
-
-python_test() {
- distutils_install_for_testing
- cp -r "${S}"/{Doc,Tests} "${TEST_DIR}"/lib/ || die
- cd "${TEST_DIR}"/lib/Tests || die
- rm ./test_BioSQL_psycopg2.py ./test_BioSQL_MySQLdb.py ./test_BioSQL_mysql_connector.py || die
- ${PYTHON} run_tests.py --offline --verbose || die
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- dodir /usr/share/${PN}
- cp -r --preserve=mode Scripts Tests "${ED}"/usr/share/${PN} || die
-}
-
-pkg_postinst() {
- elog "For database support you need to install:"
- optfeature "MySQL" dev-python/mysql-python
- optfeature "PostGreSQL" dev-python/psycopg
- echo
- elog "Some applications need extra packages:"
- optfeature "EMBOSS (The European Molecular Biology Open Software Suite)" sci-biology/emboss
-}
diff --git a/sci-biology/biopython/files/biopython-1.65-test-fix-backport.patch b/sci-biology/biopython/files/biopython-1.65-test-fix-backport.patch
deleted file mode 100644
index 2efdef9..00000000
--- a/sci-biology/biopython/files/biopython-1.65-test-fix-backport.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 08c72f8778a87701586a03dffcce33c7589bc6d7 Mon Sep 17 00:00:00 2001
-From: Peter Cock <p.j.a.cock@googlemail.com>
-Date: Sun, 18 Jan 2015 02:07:54 +0000
-Subject: [PATCH] Clearer error message; update failing test.
-
-One of the orchid examples now returns different enough
-results that the test was failing. The new error message
-makes it much easier to pick another positive example to
-add to the the white-list.
----
- Tests/test_NCBI_qblast.py | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/Tests/test_NCBI_qblast.py b/Tests/test_NCBI_qblast.py
-index 88bfe61..19f7b35 100644
---- a/Tests/test_NCBI_qblast.py
-+++ b/Tests/test_NCBI_qblast.py
-@@ -66,7 +66,7 @@ def test_orchid_est(self):
- AGCCATGGATTTCTCAGAAGAAAATGATTATACTTCTTAATCAGGCAACTGATATTATCAATTTATGGCA
- GCAGAGTGGTGGCTCCTTGTCCCAGCAGCAGTAATTACTTTTTTTTCTCTTTTTGTTTCCAAATTAAGAA
- ACATTAGTATCATATGGCTATTTGCTCAATTGCAGATTTCTTTCTTTTGTGAATG""",
-- 0.0000001, None, ["21554275", "18409071", "296087288"])
-+ 0.0000001, None, ["21554275", "18409071", "296087288", "566183510"])
-
- def run_qblast(self, program, database, query, e_value, entrez_filter, expected_hits):
- try:
-@@ -120,9 +120,10 @@ def run_qblast(self, program, database, query, e_value, entrez_filter, expected_
- print("Update this test to have some redundancy...")
- for alignment in record.alignments:
- print(alignment.hit_id)
-- assert found_result, "Missing all of %s in alignments" \
-- % ", ".join(expected_hits)
-- self.assertTrue(found_result)
-+ self.assertTrue(found_result,
-+ "Missing all expected hits (%s), instead have: %s"
-+ % (", ".join(expected_hits),
-+ ", ".join(a.hit_id for a in record.alignments)))
-
- # Check the expected result(s) are found in the descriptions
- if expected_hits is None:
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-biology/biopython/files/, sci-biology/biopython/
@ 2023-07-21 8:55 Pacho Ramos
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2023-07-21 8:55 UTC (permalink / raw
To: gentoo-commits
commit: 7dabbaaa3f7252e981fe1774c858a79c6ee9be0b
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 21 08:53:13 2023 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Jul 21 08:55:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dabbaaa
sci-biology/biopython: use PEP517 build
Also apply Fedora patches to get ready for newer reportlab and python3.12
Closes: https://bugs.gentoo.org/910016
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
sci-biology/biopython/biopython-1.81-r1.ebuild | 59 ++++++++++++++++++++++
.../files/biopython-1.81-python3.12.patch | 11 ++++
.../files/biopython-1.81-reportlab4.patch | 29 +++++++++++
3 files changed, 99 insertions(+)
diff --git a/sci-biology/biopython/biopython-1.81-r1.ebuild b/sci-biology/biopython/biopython-1.81-r1.ebuild
new file mode 100644
index 000000000000..115a4d3b1a4c
--- /dev/null
+++ b/sci-biology/biopython/biopython-1.81-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517="setuptools"
+DISTUTILS_EXT=1
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="Python modules for computational molecular biology"
+HOMEPAGE="https://www.biopython.org/ https://pypi.org/project/biopython/"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ dev-python/networkx[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/rdflib[${PYTHON_USEDEP}]
+ dev-python/pygraphviz[${PYTHON_USEDEP}]
+ >=dev-python/reportlab-3.5.13-r1[${PYTHON_USEDEP}]
+ dev-python/pydot[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/flex"
+
+DOCS=( {CONTRIB,DEPRECATED,NEWS,README}.rst Doc/. )
+
+PATCHES=(
+ "${FILESDIR}/${P}-reportlab4.patch"
+ "${FILESDIR}/${P}-python3.12.patch"
+)
+
+python_test() {
+ cd Tests || die
+ "${EPYTHON}" run_tests.py --offline --verbose || die
+}
+
+python_install_all() {
+ # remove files causing ecompressdir to fail
+ rm Doc/examples/ls_orchid.gbk.{gz,bz2} || die
+
+ distutils-r1_python_install_all
+
+ dodir /usr/share/${PN}
+ cp -r --preserve=mode Scripts Tests "${ED}"/usr/share/${PN} || die
+}
+
+pkg_postinst() {
+ optfeature_header "For database support you need to install:"
+ optfeature "MySQL database support" dev-python/mysqlclient
+ optfeature "PostgreSQL database support" dev-python/psycopg:2
+
+ optfeature_header "Some applications need extra packages:"
+ optfeature "EMBOSS (The European Molecular Biology Open Software Suite)" sci-biology/emboss
+}
diff --git a/sci-biology/biopython/files/biopython-1.81-python3.12.patch b/sci-biology/biopython/files/biopython-1.81-python3.12.patch
new file mode 100644
index 000000000000..8f903a4a39bd
--- /dev/null
+++ b/sci-biology/biopython/files/biopython-1.81-python3.12.patch
@@ -0,0 +1,11 @@
+--- a/Tests/test_Entrez.orig.py 2023-02-13 04:07:42.000000000 +0100
++++ b/Tests/test_Entrez.py 2023-06-30 14:42:58.177365639 +0200
+@@ -126,7 +126,7 @@
+ :type params: dict
+ :param expected: Expected set of IDs, as colleciton of strings.
+ """
+- testcase.assertEquals(len(params["id"]), 1)
++ testcase.assertEqual(len(params["id"]), 1)
+ ids_str = params["id"][0]
+ # Compare up to ordering
+ testcase.assertCountEqual(ids_str.split(","), expected)
diff --git a/sci-biology/biopython/files/biopython-1.81-reportlab4.patch b/sci-biology/biopython/files/biopython-1.81-reportlab4.patch
new file mode 100644
index 000000000000..ef1994553614
--- /dev/null
+++ b/sci-biology/biopython/files/biopython-1.81-reportlab4.patch
@@ -0,0 +1,29 @@
+From 74fdf49ade95157c3c4b23a95831925be4899223 Mon Sep 17 00:00:00 2001
+From: Peter Cock <p.j.a.cock@googlemail.com>
+Date: Mon, 5 Jun 2023 12:39:59 +0100
+Subject: [PATCH] Skip if ReportLab bitmap output module missing
+
+Would like to skip this earlier, but not so
+easy in ReportLab v4 with a choice of backends
+---
+ Tests/test_GraphicsBitmaps.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Tests/test_GraphicsBitmaps.py b/Tests/test_GraphicsBitmaps.py
+index 2ffdfb3dd71..76615a2fd1d 100644
+--- a/Tests/test_GraphicsBitmaps.py
++++ b/Tests/test_GraphicsBitmaps.py
+@@ -111,9 +111,12 @@ def real_test():
+ "Check the fonts needed by ReportLab if you want "
+ "bitmaps from Bio.Graphics\n" + str(err)
+ ) from None
++ elif str(err).startswith("cannot import desired renderPM backend rlPyCairo"):
++ raise MissingExternalDependencyError(
++ "Reportlab module rlPyCairo unavailable\n" + str(err)
++ ) from None
+ else:
+ raise
+-
+ return True
+
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-07-21 8:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-02 22:09 [gentoo-commits] repo/gentoo:master commit in: sci-biology/biopython/files/, sci-biology/biopython/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2023-07-21 8:55 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox