From 0782449deb5fa0f98647c344adde29bdf23ae8b3 Mon Sep 17 00:00:00 2001 From: mcepl <> Date: Mar 07 2024 19:01:46 +0000 Subject: Update python-chartify to version 4.0.5 / rev 8 via SR 1155354 https://build.opensuse.org/request/show/1155354 by user mcepl + dimstar_suse --- diff --git a/.files b/.files index c573972..5caf9d6 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 7ba8dc7..d0b6ebe 100644 --- a/.rev +++ b/.rev @@ -68,4 +68,12 @@ * Added Boxplot Chart including example in examples notebook</comment> <requestid>1092608</requestid> </revision> + <revision rev="8" vrev="1"> + <srcmd5>cc04bd72ecd348c59e9031a434f551d4</srcmd5> + <version>4.0.5</version> + <time>1709832509</time> + <user>dimstar_suse</user> + <comment></comment> + <requestid>1155354</requestid> + </revision> </revisionlist> diff --git a/chartify-4.0.2.tar.gz b/chartify-4.0.2.tar.gz deleted file mode 120000 index 72121d2..0000000 --- a/chartify-4.0.2.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeiavvvxfxxscedcowtxce5m7gqgjax6e3biorri56izkkvmuqikq64 \ No newline at end of file diff --git a/chartify-4.0.5.tar.gz b/chartify-4.0.5.tar.gz new file mode 120000 index 0000000..67e0903 --- /dev/null +++ b/chartify-4.0.5.tar.gz @@ -0,0 +1 @@ +/ipfs/bafybeiajyp5y4voh2o43emrixjoo7y3dn4d7rfb7vsskrv64psrwe77esi \ No newline at end of file diff --git a/chartify-pr170-pd.melt-kwarg.patch b/chartify-pr170-pd.melt-kwarg.patch new file mode 100644 index 0000000..5f4384d --- /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 <code@bnavigator.de> +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 <code@bnavigator.de> +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 2e8d5ca..a11e083 100644 --- a/python-chartify.changes +++ b/python-chartify.changes @@ -1,4 +1,21 @@ ------------------------------------------------------------------- +Tue Mar 5 19:22:00 UTC 2024 - Ben Greiner <code@bnavigator.de> + +- 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 <dmueller@suse.com> + +- update to 4.0.5: + * Relaxed scipy and pandas version requirements to allow + verions 2.x + * Documentation build fix + * Pin tornado requirement to reduce vulnerability + * Require jupyter_bokeh to enable html output + +------------------------------------------------------------------- Sun Jun 11 19:31:58 UTC 2023 - Dirk Müller <dmueller@suse.com> - update to 4.0.2: @@ -15,7 +32,7 @@ Sun Jun 11 19:31:58 UTC 2023 - Dirk Müller <dmueller@suse.com> Sun Jun 11 19:26:34 UTC 2023 - Dirk Müller <dmueller@suse.com> - update to 3.1.0: - * Added Boxplot Chart including example in examples notebook + * Added Boxplot Chart including example in examples notebook ------------------------------------------------------------------- Wed Jan 4 14:16:25 UTC 2023 - Dirk Müller <dmueller@suse.com> @@ -45,11 +62,11 @@ Tue Nov 22 17:20:53 UTC 2022 - Ben Greiner <code@bnavigator.de> Fri Feb 12 15:46:27 UTC 2021 - Ben Greiner <code@bnavigator.de> - Update to 3.0.3 - * Fix loading of color, color palette and styles configuration + * Fix loading of color, color palette and styles configuration with PyYaml >= 5.2 - Change in 3.0.2 - * Support pyyaml 5.2+ -- Skip python36 build in TW because python36-scipy is no more + * Support pyyaml 5.2+ +- Skip python36 build in TW because python36-scipy is no more (NEP 29) ------------------------------------------------------------------- diff --git a/python-chartify.spec b/python-chartify.spec index 94d5708..4987ed0 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,14 +17,19 @@ %{?sle15_python_module_pythons} +%define skip_python39 1 Name: python-chartify -Version: 4.0.2 +Version: 4.0.5 Release: 0 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