From 79851ef7da5ffce7aed667c8c49a1ce04333619e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Apr 2025 08:45:29 +0100 Subject: gentoo auto-resync : 16:04:2025 - 08:45:29 --- dev-python/plotly/Manifest | 5 +- .../plotly/files/plotly-5.23.0-numpy-2.patch | 87 --------------- dev-python/plotly/plotly-5.24.1.ebuild | 119 --------------------- dev-python/plotly/plotly-6.0.1.ebuild | 2 +- 4 files changed, 2 insertions(+), 211 deletions(-) delete mode 100644 dev-python/plotly/files/plotly-5.23.0-numpy-2.patch delete mode 100644 dev-python/plotly/plotly-5.24.1.ebuild (limited to 'dev-python/plotly') diff --git a/dev-python/plotly/Manifest b/dev-python/plotly/Manifest index 2a7d6dbc4e69..aee41ecdba5e 100644 --- a/dev-python/plotly/Manifest +++ b/dev-python/plotly/Manifest @@ -1,6 +1,3 @@ -AUX plotly-5.23.0-numpy-2.patch 3564 BLAKE2B c45b31eaf9a6621780ef8a85b6aed4190bcb26c950554c2bf9c2e8bcf8c158952dfb917b8625bbd61a2a1837a871e9d8a3ae37b387c9408ceeaa655384b11e98 SHA512 deb96bdf408c58edfdba724708e527653939d353ecdeee1b9a8494eee313dc3a2ac21680349b20738b58744fafbaa2e5ac3dde2b6150ed4a1e61407a9222ea4b -DIST plotly.py-5.24.1.gh.tar.gz 32096988 BLAKE2B 79c1f3350bb43780f5f5f2f54955591875c2819a4b819e667e8df14ae72e42cf2939167a3425bd725e80af8823c8578a9cf286f4e4d82881578ca13f7e1cd860 SHA512 dc1484f5b0630bd4d936ab23231be7a577b887701f1f3c33d8f6501dc65718d871bee7af9f467fe130d2e7dcdded22717562352ce4ec70d25bc368faeb51d0e8 DIST plotly.py-6.0.1.gh.tar.gz 7619570 BLAKE2B 6c88b24d15aa233e1d3871975d224bd9829f1726beba665bc68a2d1af293361774b10a9d4a95ce2c5c53afe7ac01f7770809fbfbab3733ff31531233905c97f1 SHA512 192d5ea5e5d75548d9fbacc36d419b695d5e976ab0e2e538b1453c89ba3b1b0494abc4631d0d631cd6fe60a74b4a67937173564f9661aa408ffc1fc0bfac2559 -EBUILD plotly-5.24.1.ebuild 3312 BLAKE2B f1af97627771591ddd9cf23dfbb302bc4afa1eb37d389f7850242e411829e1df2bc304fa58507b3cdd1a65b668eb72f547ff02b0c032679793b843319ee01db0 SHA512 8d02865e8505ca4dab0d3316d4a3ca637f68b3ae9fd277bf17bcb650112c5b51958d85199dfd6d56b8805132fe12e05c46877eea7bba0138f76a056af087d229 -EBUILD plotly-6.0.1.ebuild 3452 BLAKE2B 92d823401ee296a65a236007f4e7c54d8a8ec6a7e9034d0fc2c16cee1c5a8bc6fc61ab91a7a72afdcd203bf04bf97d39a2d98d347ed1dbec9baa24ae2ff0c008 SHA512 e28f496276ba88323982c7f443101e983894a0ba8245b1b0b6330abcc0937e2a84e8cd9b81fa4f511560fcb5f1dd07cfd9e848198c15a16964abe6f5c991f4ca +EBUILD plotly-6.0.1.ebuild 3459 BLAKE2B c770eda3fee00c5c0498e7c7f2034069f25627b5dc4b81caafba3a3bc1a6a7594d3846796bd6aabccec5785891891a4ac9286612330f005fbcb56406f310f5ff SHA512 28c7c4ad1db06a70f18a1a36270c21e37fda201441a7fa4cf1b33f2f8e3fd58d0a4b8e8c5314fadf8a7745c519911ec7f4f85f1b2d37c638e2c9c25737795b0b MISC metadata.xml 627 BLAKE2B 453adb04f4caba9790fe5223635245c8bca7ca5c6dc1930f09537045580b88b5fa1649e47158b13be6cc5cb09b4479a47690e37ef13208b47a95f82d14793a91 SHA512 a5183e9d217d1312e8d383ccb4ade66b92575492b6c8ed8987e3af18e9e456836b62b2d572ce62f9e01aae47b4a2bcbd12f79b4bb6acabfe69c2b63b20315bd3 diff --git a/dev-python/plotly/files/plotly-5.23.0-numpy-2.patch b/dev-python/plotly/files/plotly-5.23.0-numpy-2.patch deleted file mode 100644 index 6941369978e8..000000000000 --- a/dev-python/plotly/files/plotly-5.23.0-numpy-2.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 99df182e9171e9b9e81811447f37ace05acc9272 Mon Sep 17 00:00:00 2001 -From: Ben Greiner -Date: Sun, 2 Jun 2024 16:43:06 +0200 -Subject: [PATCH 1/3] Remove np.nan and np.inf aliases no longer present in - numpy2 - ---- - .../tests/test_optional/test_utils/test_utils.py | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/plotly/tests/test_optional/test_utils/test_utils.py b/plotly/tests/test_optional/test_utils/test_utils.py -index cf32e1bdff..d7d982e635 100644 ---- a/plotly/tests/test_optional/test_utils/test_utils.py -+++ b/plotly/tests/test_optional/test_utils/test_utils.py -@@ -34,7 +34,7 @@ - - ## JSON encoding - numeric_list = [1, 2, 3] --np_list = np.array([1, 2, 3, np.NaN, np.NAN, np.Inf, dt(2014, 1, 5)]) -+np_list = np.array([1, 2, 3, np.nan, np.inf, dt(2014, 1, 5)]) - mixed_list = [ - 1, - "A", -@@ -45,7 +45,7 @@ - dt_list = [dt(2014, 1, 5), dt(2014, 1, 5, 1, 1, 1), dt(2014, 1, 5, 1, 1, 1, 1)] - - df = pd.DataFrame( -- columns=["col 1"], data=[1, 2, 3, dt(2014, 1, 5), pd.NaT, np.NaN, np.Inf] -+ columns=["col 1"], data=[1, 2, 3, dt(2014, 1, 5), pd.NaT, np.nan, np.inf] - ) - - rng = pd.date_range("1/1/2011", periods=2, freq="H") -@@ -184,7 +184,7 @@ def test_figure_json_encoding(self): - - assert ( - js1 == '{"type": "scatter3d", "x": [1, 2, 3], ' -- '"y": [1, 2, 3, null, null, null, "2014-01-05T00:00:00"], ' -+ '"y": [1, 2, 3, null, null, "2014-01-05T00:00:00"], ' - '"z": [1, "A", "2014-01-05T00:00:00", ' - '"2014-01-05T01:01:01", "2014-01-05T01:01:01.000001"]}' - ) -@@ -195,9 +195,9 @@ def test_figure_json_encoding(self): - _json.dumps(figure, cls=utils.PlotlyJSONEncoder, sort_keys=True) - - # Test data wasn't mutated -- np_array = np.array([1, 2, 3, np.NaN, np.NAN, np.Inf, dt(2014, 1, 5)]) -+ np_array = np.array([1, 2, 3, np.nan, np.inf, dt(2014, 1, 5)]) - for k in range(len(np_array)): -- if k in [3, 4]: -+ if k == 3: - # check NaN - assert np.isnan(np_list[k]) and np.isnan(np_array[k]) - else: -@@ -237,7 +237,7 @@ def test_pandas_json_encoding(self): - # Test that data wasn't mutated - assert_series_equal( - df["col 1"], -- pd.Series([1, 2, 3, dt(2014, 1, 5), pd.NaT, np.NaN, np.Inf], name="col 1"), -+ pd.Series([1, 2, 3, dt(2014, 1, 5), pd.NaT, np.nan, np.inf], name="col 1"), - ) - - j2 = _json.dumps(df.index, cls=utils.PlotlyJSONEncoder) - -From 23b50d9df805349674e11949459976fb338b3d76 Mon Sep 17 00:00:00 2001 -From: Ben Greiner -Date: Sun, 2 Jun 2024 16:48:34 +0200 -Subject: [PATCH 2/3] Avoid putting 255 into int8 due to new numpy 2 type - promotion rules - ---- - .../plotly/plotly/tests/test_optional/test_px/test_imshow.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plotly/tests/test_optional/test_px/test_imshow.py b/plotly/tests/test_optional/test_px/test_imshow.py -index c2e863c846..d8f9ad98c7 100644 ---- a/plotly/tests/test_optional/test_px/test_imshow.py -+++ b/plotly/tests/test_optional/test_px/test_imshow.py -@@ -341,7 +341,7 @@ def test_imshow_source_dtype_zmax(dtype, contrast_rescaling): - assert ( - np.abs( - np.max(decode_image_string(fig.data[0].source)) -- - 255 * img.max() / np.iinfo(dtype).max -+ - np.int64(255) * img.max() / np.iinfo(dtype).max - ) - < 1 - ) - diff --git a/dev-python/plotly/plotly-5.24.1.ebuild b/dev-python/plotly/plotly-5.24.1.ebuild deleted file mode 100644 index 1c80d1f50eae..000000000000 --- a/dev-python/plotly/plotly-5.24.1.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 - -MY_P=plotly.py-${PV} -DESCRIPTION="Browser-based graphing library for Python" -HOMEPAGE=" - https://plotly.com/python/ - https://github.com/plotly/plotly.py/ - https://pypi.org/project/plotly/ -" -SRC_URI=" - https://github.com/plotly/plotly.py/archive/refs/tags/v${PV}.tar.gz - -> ${MY_P}.gh.tar.gz -" -S="${WORKDIR}/${MY_P}/packages/python/plotly" -# The tests are not included in the PyPI tarball, to use the GitHub tarball -# we have to skip npm, which means that the resulting install will -# unfortunately lack the jupyterlab extension. - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm64" - -RDEPEND=" - dev-python/packaging[${PYTHON_USEDEP}] - >=dev-python/tenacity-6.2.0[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-python/versioneer[${PYTHON_USEDEP}] - test? ( - dev-python/ipykernel[${PYTHON_USEDEP}] - dev-python/ipython[${PYTHON_USEDEP}] - dev-python/ipywidgets[${PYTHON_USEDEP}] - dev-python/jupyter[${PYTHON_USEDEP}] - dev-python/jupyterlab[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pandas[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/scipy[${PYTHON_USEDEP}] - dev-python/shapely[${PYTHON_USEDEP}] - dev-python/statsmodels[${PYTHON_USEDEP}] - dev-python/xarray[${PYTHON_USEDEP}] - dev-python/scikit-image[${PYTHON_USEDEP}] - ) -" - -# There are sphinx docs but we are missing a bunch of dependencies. -# distutils_enable_sphinx ../../../doc/apidoc -distutils_enable_tests pytest - -# README ends up a broken symlink -DOCS=() - -python_prepare_all() { - local PATCHES=( - # https://github.com/plotly/plotly.py/pull/4622 - "${FILESDIR}/${PN}-5.23.0-numpy-2.patch" - ) - - distutils-r1_python_prepare_all - - # unbundle versioneer - rm versioneer.py || die - # Do not try to fetch stuff with npm - export SKIP_NPM=1 -} - -python_test() { - local EPYTEST_IGNORE=( - # kaleido not packaged - plotly/tests/test_optional/test_kaleido - - # plotly-orca not packaged - plotly/tests/test_orca - ) - - local EPYTEST_DESELECT=( - # kaleido not packaged - plotly/tests/test_orca/test_to_image.py::test_bytesio - - # fails in non-isolated env - test_init/test_dependencies_not_imported.py::test_dependencies_not_imported - test_init/test_lazy_imports.py::test_lazy_imports - - # Minor matplotlib incompatibility - plotly/matplotlylib/mplexporter/tests/test_basic.py::test_legend_dots - plotly/matplotlylib/mplexporter/tests/test_utils.py::test_linestyle - - # TODO - plotly/tests/test_io/test_to_from_plotly_json.py::test_sanitize_json - - # two subtests that require 'vaex' and 'polars' respectively - plotly/tests/test_optional/test_px/test_px_input.py::test_build_df_from_vaex_and_polars - plotly/tests/test_optional/test_px/test_px_input.py::test_build_df_with_hover_data_from_vaex_and_polars - - # the usual recursion problem - plotly/tests/test_optional/test_utils/test_utils.py::test_masked_constants_example - ) - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -} - -python_install_all() { - distutils-r1_python_install_all - - mv "${ED}"/{usr/etc,etc} || die -} diff --git a/dev-python/plotly/plotly-6.0.1.ebuild b/dev-python/plotly/plotly-6.0.1.ebuild index 4bc2ac5748a7..b1974c30772e 100644 --- a/dev-python/plotly/plotly-6.0.1.ebuild +++ b/dev-python/plotly/plotly-6.0.1.ebuild @@ -26,7 +26,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64" RDEPEND=" >=dev-python/narwhals-1.15.1[${PYTHON_USEDEP}] -- cgit v1.2.3