Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
aboutsummaryrefslogtreecommitdiff
path: root/dev-python/bokeh
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python/bokeh')
-rw-r--r--dev-python/bokeh/Manifest11
-rw-r--r--dev-python/bokeh/bokeh-2.2.1-r1.ebuild85
-rw-r--r--dev-python/bokeh/bokeh-2.2.2-r1.ebuild85
-rw-r--r--dev-python/bokeh/bokeh-2.2.3.ebuild85
-rw-r--r--dev-python/bokeh/bokeh-2.3.0.ebuild85
-rw-r--r--dev-python/bokeh/bokeh-2.3.2.ebuild85
-rw-r--r--dev-python/bokeh/bokeh-2.4.2.ebuild (renamed from dev-python/bokeh/bokeh-2.3.1.ebuild)39
-rw-r--r--dev-python/bokeh/files/bokeh-2.2.1-conftest_py.patch56
8 files changed, 18 insertions, 513 deletions
diff --git a/dev-python/bokeh/Manifest b/dev-python/bokeh/Manifest
index 1a38ac66c..54357f721 100644
--- a/dev-python/bokeh/Manifest
+++ b/dev-python/bokeh/Manifest
@@ -1,9 +1,2 @@
-DIST bokeh-2.2.1.tar.gz 8845855 BLAKE2B 54846c4033a57677a197ee736266993401e00da791b0b2202e2d1683cb044d26f0ab958340f3ed2603bc78100e30b09aa7e569fff26eb235ebcb53beb7720b3a SHA512 8f58196468750f8fa24b4a8165ecb1407e61cfe207f1e0c82f0efc83d7b41f1db73ae56363e52bccc3b1f1cb9cc93f1a3ab40af0bb4b981e8b241c4c19c7b900
-DIST bokeh-2.2.2.tar.gz 8847568 BLAKE2B b279e72106ec7771fbdad6709d529e5b5e23152eae6feeae2b5cddceeba1d9db5def6c1f99cb884739536b2ecbe33060531a229f8838bcf4fa69aadf42053619 SHA512 5a53a11e3252dd904c5a436733f520251b7990bf2f112315cd5c76f0d26a6733888a36f73954c3339647981971400fc815710a3a9a753db4c9cdf10c5e2a1643
-DIST bokeh-2.2.3.tar.gz 8848373 BLAKE2B 4bae1e729980bced589c256213df22cabc08b8105113698b0e5eefd37760506a625212931dcafb8c00f1a2fce1b77a48b4802ede4a3f09c73f09b8dbe39a1a81 SHA512 7d7cf6b4207644894c8a358e235f2901f65b453f3324c1b766ddca67b287e13e82df67c193ba87123d5b3b855f7ba29c01e2113fb787dd60c39bef6ba7c95aba
-DIST bokeh-2.3.0.tar.gz 10617724 BLAKE2B ee20260b17a9d2fd13df0dab92d317b0c3a1709945e85bd0697f66d9d4363422fbb3efc29f0b402d5c8f7fab1e2f9d6903bc4da7951af88a7cf101ae85c1a535 SHA512 9e584810ffd1cc66b2c97ffbd527cb0fe4a7c63dd0cc9ddae29beae167db9c4333c2323928a91117ac226e401997dd2b2d6f8968c0618c3b40c70c6bac334c95
-DIST bokeh-2.3.1.tar.gz 10627152 BLAKE2B 30833fb83eae60bc6b92faa3128cce8a9f2bab84179d1565acf9f08b35c39540a2a6cc2a70a5f611d2a6aeede4ce6328851ac11261fab0a491976e570456c3a8 SHA512 fd9f03ae267b4cae5cc6fdae2217ef67c27bc297c00e59971bdc8ae53389a15ea80005ed7547b4761836070e53bdbc4ec2038fc0e7624788254d8bc311b765df
-DIST bokeh-2.3.2.tar.gz 10662248 BLAKE2B c289ae8d1fddd470d838d0afe8eae46d62755c8986af79784df08af4c839129f039deca85ad5dbfedcb97163a7f630063859aeaa25e0e9a7c0c65839d2b9acee SHA512 58321d318ad69a1caee130870c5e31e59bab3c99faf070a752ee9cd506400de2007f17363930fad86af5014fb42fd80b9e9bef109c5da8d8bd83edd8d3ca3aa9
-DIST conftest-bokeh-2.3.0.py 1749 BLAKE2B 60b24d84e606d06c6913ddd6cac0ddf5aecc9989b3d87c896ef554da30968e9762224e32d63cc6f5c405a279608c92153e182e4e611bd635f5d307618597469c SHA512 e352b34da8156fd9764c483a01e3979f6e44c82163cd40fef471382f23566f824e09d3ef579e7d279a546e58fc26fa169afdd6ba74a21ab79c71bb173a1c5a5b
-DIST conftest-bokeh-2.3.1.py 1749 BLAKE2B 60b24d84e606d06c6913ddd6cac0ddf5aecc9989b3d87c896ef554da30968e9762224e32d63cc6f5c405a279608c92153e182e4e611bd635f5d307618597469c SHA512 e352b34da8156fd9764c483a01e3979f6e44c82163cd40fef471382f23566f824e09d3ef579e7d279a546e58fc26fa169afdd6ba74a21ab79c71bb173a1c5a5b
-DIST conftest-bokeh-2.3.2.py 1749 BLAKE2B 60b24d84e606d06c6913ddd6cac0ddf5aecc9989b3d87c896ef554da30968e9762224e32d63cc6f5c405a279608c92153e182e4e611bd635f5d307618597469c SHA512 e352b34da8156fd9764c483a01e3979f6e44c82163cd40fef471382f23566f824e09d3ef579e7d279a546e58fc26fa169afdd6ba74a21ab79c71bb173a1c5a5b
+DIST bokeh-2.4.2.tar.gz 17693785 BLAKE2B 295f79032ded6c63b16a1a95fe81e9850e21a5b1962786b8c99836789d4d267eb9bd51cc3b27b01c03944eb481493f61e6925d4c86a4cef67da7f18afd394de3 SHA512 d1939c095f6109d54060f6963dcbe3ff38c5132ac47d8c468b36a78f894454812838a40ae208af2f9723b02d46ae6eb3d77080ca1b19d8153eb73b89afda6864
+DIST conftest-bokeh-2.4.2.py 1788 BLAKE2B f50dd660a1a55338de345db246d493d4f6d8aad339dbe3dee48921575bfe65c0ecf018e759cca095b28b91423833506137e3d6b16a80a954f09ef953c3db495a SHA512 2b76430f09f39282e2e421c3de7f2a1a9bf2968930b729397374c61c2c6c70aa24e34e5d3a0269e8665bd8909642dc32465579e16802f583b3c17f381a7b8768
diff --git a/dev-python/bokeh/bokeh-2.2.1-r1.ebuild b/dev-python/bokeh/bokeh-2.2.1-r1.ebuild
deleted file mode 100644
index 8381bfbdd..000000000
--- a/dev-python/bokeh/bokeh-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# upstream hasn't tested python 3.8 fully
-PYTHON_COMPAT=( python3_{6..8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Statistical and interactive HTML plots for Python"
-HOMEPAGE="https://bokeh.org/
- https://github.com/bokeh/bokeh
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# upstream authoritative dependencies
-# https://github.com/bokeh/bokeh/blob/master/conda.recipe/meta.yaml
-RDEPEND="
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- >=www-servers/tornado-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- dev-python/ipython_genutils[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/networkx[${PYTHON_USEDEP}]
- dev-python/nbconvert[${PYTHON_USEDEP}]
- dev-python/nbformat[${PYTHON_USEDEP}]
- dev-python/pydot[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]
- dev-python/selenium[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.2.1-conftest_py.patch
-)
-
-python_test() {
- # disable tests having network calls
- local SKIP_TESTS=" \
- not (test___init__ and TestWarnings and test_filters) and \
- not (test_json__subcommands and test_no_script) and \
- not (test_standalone and Test_autoload_static) and \
- not test_nodejs_compile_javascript and \
- not test_nodejs_compile_less and \
- not test_inline_extension and \
- not (test_model and test_select) and \
- not test_tornado__server and \
- not test_client_server and \
- not test_webdriver and \
- not test_export and \
- not test_server and \
- not test_bundle and \
- not test_ext \
- "
- pytest -m "not sampledata" tests/unit -k \
- "${SKIP_TESTS}" -vv || die "unittests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
- optfeature "integration with amazon S3" dev-python/boto
- optfeature "pypi integration to publish packages" dev-python/twine
- optfeature "js library usage" net-libs/nodejs
-}
diff --git a/dev-python/bokeh/bokeh-2.2.2-r1.ebuild b/dev-python/bokeh/bokeh-2.2.2-r1.ebuild
deleted file mode 100644
index 8381bfbdd..000000000
--- a/dev-python/bokeh/bokeh-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# upstream hasn't tested python 3.8 fully
-PYTHON_COMPAT=( python3_{6..8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Statistical and interactive HTML plots for Python"
-HOMEPAGE="https://bokeh.org/
- https://github.com/bokeh/bokeh
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# upstream authoritative dependencies
-# https://github.com/bokeh/bokeh/blob/master/conda.recipe/meta.yaml
-RDEPEND="
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- >=www-servers/tornado-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- dev-python/ipython_genutils[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/networkx[${PYTHON_USEDEP}]
- dev-python/nbconvert[${PYTHON_USEDEP}]
- dev-python/nbformat[${PYTHON_USEDEP}]
- dev-python/pydot[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]
- dev-python/selenium[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.2.1-conftest_py.patch
-)
-
-python_test() {
- # disable tests having network calls
- local SKIP_TESTS=" \
- not (test___init__ and TestWarnings and test_filters) and \
- not (test_json__subcommands and test_no_script) and \
- not (test_standalone and Test_autoload_static) and \
- not test_nodejs_compile_javascript and \
- not test_nodejs_compile_less and \
- not test_inline_extension and \
- not (test_model and test_select) and \
- not test_tornado__server and \
- not test_client_server and \
- not test_webdriver and \
- not test_export and \
- not test_server and \
- not test_bundle and \
- not test_ext \
- "
- pytest -m "not sampledata" tests/unit -k \
- "${SKIP_TESTS}" -vv || die "unittests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
- optfeature "integration with amazon S3" dev-python/boto
- optfeature "pypi integration to publish packages" dev-python/twine
- optfeature "js library usage" net-libs/nodejs
-}
diff --git a/dev-python/bokeh/bokeh-2.2.3.ebuild b/dev-python/bokeh/bokeh-2.2.3.ebuild
deleted file mode 100644
index 8381bfbdd..000000000
--- a/dev-python/bokeh/bokeh-2.2.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# upstream hasn't tested python 3.8 fully
-PYTHON_COMPAT=( python3_{6..8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Statistical and interactive HTML plots for Python"
-HOMEPAGE="https://bokeh.org/
- https://github.com/bokeh/bokeh
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# upstream authoritative dependencies
-# https://github.com/bokeh/bokeh/blob/master/conda.recipe/meta.yaml
-RDEPEND="
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- >=www-servers/tornado-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- dev-python/ipython_genutils[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/networkx[${PYTHON_USEDEP}]
- dev-python/nbconvert[${PYTHON_USEDEP}]
- dev-python/nbformat[${PYTHON_USEDEP}]
- dev-python/pydot[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]
- dev-python/selenium[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.2.1-conftest_py.patch
-)
-
-python_test() {
- # disable tests having network calls
- local SKIP_TESTS=" \
- not (test___init__ and TestWarnings and test_filters) and \
- not (test_json__subcommands and test_no_script) and \
- not (test_standalone and Test_autoload_static) and \
- not test_nodejs_compile_javascript and \
- not test_nodejs_compile_less and \
- not test_inline_extension and \
- not (test_model and test_select) and \
- not test_tornado__server and \
- not test_client_server and \
- not test_webdriver and \
- not test_export and \
- not test_server and \
- not test_bundle and \
- not test_ext \
- "
- pytest -m "not sampledata" tests/unit -k \
- "${SKIP_TESTS}" -vv || die "unittests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
- optfeature "integration with amazon S3" dev-python/boto
- optfeature "pypi integration to publish packages" dev-python/twine
- optfeature "js library usage" net-libs/nodejs
-}
diff --git a/dev-python/bokeh/bokeh-2.3.0.ebuild b/dev-python/bokeh/bokeh-2.3.0.ebuild
deleted file mode 100644
index 8c00f2092..000000000
--- a/dev-python/bokeh/bokeh-2.3.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Statistical and interactive HTML plots for Python"
-HOMEPAGE="https://bokeh.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
- https://raw.githubusercontent.com/bokeh/bokeh/${PV}/conftest.py -> conftest-${P}.py
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# upstream authoritative dependencies
-# https://github.com/bokeh/bokeh/blob/master/conda.recipe/meta.yaml
-RDEPEND="
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- >=www-servers/tornado-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- dev-python/ipython_genutils[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/networkx[${PYTHON_USEDEP}]
- dev-python/nbconvert[${PYTHON_USEDEP}]
- dev-python/nbformat[${PYTHON_USEDEP}]
- dev-python/pydot[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]
- dev-python/selenium[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all(){
- cp "${DISTDIR}"/conftest-${P}.py "${S}"/conftest.py || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- # disable tests having network calls
- local SKIP_TESTS=" \
- not (test___init__ and TestWarnings and test_filters) and \
- not (test_json__subcommands and test_no_script) and \
- not (test_standalone and Test_autoload_static) and \
- not test_nodejs_compile_javascript and \
- not test_nodejs_compile_less and \
- not test_inline_extension and \
- not (test_model and test_select) and \
- not test_tornado__server and \
- not test_client_server and \
- not test_webdriver and \
- not test_export and \
- not test_server and \
- not test_bundle and \
- not test_ext \
- "
- pytest -m "not sampledata" tests/unit -k \
- "${SKIP_TESTS}" -vv || die "unittests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
- optfeature "integration with amazon S3" dev-python/boto
- optfeature "pypi integration to publish packages" dev-python/twine
- optfeature "js library usage" net-libs/nodejs
-}
diff --git a/dev-python/bokeh/bokeh-2.3.2.ebuild b/dev-python/bokeh/bokeh-2.3.2.ebuild
deleted file mode 100644
index 8c00f2092..000000000
--- a/dev-python/bokeh/bokeh-2.3.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Statistical and interactive HTML plots for Python"
-HOMEPAGE="https://bokeh.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
- https://raw.githubusercontent.com/bokeh/bokeh/${PV}/conftest.py -> conftest-${P}.py
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# upstream authoritative dependencies
-# https://github.com/bokeh/bokeh/blob/master/conda.recipe/meta.yaml
-RDEPEND="
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- >=www-servers/tornado-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- dev-python/ipython_genutils[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/networkx[${PYTHON_USEDEP}]
- dev-python/nbconvert[${PYTHON_USEDEP}]
- dev-python/nbformat[${PYTHON_USEDEP}]
- dev-python/pydot[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]
- dev-python/selenium[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all(){
- cp "${DISTDIR}"/conftest-${P}.py "${S}"/conftest.py || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- # disable tests having network calls
- local SKIP_TESTS=" \
- not (test___init__ and TestWarnings and test_filters) and \
- not (test_json__subcommands and test_no_script) and \
- not (test_standalone and Test_autoload_static) and \
- not test_nodejs_compile_javascript and \
- not test_nodejs_compile_less and \
- not test_inline_extension and \
- not (test_model and test_select) and \
- not test_tornado__server and \
- not test_client_server and \
- not test_webdriver and \
- not test_export and \
- not test_server and \
- not test_bundle and \
- not test_ext \
- "
- pytest -m "not sampledata" tests/unit -k \
- "${SKIP_TESTS}" -vv || die "unittests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
- optfeature "integration with amazon S3" dev-python/boto
- optfeature "pypi integration to publish packages" dev-python/twine
- optfeature "js library usage" net-libs/nodejs
-}
diff --git a/dev-python/bokeh/bokeh-2.3.1.ebuild b/dev-python/bokeh/bokeh-2.4.2.ebuild
index 8c00f2092..7347e5110 100644
--- a/dev-python/bokeh/bokeh-2.3.1.ebuild
+++ b/dev-python/bokeh/bokeh-2.4.2.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 optfeature pypi
DESCRIPTION="Statistical and interactive HTML plots for Python"
HOMEPAGE="https://bokeh.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+SRC_URI+="
https://raw.githubusercontent.com/bokeh/bokeh/${PV}/conftest.py -> conftest-${P}.py
"
@@ -18,20 +17,14 @@ LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-# upstream authoritative dependencies
-# https://github.com/bokeh/bokeh/blob/master/conda.recipe/meta.yaml
RDEPEND="
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- >=www-servers/tornado-5[${PYTHON_USEDEP}]
+ >=dev-python/jinja-2.9[${PYTHON_USEDEP}]
+ >=dev-python/numpy-1.11.3[${PYTHON_USEDEP}]
+ >=dev-python/packaging-16.8[${PYTHON_USEDEP}]
+ >=dev-python/pillow-7.1.0[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+ >=dev-python/typing-extensions-3.10.0[${PYTHON_USEDEP}]
+ >=dev-python/tornado-5.1[${PYTHON_USEDEP}]
"
BDEPEND="
test? (
@@ -72,10 +65,10 @@ python_test() {
not test_export and \
not test_server and \
not test_bundle and \
- not test_ext \
+ not test_ext and \
+ not test_detect_current_filename \
"
- pytest -m "not sampledata" tests/unit -k \
- "${SKIP_TESTS}" -vv || die "unittests fail with ${EPYTHON}"
+ epytest -m "not sampledata" tests/unit -k "${SKIP_TESTS}"
}
pkg_postinst() {
diff --git a/dev-python/bokeh/files/bokeh-2.2.1-conftest_py.patch b/dev-python/bokeh/files/bokeh-2.2.1-conftest_py.patch
deleted file mode 100644
index 5dfb43c8e..000000000
--- a/dev-python/bokeh/files/bokeh-2.2.1-conftest_py.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/conftest.py b/conftest.py
-new file mode 100644
-index 0000000..795da89
---- /dev/null
-+++ b/conftest.py
-@@ -0,0 +1,50 @@
-+#-----------------------------------------------------------------------------
-+# Copyright (c) 2012 - 2020, Anaconda, Inc., and Bokeh Contributors.
-+# All rights reserved.
-+#
-+# The full license is in the file LICENSE.txt, distributed with this software.
-+#-----------------------------------------------------------------------------
-+
-+pytest_plugins = (
-+ "bokeh._testing.plugins.ipython",
-+ "bokeh._testing.plugins.managed_server_loop",
-+ "bokeh._testing.plugins.pandas",
-+)
-+
-+# Standard library imports
-+from inspect import iscoroutinefunction
-+from typing import List
-+
-+# External imports
-+import _pytest
-+import pytest
-+
-+
-+def pytest_collection_modifyitems(items: List[_pytest.nodes.Item]) -> None:
-+ for item in items:
-+ if iscoroutinefunction(item.obj):
-+ item.add_marker(pytest.mark.asyncio)
-+
-+# Unfortunately these seem to all need to be centrally defined at the top level
-+def pytest_addoption(parser: _pytest.config.argparsing.Parser) -> None:
-+
-+ # plugins/selenium
-+ parser.addoption(
-+ "--driver", choices=('chrome', 'firefox', 'safari'), default='chrome', help='webdriver implementation')
-+
-+ # plugins/bokeh_server
-+ parser.addoption(
-+ "--bokeh-port", dest="bokeh_port", type=int, default=5006, help="port on which Bokeh server resides"
-+ )
-+
-+ # plugins/jupyter_notebook
-+ parser.addoption(
-+ "--notebook-port", type=int, default=6007, help="port on which Jupyter Notebook server resides"
-+ )
-+
-+ parser.addoption(
-+ "--examples-log-file", dest="log_file", metavar="path", action="store", default='examples.log', help="where to write the complete log"
-+ )
-+ parser.addoption(
-+ "--no-js", action="store_true", default=False,
-+ help="only run python code and skip js")