Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-chartify for openSUSE:Factory
checked in at 2022-11-24 12:23:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-chartify (Old)
and /work/SRC/openSUSE:Factory/.python-chartify.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-chartify"
Thu Nov 24 12:23:22 2022 rev:5 rq:1037506 version:3.0.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-chartify/python-chartify.changes
2021-02-15 23:20:54.911809368 +0100
+++
/work/SRC/openSUSE:Factory/.python-chartify.new.1597/python-chartify.changes
2022-11-24 12:23:30.161401806 +0100
@@ -1,0 +2,17 @@
+Tue Nov 22 17:20:53 UTC 2022 - Ben Greiner <[email protected]>
+
+- Update to 3.0.4
+ * This update is a maintanaince release with no new features and
+ mainly behind the scenes updates
+ * Limit versions of bokeh, Jinja, and importlib-metadata to fix
+ build error. This is only necessary for python 3.6 it seems.
+ * Updated required versions of pytest and coverage
+ * Update setup.py (#135)
+ * Update options.py (#133)
+ * Change ChromeDriver link to avoid deprecated site (#134)
+ * Added test case and fix from PR #127
+ * Eliminate a number of deprecation warnings
+- Use python dependency generator
+ * Adjust requirements.txt accordingly, unpin where needed
+
+-------------------------------------------------------------------
Old:
----
chartify-3.0.3.tar.gz
New:
----
chartify-3.0.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-chartify.spec ++++++
--- /var/tmp/diff_new_pack.kcQQUI/_old 2022-11-24 12:23:30.757405594 +0100
+++ /var/tmp/diff_new_pack.kcQQUI/_new 2022-11-24 12:23:30.761405619 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-chartify
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,12 +16,9 @@
#
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
-# NEP29: TW does not have python36-scipy anymore
-%define skip_python36 1
Name: python-chartify
-Version: 3.0.3
+Version: 3.0.4
Release: 0
Summary: Python library for plotting charts
License: Apache-2.0
@@ -30,25 +27,20 @@
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
-Requires: python-Pillow >= 6.2.0
-Requires: python-bokeh >= 2.0.0
-Requires: python-ipykernel >= 5.0
-Requires: python-ipython >= 7.0
-Requires: python-pandas >= 1.0.0
-Requires: python-scipy >= 1.0.0
-# ignoring https://github.com/SeleniumHQ/selenium/issues/5296
-Requires: python-selenium >= 3.7.0
BuildArch: noarch
# SECTION test requirements
-BuildRequires: %{python_module Pillow >= 6.2.0}
-BuildRequires: %{python_module bokeh >= 2.0.0}
+BuildRequires: %{python_module Jinja2}
+BuildRequires: %{python_module Pillow >= 8.4.0}
+BuildRequires: %{python_module bokeh >= 2.0.0 with %python-bokeh < 2.5}
BuildRequires: %{python_module ipykernel >= 5.0}
BuildRequires: %{python_module ipython >= 7.0}
-BuildRequires: %{python_module pandas >= 1.0.0}
+BuildRequires: %{python_module pandas >= 1.0.0 with %python-pandas < 2}
BuildRequires: %{python_module pytest}
-BuildRequires: %{python_module scipy >= 1.0.0}
+BuildRequires: %{python_module scipy >= 1.0.0 with %python-scipy < 2}
+# ignoring https://github.com/SeleniumHQ/selenium/issues/5296
BuildRequires: %{python_module selenium >= 3.7.0}
# /SECTION
+%{?python_enable_dependency_generator}
%python_subpackages
%description
@@ -57,6 +49,16 @@
%prep
%setup -q -n chartify-%{version}
rm tox.ini
+# raise bokeh upper limit,
+# unpin selenium (see comment above)
+# unpin Jinja2 (see release notes), but keep a pinning char for the check in
setup.py
+# pandas: https://github.com/spotify/chartify/pull/143
+sed -i \
+ -e '/bokeh/ s/,<2.3.0/,<2.5/' \
+ -e '/selenium/ s/,<=3.8.0//' \
+ -e '/Jinja2/ s/<3.1.0/>1/' \
+ -e '/pandas/ s/0<2.0.0/0,<2.0.0/' \
+ requirements.txt
%build
%python_build
@@ -71,6 +73,7 @@
%files %{python_files}
%doc AUTHORS.rst README.rst
%license LICENSE
-%{python_sitelib}/*
+%{python_sitelib}/chartify
+%{python_sitelib}/chartify-%{version}*-info
%changelog
++++++ chartify-3.0.3.tar.gz -> chartify-3.0.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chartify-3.0.3/.github/workflows/python-publish.yml
new/chartify-3.0.4/.github/workflows/python-publish.yml
--- old/chartify-3.0.3/.github/workflows/python-publish.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/chartify-3.0.4/.github/workflows/python-publish.yml 2022-10-18
12:33:01.000000000 +0200
@@ -0,0 +1,42 @@
+# This workflow will upload a Python Package using Twine when a release is
created
+# For more information see:
https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Upload Python Package
+
+on:
+ release:
+ types: [published]
+
+jobs:
+ deploy:
+
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v2
+ - name: Set up Python
+ uses: actions/setup-python@v2
+ with:
+ python-version: '3.8'
+ - name: Install dependencies
+ run: |
+ python -m pip install --upgrade pip
+ pip install build
+ - name: Build package
+ run: python -m build
+ - name: Publish a Python distribution to PyPI
+ uses: pypa/gh-action-pypi-publish@release/v1
+ with:
+ user: __token__
+ password: ${{ secrets.PYPI_API_TOKEN }}
+ - name: Publish package to TestPyPI
+ uses: pypa/gh-action-pypi-publish@release/v1
+ with:
+ user: __token__
+ password: ${{ secrets.TEST_PYPI_API_TOKEN }}
+ repository_url: https://test.pypi.org/legacy/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chartify-3.0.3/.github/workflows/tox.yml
new/chartify-3.0.4/.github/workflows/tox.yml
--- old/chartify-3.0.3/.github/workflows/tox.yml 2020-11-02
23:11:04.000000000 +0100
+++ new/chartify-3.0.4/.github/workflows/tox.yml 2022-10-18
12:33:01.000000000 +0200
@@ -1,6 +1,6 @@
name: Tox
-on: [push]
+on: [push, pull_request]
jobs:
build:
@@ -8,12 +8,12 @@
strategy:
max-parallel: 5
matrix:
- python-version: [3.6, 3.7, 3.8]
+ python-version: [3.6, 3.7, 3.8, 3.9]
steps:
- - uses: actions/checkout@v1
+ - uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install python dependencies
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chartify-3.0.3/HISTORY.rst
new/chartify-3.0.4/HISTORY.rst
--- old/chartify-3.0.3/HISTORY.rst 2020-11-02 23:11:04.000000000 +0100
+++ new/chartify-3.0.4/HISTORY.rst 2022-10-18 12:33:01.000000000 +0200
@@ -2,6 +2,13 @@
History
=======
+3.0.3 (2022-10-18)
+------------------
+
+* Updated package requirements
+* Got rid of future deprecation warnings
+* Bugfix related to legend for graphs with multiple groups and colors
+
3.0.2 (2020-10-21)
------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chartify-3.0.3/README.rst
new/chartify-3.0.4/README.rst
--- old/chartify-3.0.3/README.rst 2020-11-02 23:11:04.000000000 +0100
+++ new/chartify-3.0.4/README.rst 2022-10-18 12:33:01.000000000 +0200
@@ -40,7 +40,7 @@
2. Install chromedriver requirement (Optional. Needed for PNG output):
- Install google chrome.
- - Download the appropriate version of chromedriver for your OS `here
<https://sites.google.com/a/chromium.org/chromedriver/downloads>`_.
+ - Download the appropriate version of chromedriver for your OS `here
<https://sites.google.com/chromium.org/driver/>`_.
- Copy the executable file to a directory within your PATH.
- View directorys in your PATH variable: ``echo $PATH``
- Copy chromedriver to the appropriate directory, e.g.: ``cp
chromedriver /usr/local/bin``
@@ -64,6 +64,11 @@
Use the `chartify tag on StackOverflow
<https://stackoverflow.com/questions/tagged/chartify>`_.
+Resources
+---------------
+
+- Data Visualization with `Chartify
<https://www.section.io/engineering-education/data-viz-chartify/>`_
+
Code of Conduct
---------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chartify-3.0.3/chartify/__init__.py
new/chartify-3.0.4/chartify/__init__.py
--- old/chartify-3.0.3/chartify/__init__.py 2020-11-02 23:11:04.000000000
+0100
+++ new/chartify-3.0.4/chartify/__init__.py 2022-10-18 12:33:01.000000000
+0200
@@ -22,7 +22,7 @@
__author__ = """Chris Halpert"""
__email__ = '[email protected]'
-__version__ = '3.0.3'
+__version__ = '3.0.4'
_IPYTHON_INSTANCE = False
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chartify-3.0.3/chartify/_core/plot.py
new/chartify-3.0.4/chartify/_core/plot.py
--- old/chartify-3.0.3/chartify/_core/plot.py 2020-11-02 23:11:04.000000000
+0100
+++ new/chartify-3.0.4/chartify/_core/plot.py 2022-10-18 12:33:01.000000000
+0200
@@ -24,7 +24,7 @@
from chartify._core.colors import Color, color_palettes
from chartify._core.axes import NumericalYMixin, NumericalXMixin
-from scipy.stats.kde import gaussian_kde
+from scipy.stats import gaussian_kde
class BasePlot:
@@ -1062,7 +1062,7 @@
# Sort the categories
if categorical_order_by == 'values':
# Recursively sort values within each level of the index.
- row_totals = source.sum(axis=1)
+ row_totals = source.sum(axis=1, numeric_only=True)
row_totals.name = 'sum'
old_index = row_totals.index
row_totals = row_totals.reset_index()
@@ -1082,7 +1082,7 @@
source = source.reindex(row_totals.index)
elif categorical_order_by == 'labels':
source = source.sort_index(
- 0, ascending=categorical_order_ascending)
+ axis=0, ascending=categorical_order_ascending)
# Manual sort
elif order_length is not None:
source = source.reindex(categorical_order_by, axis='index')
@@ -2020,7 +2020,7 @@
legend = None
sliced_data = data_frame
else:
- legend = bokeh.core.properties.value(str(color_value))
+ legend = str(color_value)
sliced_data = data_frame[data_frame[color_column] ==
color_value]
# Filter to only relevant columns.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chartify-3.0.3/chartify/_core/radar_chart.py
new/chartify-3.0.4/chartify/_core/radar_chart.py
--- old/chartify-3.0.3/chartify/_core/radar_chart.py 2020-11-02
23:11:04.000000000 +0100
+++ new/chartify-3.0.4/chartify/_core/radar_chart.py 2022-10-18
12:33:01.000000000 +0200
@@ -234,7 +234,7 @@
coord_df[[self._X_COLUMN, self._Y_COLUMN]] = self._to_xy_coords(
coord_df, radius_column, self._THETA_COLUMN)
# Add endpoint
- coord_df = coord_df.append(coord_df.iloc[0])
+ coord_df = pd.concat([coord_df, pd.DataFrame([coord_df.iloc[0]])])
source = self._named_column_data_source(
coord_df, series_name=color_value)
@@ -300,7 +300,7 @@
coord_df[[self._X_COLUMN, self._Y_COLUMN]] = self._to_xy_coords(
coord_df, radius_column, self._THETA_COLUMN)
# Add endpoint
- coord_df = coord_df.append(coord_df.iloc[0])
+ coord_df = pd.concat([coord_df, pd.DataFrame([coord_df.iloc[0]])])
source = self._named_column_data_source(
coord_df, series_name=color_value)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chartify-3.0.3/chartify/examples.py
new/chartify-3.0.4/chartify/examples.py
--- old/chartify-3.0.3/chartify/examples.py 2020-11-02 23:11:04.000000000
+0100
+++ new/chartify-3.0.4/chartify/examples.py 2022-10-18 12:33:01.000000000
+0200
@@ -695,7 +695,7 @@
@_print_source
def _bar_stacked_example_3(quantity_by_fruit_and_country):
"""Docstring"""
- # Get the ordered list of quanity by country to order the stacks.
+ # Get the ordered list of quantity by country to order the stacks.
country_order = (
quantity_by_fruit_and_country.groupby('country')['quantity'].sum()
.sort_values(ascending=False).index)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chartify-3.0.3/docs/_static/coverage.svg
new/chartify-3.0.4/docs/_static/coverage.svg
--- old/chartify-3.0.3/docs/_static/coverage.svg 2020-11-02
23:11:04.000000000 +0100
+++ new/chartify-3.0.4/docs/_static/coverage.svg 2022-10-18
12:33:01.000000000 +0200
@@ -9,13 +9,13 @@
</mask>
<g mask="url(#a)">
<path fill="#555" d="M0 0h63v20H0z"/>
- <path fill="#97CA00" d="M63 0h36v20H63z"/>
+ <path fill="#a4a61d" d="M63 0h36v20H63z"/>
<path fill="url(#b)" d="M0 0h99v20H0z"/>
</g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu
Sans,Verdana,Geneva,sans-serif" font-size="11">
<text x="31.5" y="15" fill="#010101" fill-opacity=".3">coverage</text>
<text x="31.5" y="14">coverage</text>
- <text x="80" y="15" fill="#010101" fill-opacity=".3">90%</text>
- <text x="80" y="14">90%</text>
+ <text x="80" y="15" fill="#010101" fill-opacity=".3">89%</text>
+ <text x="80" y="14">89%</text>
</g>
</svg>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chartify-3.0.3/requirements.txt
new/chartify-3.0.4/requirements.txt
--- old/chartify-3.0.3/requirements.txt 2020-11-02 23:11:04.000000000 +0100
+++ new/chartify-3.0.4/requirements.txt 2022-10-18 12:33:01.000000000 +0200
@@ -1,10 +1,11 @@
pandas>=1.0.0<2.0.0
-Pillow>=6.2.0
+Pillow>=8.4.0
# Avoid selenium bug:
# https://github.com/SeleniumHQ/selenium/issues/5296
selenium>=3.7.0,<=3.8.0
-bokeh>=2.0.0,<3.0.0
+bokeh>=2.0.0,<2.3.0
scipy>=1.0.0,<2.0.0
ipykernel>=5.0
ipython>=7.0
pyyaml>=5.3.1
+Jinja2<3.1.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chartify-3.0.3/requirements_dev.txt
new/chartify-3.0.4/requirements_dev.txt
--- old/chartify-3.0.3/requirements_dev.txt 2020-11-02 23:11:04.000000000
+0100
+++ new/chartify-3.0.4/requirements_dev.txt 2022-10-18 12:33:01.000000000
+0200
@@ -5,14 +5,15 @@
watchdog==0.8.3
flake8==3.8.2
tox>=3.13.2
-coverage==4.1
+coverage==6.2
Sphinx==1.7.7
commonmark==0.5.4
recommonmark==0.4.0
-pytest==3.2.3
+pytest==7.0.1
pytest-cov==2.5.1
coverage-badge==0.2.0
pytest-runner==2.11.1
pylint==1.7.4
-pyflakes==2.2.0
\ No newline at end of file
+pyflakes==2.2.0
+importlib-metadata<5.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chartify-3.0.3/setup.py new/chartify-3.0.4/setup.py
--- old/chartify-3.0.3/setup.py 2020-11-02 23:11:04.000000000 +0100
+++ new/chartify-3.0.4/setup.py 2022-10-18 12:33:01.000000000 +0200
@@ -106,6 +106,9 @@
'Natural Language :: English',
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
+ "Programming Language :: Python :: 3.7",
+ "Programming Language :: Python :: 3.8",
+ "Programming Language :: Python :: 3.9",
"License :: OSI Approved :: Apache Software License"
],
test_suite='tests',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/chartify-3.0.3/tests/test_chart.py
new/chartify-3.0.4/tests/test_chart.py
--- old/chartify-3.0.3/tests/test_chart.py 2020-11-02 23:11:04.000000000
+0100
+++ new/chartify-3.0.4/tests/test_chart.py 2022-10-18 12:33:01.000000000
+0200
@@ -93,6 +93,17 @@
assert np.array_equal(labels,
['US', 'JP', 'GB', 'CA', 'BR'])
+ def test_legen_with_grouping_and_color(self):
+ df = pd.DataFrame.from_dict({"data": [1, 1, 2, 2, 3, 3],
+ "group": ["a", "a", "a", "b", "b", "b"]})
+ ch = chartify.Chart(x_axis_type='categorical')
+ ch.plot.scatter(
+ data_frame=df,
+ categorical_columns="group",
+ numeric_column="data",
+ color_column="group",
+ )
+
class TestChart:
