diff --git a/srcpkgs/python-plotly/template b/srcpkgs/python-plotly/template deleted file mode 100644 index 1593b108f7..0000000000 --- a/srcpkgs/python-plotly/template +++ /dev/null @@ -1,37 +0,0 @@ -# Template file for 'python-plotly' -pkgname=python-plotly -version=2.2.0 -revision=2 -archs=noarch -#wrksrc="${pkgname#*-}-${version}" -wrksrc="plotly.py-${version}" -build_style=python-module -pycompile_module="plotly" -hostmakedepends="python-setuptools python3-setuptools" -depends="python-setuptools python-six python-requests python-pytz python-decorator python-jupyter_nbformat" -short_desc="Python2 plotting library for collaborative, interactive graphs" -maintainer="pulux " -license="MIT" -homepage="https://plot.ly/python/" -#odistfiles="${PYPI_SITE}/p/plotly/plotly-${version}.tar.gz" -#checksum=aee7044a5c70989940d24bbbb12469b2ab2dbf41b9dff652052327fe1168b3cc -#pypi has no LICENSE.txt -distfiles="https://github.com/plotly/plotly.py/archive/v${version}.tar.gz" -checksum=dad2a49fe355dddb6ae159e96c10ac22413a33cbac513b4dbf3791e63ec33c1f - -post_install() { - vlicense LICENSE.txt -} - - -python3-plotly_package() { - archs=noarch - pycompile_module="plotly" - depends="python3-setuptools python3-six python3-requests python3-pytz python3-decorator python3-jupyter_nbformat" - short_desc="${short_desc/Python2/Python3}" - pkg_install() { - vmove usr/lib/python3* - vlicense LICENSE.txt - } -} - diff --git a/srcpkgs/python3-plotly b/srcpkgs/python3-plotly deleted file mode 120000 index 8d444272b8..0000000000 --- a/srcpkgs/python3-plotly +++ /dev/null @@ -1 +0,0 @@ -python-plotly \ No newline at end of file diff --git a/srcpkgs/python3-plotly/patches/py3.8.patch b/srcpkgs/python3-plotly/patches/py3.8.patch new file mode 100644 index 0000000000..e8acfb4bd0 --- /dev/null +++ b/srcpkgs/python3-plotly/patches/py3.8.patch @@ -0,0 +1,99 @@ +diff --git plotly/figure_factory/_candlestick.py plotly/figure_factory/_candlestick.py +index 925b4c1..c0847b3 100644 +--- plotly/figure_factory/_candlestick.py ++++ plotly/figure_factory/_candlestick.py +@@ -211,11 +211,11 @@ def create_candlestick(open, high, low, close, dates=None, direction='both', + utils.validate_equal_length(open, high, low, close) + validate_ohlc(open, high, low, close, direction, **kwargs) + +- if direction is 'increasing': ++ if direction == 'increasing': + candle_incr_data = make_increasing_candle(open, high, low, close, + dates, **kwargs) + data = candle_incr_data +- elif direction is 'decreasing': ++ elif direction == 'decreasing': + candle_decr_data = make_decreasing_candle(open, high, low, close, + dates, **kwargs) + data = candle_decr_data +diff --git plotly/figure_factory/_facet_grid.py plotly/figure_factory/_facet_grid.py +index 61af2b1..d0eb2bc 100644 +--- plotly/figure_factory/_facet_grid.py ++++ plotly/figure_factory/_facet_grid.py +@@ -751,7 +751,7 @@ def create_facet_grid(df, x=None, y=None, facet_row=None, facet_col=None, + x='wt', + y='mpg', + facet_col='cyl', +- facet_col_labels={4: "$\\alpha$", 6: '$\\beta$', 8: '$\sqrt[y]{x}$'}, ++ facet_col_labels={4: "$\\alpha$", 6: '$\\beta$', 8: '$\\sqrt[y]{x}$'}, + ) + + py.iplot(fig, filename='facet_grid_mtcars_custom_labels') +diff --git plotly/figure_factory/_ohlc.py plotly/figure_factory/_ohlc.py +index b5e84cd..0c41430 100644 +--- plotly/figure_factory/_ohlc.py ++++ plotly/figure_factory/_ohlc.py +@@ -264,11 +264,11 @@ def create_ohlc(open, high, low, close, dates=None, direction='both', + utils.validate_equal_length(open, high, low, close) + validate_ohlc(open, high, low, close, direction, **kwargs) + +- if direction is 'increasing': ++ if direction == 'increasing': + ohlc_incr = make_increasing_ohlc(open, high, low, close, dates, + **kwargs) + data = [ohlc_incr] +- elif direction is 'decreasing': ++ elif direction == 'decreasing': + ohlc_decr = make_decreasing_ohlc(open, high, low, close, dates, + **kwargs) + data = [ohlc_decr] +diff --git plotly/matplotlylib/renderer.py plotly/matplotlylib/renderer.py +index 548ae74..9eb3fd2 100644 +--- plotly/matplotlylib/renderer.py ++++ plotly/matplotlylib/renderer.py +@@ -428,7 +428,7 @@ class PlotlyRenderer(Renderer): + + """ + self.msg += " Attempting to draw a path collection\n" +- if props['offset_coordinates'] is 'data': ++ if props['offset_coordinates'] == 'data': + markerstyle = mpltools.get_markerstyle_from_collection(props) + scatter_props = { + 'coordinates': 'data', +@@ -536,7 +536,7 @@ class PlotlyRenderer(Renderer): + self.draw_title(**props) + else: # just a regular text annotation... + self.msg += " Text object is a normal annotation\n" +- if props['coordinates'] is not 'data': ++ if props['coordinates'] != 'data': + self.msg += " Text object isn't linked to 'data' " \ + "coordinates\n" + x_px, y_px = props['mplobj'].get_transform().transform( +diff --git plotly/tools.py plotly/tools.py +index ba6aae7..db8eaa2 100644 +--- plotly/tools.py ++++ plotly/tools.py +@@ -319,7 +319,7 @@ def get_embed(file_owner_or_url, file_id=None, width="100%", height=525): + raise exceptions.PlotlyError( + "The 'file_id' argument must be a non-negative number." + ) +- if share_key is '': ++ if share_key == '': + s = ("