diff --git a/chartify-pr170-pd.melt-kwarg.patch b/chartify-pr170-pd.melt-kwarg.patch new file mode 100644 index 0000000..0b012cd --- /dev/null +++ b/chartify-pr170-pd.melt-kwarg.patch @@ -0,0 +1,45 @@ +From 3175de56d20de1bfa537e315e3c12883edf58954 Mon Sep 17 00:00:00 2001 +From: Ben Greiner +Date: Tue, 5 Mar 2024 20:27:04 +0100 +Subject: [PATCH 1/2] Fix example: pd.melt(var_name=scalar) + +--- + chartify/examples.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chartify/examples.py b/chartify/examples.py +index 430e5e4..291ef77 100644 +--- a/chartify/examples.py ++++ b/chartify/examples.py +@@ -1268,7 +1268,7 @@ def style_color_palette_sequential(): + id_vars=["time"], + value_vars=data.columns[1:], + value_name="y", +- var_name=["grouping"], ++ var_name="grouping", + ) + + # Plot the data + +From b1b50c2b8bbf989f6112669b3ad9a0e8ea94b1d0 Mon Sep 17 00:00:00 2001 +From: Ben Greiner +Date: Tue, 5 Mar 2024 20:35:27 +0100 +Subject: [PATCH 2/2] Another instance + +--- + chartify/examples.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chartify/examples.py b/chartify/examples.py +index 291ef77..e0a7801 100644 +--- a/chartify/examples.py ++++ b/chartify/examples.py +@@ -1306,7 +1306,7 @@ def style_color_palette_diverging(): + id_vars=["time"], + value_vars=data.columns[1:], + value_name="y", +- var_name=["grouping"], ++ var_name="grouping", + ) + + # Plot the data diff --git a/python-chartify.changes b/python-chartify.changes index a8cddfa..b41f90b 100644 --- a/python-chartify.changes +++ b/python-chartify.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 5 19:22:00 UTC 2024 - Ben Greiner + +- Skip python39: no longer supported since ipython 8.19 +- Add chartify-pr170-pd.melt-kwarg.patch gh#spotify/chartify#170 +- Build PEP517 wheel, clean some obsolete pinning edits + ------------------------------------------------------------------- Fri Nov 10 12:23:33 UTC 2023 - Dirk Müller diff --git a/python-chartify.spec b/python-chartify.spec index c130faf..7d76b36 100644 --- a/python-chartify.spec +++ b/python-chartify.spec @@ -1,7 +1,7 @@ # # spec file for package python-chartify # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,6 +17,7 @@ %{?sle15_python_module_pythons} +%define skip_python39 1 Name: python-chartify Version: 4.0.5 Release: 0 @@ -24,7 +25,11 @@ Summary: Python library for plotting charts License: Apache-2.0 URL: https://github.com/spotify/chartify Source: https://github.com/spotify/chartify/archive/%{version}.tar.gz#/chartify-%{version}.tar.gz +# PATCH-FIX-UPSTREAM chartify-pr170-pd.melt-kwarg.patch gh#spotify/chartify#170 +Patch0: chartify-pr170-pd.melt-kwarg.patch +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildArch: noarch @@ -32,11 +37,11 @@ BuildArch: noarch BuildRequires: %{python_module Jinja2} BuildRequires: %{python_module Pillow >= 8.4.0} BuildRequires: %{python_module bokeh >= 3.0.0} -BuildRequires: %{python_module ipykernel >= 5.0} -BuildRequires: %{python_module ipython >= 7.0} +BuildRequires: %{python_module ipykernel} +BuildRequires: %{python_module ipython} BuildRequires: %{python_module pandas} BuildRequires: %{python_module pytest} -BuildRequires: %{python_module scipy >= 1.0.0 with %python-scipy < 2} +BuildRequires: %{python_module scipy >= 1.0.0} # ignoring https://github.com/SeleniumHQ/selenium/issues/5296 BuildRequires: %{python_module selenium >= 3.7.0} # /SECTION @@ -47,21 +52,20 @@ BuildRequires: %{python_module selenium >= 3.7.0} Chartify is a Python library for creating charts. %prep -%setup -q -n chartify-%{version} +%autosetup -p1 -n chartify-%{version} rm tox.ini # unpin selenium (see comment above) # unpin Jinja2 (see release notes), but keep a pinning char for the check in setup.py sed -i \ -e '/selenium/ s/,<=3.8.0//' \ - -e '/pandas/ s/,<2.0.0//' \ -e '/Jinja2/ s/<3.1.0/>1/' \ requirements.txt %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %check @@ -71,6 +75,6 @@ sed -i \ %doc AUTHORS.rst README.rst %license LICENSE %{python_sitelib}/chartify -%{python_sitelib}/chartify-%{version}*-info +%{python_sitelib}/chartify-%{version}.dist-info %changelog