public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andrew Ammerlaan" <andrewammerlaan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/mlpack/
Date: Sat, 15 Jan 2022 14:10:12 +0000 (UTC)	[thread overview]
Message-ID: <1642255686.06d640095ed4f74e145512a50b270db1278a0811.andrewammerlaan@gentoo> (raw)

commit:     06d640095ed4f74e145512a50b270db1278a0811
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 15 14:08:06 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Jan 15 14:08:06 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=06d64009

sci-libs/mlpack: fix pytest-runner error

Closes: https://github.com/gentoo/sci/issues/1086
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-libs/mlpack/mlpack-3.4.2.ebuild | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/sci-libs/mlpack/mlpack-3.4.2.ebuild b/sci-libs/mlpack/mlpack-3.4.2.ebuild
index d03dd9ab1..bfc7231e1 100644
--- a/sci-libs/mlpack/mlpack-3.4.2.ebuild
+++ b/sci-libs/mlpack/mlpack-3.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,10 +34,10 @@ RDEPEND="
 	$(python_gen_cond_dep '
 		dev-libs/boost[${PYTHON_USEDEP}]
 		dev-libs/libxml2[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/cython[${PYTHON_USEDEP}]
 	')
-	dev-python/pandas
-	dev-python/cython
-	dev-python/numpy
 	dev-libs/stb
 	>=sci-libs/armadillo-8.4.0[arpack,blas,lapack]
 	sci-libs/ensmallen
@@ -51,6 +51,9 @@ BDEPEND="
 		app-doc/doxygen
 		dev-libs/mathjax
 	)
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_USEDEP}]
+	')
 	test? ( $( python_gen_cond_dep '
 		dev-python/pytest[${PYTHON_USEDEP}]
 		')
@@ -75,6 +78,9 @@ src_prepare() {
 		-e "s:share/doc/mlpack:share/doc/${PF}:" \
 		-e 's/-O3//g' \
 		CMakeLists.txt || die
+	# drop dep on pytest-runner
+	sed -i -e "/setup_requires/d" \
+		src/mlpack/bindings/python/setup.py.in || die
 	cmake_src_prepare
 }
 


             reply	other threads:[~2022-01-15 14:10 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-15 14:10 Andrew Ammerlaan [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-12-16 10:57 [gentoo-commits] proj/sci:master commit in: sci-libs/mlpack/ Andrew Ammerlaan
2021-06-01  9:24 Andrew Ammerlaan
2021-01-13 21:06 Andrew Ammerlaan
2020-10-30 14:51 Aisha Tammy
2014-12-16 23:01 Christoph Junghans
2014-09-16 17:01 Christoph Junghans
2014-02-10  4:14 Sebastien Fabbro
2013-07-03 16:22 Sebastien Fabbro
2013-05-25  4:40 Sebastien Fabbro
2013-02-25  2:38 Sebastien Fabbro

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=1642255686.06d640095ed4f74e145512a50b270db1278a0811.andrewammerlaan@gentoo \
    --to=andrewammerlaan@gentoo.org \
    --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