commit:     5f9c1a098641946616ce635f61aaf24c0e2cfd48
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon Jan  4 11:57:25 2021 +0000
Commit:     Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Tue Jan  5 07:38:41 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=5f9c1a09

dev-python/astroquery: bump py targets, add keywords

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
Closes: https://github.com/gentoo/sci/pull/1034

 dev-python/astroquery/astroquery-0.4.1.ebuild | 45 ++++++++++++++++++
 dev-python/astroquery/astroquery-9999.ebuild  | 68 ---------------------------
 2 files changed, 45 insertions(+), 68 deletions(-)

diff --git a/dev-python/astroquery/astroquery-0.4.1.ebuild 
b/dev-python/astroquery/astroquery-0.4.1.ebuild
new file mode 100644
index 000000000..370eeb1a2
--- /dev/null
+++ b/dev-python/astroquery/astroquery-0.4.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of packages to access online astronomical resources"
+HOMEPAGE="https://www.astropy.org/astroquery/";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+#TODO: Package all these pytest deps:
+#      pytest-doctestplus>=0.2.0
+#      pytest-remotedata>=0.3.1
+#      pytest-openfiles>=0.3.1
+#      pytest-astropy-header>=0.1.2
+#      pytest-arraydiff>=0.1
+#      pytest-filter-subpackage>=0.1
+RESTRICT="test"
+
+RDEPEND="
+       >=dev-python/astropy-0.2[${PYTHON_USEDEP}]
+       dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+       dev-python/html5lib[${PYTHON_USEDEP}]
+       dev-python/keyring[${PYTHON_USEDEP}]
+       dev-python/numpy[${PYTHON_USEDEP}]
+       dev-python/requests[${PYTHON_USEDEP}]
+       dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+       dev-python/photutils[${PYTHON_USEDEP}]
+       dev-python/scipy[${PYTHON_USEDEP}]
+)"
+
+# TODO: Fix this
+# NameError: name 'disabled_intersphinx_mapping' is not defined
+#distutils_enable_sphinx docs dev-python/sphinx-astropy
+distutils_enable_tests pytest

diff --git a/dev-python/astroquery/astroquery-9999.ebuild 
b/dev-python/astroquery/astroquery-9999.ebuild
deleted file mode 100644
index e4afe9319..000000000
--- a/dev-python/astroquery/astroquery-9999.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-inherit distutils-r1
-
-MY_PV=${PV/_/-}
-
-if [ ${PV} == "9999" ] ; then
-       inherit git-r3
-       EGIT_REPO_URI="https://github.com/astropy/${PN}.git";
-else
-       SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-       KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="A collection of packages to access online astronomical resources"
-HOMEPAGE="https://github.com/astropy/astroquery";
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc"
-DOCS=( README.rst )
-
-RDEPEND="
-       >=dev-python/astropy-0.2[${PYTHON_USEDEP}]
-       dev-python/astropy-helpers[${PYTHON_USEDEP}]
-       dev-python/requests[${PYTHON_USEDEP}]
-       dev-python/numpy[${PYTHON_USEDEP}]
-       dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-       dev-python/html5lib[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-python_prepare_all() {
-       distutils-r1_python_prepare_all
-       sed -e '/import ah_bootstrap/d' -i setup.py || die "Removing 
ah_bootstrap failed"
-}
-
-python_test() {
-       distutils_install_for_testing
-       cd "${TEST_DIR}" || die
-       "${EPYTHON}" -c "import astroquery, sys;r = 
astroquery.test();sys.exit(r)" \
-               || die "tests fail with ${EPYTHON}"
-}
-
-python_compile_all() {
-       if use doc; then
-               python_export_best
-               VARTEXFONTS="${T}"/fonts \
-                       MPLCONFIGDIR="${BUILD_DIR}" \
-                       PYTHONPATH="${BUILD_DIR}"/lib \
-                       esetup.py build_sphinx
-       fi
-}
-
-python_install_all() {
-       use doc && local HTML_DOCS=( docs/_build/html/. )
-       distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-       elog "To use the ESO archive web service, dev-python/keyring"
-       elog "must be installed."
-}

Reply via email to