public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Anna Vyalkova" <cyber+gentoo@sysrq.in>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-office/beancount/
Date: Mon, 27 Feb 2023 01:35:59 +0000 (UTC)	[thread overview]
Message-ID: <1677461750.f7dfbeb064b132fbdb4798b786110664bc782929.cybertailor@gentoo> (raw)

commit:     f7dfbeb064b132fbdb4798b786110664bc782929
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Mon Feb 27 00:40:05 2023 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Mon Feb 27 01:35:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f7dfbeb0

app-office/beancount: enable py3.11

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 ...t-2.3.5-r1.ebuild => beancount-2.3.5-r2.ebuild} | 57 +++++++++++++++++++---
 1 file changed, 51 insertions(+), 6 deletions(-)

diff --git a/app-office/beancount/beancount-2.3.5-r1.ebuild b/app-office/beancount/beancount-2.3.5-r2.ebuild
similarity index 61%
rename from app-office/beancount/beancount-2.3.5-r1.ebuild
rename to app-office/beancount/beancount-2.3.5-r2.ebuild
index 296a34055..4612d6706 100644
--- a/app-office/beancount/beancount-2.3.5-r1.ebuild
+++ b/app-office/beancount/beancount-2.3.5-r2.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
 
-inherit distutils-r1
+inherit distutils-r1 toolchain-funcs
 
 DESCRIPTION="A double-entry accounting system that uses text files as input"
 HOMEPAGE="https://beancount.github.io https://github.com/beancount/beancount"
@@ -25,32 +25,73 @@ RDEPEND="
 		dev-python/google-api-python-client[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/ply[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
 		dev-python/python-magic[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 	')
 "
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
 
 EPYTEST_DESELECT=( scripts/setup_test.py )
 
 distutils_enable_tests pytest
 
 src_prepare() {
+	distutils-r1_src_prepare
+
+	# remove test deps from 'install_requires'
+	sed "/pytest/d" -i setup.py || die
+
+	# we'll regenerate C sources
+	rm ${PN}/parser/grammar.{c,h} || die
+	rm ${PN}/parser/lexer.{c,h} || die
+
+	# repair tests
 	sed "/def find_repository_root/a\    return '${S}'" \
 		-i ${PN}/utils/test_utils.py || die
 	sed "s/\[PROGRAM\]/['${EPYTHON}', PROGRAM]/" \
 		-i ${PN}/tools/treeify_test.py || die
 	sed "/DATA_DIR =/c\    DATA_DIR = '${S}/${PN}/utils/file_type_testdata'" \
 		-i ${PN}/utils/file_type_test.py || die
-	distutils-r1_src_prepare
+}
+
+src_configure() {
+	tc-export CC
 }
 
 python_compile() {
 	distutils-r1_python_compile
 
 	# keep in sync with hashsrc.py, otherwise expect test failures
-	cp beancount/parser/{lexer.l,grammar.y,decimal.h,decimal.c,macros.h,parser.h,parser.c,tokens.h} "${BUILD_DIR}"/install$(python_get_sitedir)/${PN}/parser || die
+	local csources=(
+		decimal.{c,h}
+		grammar.y
+		lexer.l
+		macros.h
+		parser.{c,h}
+		tokens.h
+	)
+
+	for file in "${csources[@]}"; do
+		cp ${PN}/parser/${file} "${BUILD_DIR}"/install$(python_get_sitedir)/${PN}/parser || die
+	done
+}
+
+src_compile() {
+	local mymakeflags=(
+		PYCONFIG="$(python_get_PYTHON_CONFIG)"
+	)
+
+	emake "${mymakeflags[@]}" ${PN}/parser/grammar.c
+	emake "${mymakeflags[@]}" ${PN}/parser/lexer.c
+
+	distutils-r1_src_compile
+
+	use test && \
+		emake "${mymakeflags[@]}" ${PN}/parser/tokens_test
 }
 
 python_test(){
@@ -59,6 +100,10 @@ python_test(){
 }
 
 src_test() {
-	emake ctest
+	local mymakeflags=(
+		PYCONFIG="$(python_get_PYTHON_CONFIG)"
+	)
+
+	emake "${mymakeflags[@]}" ctest
 	distutils-r1_src_test
 }


             reply	other threads:[~2023-02-27  1:36 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-27  1:35 Anna Vyalkova [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-05-15 17:00 [gentoo-commits] repo/proj/guru:master commit in: app-office/beancount/ Julien Roy
2024-05-15 16:55 ` [gentoo-commits] repo/proj/guru:dev " Julien Roy
2024-05-15 17:00 [gentoo-commits] repo/proj/guru:master " Julien Roy
2024-05-15 16:55 ` [gentoo-commits] repo/proj/guru:dev " Julien Roy
2023-01-13  3:14 Julien Roy
2022-06-05 10:19 Anna Vyalkova
2021-01-05  0:22 Wolfgang E. Sanyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1677461750.f7dfbeb064b132fbdb4798b786110664bc782929.cybertailor@gentoo \
    --to=cyber+gentoo@sysrq.in \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox