From cd5ebf99f02d55535c4f77072e22c4304845bf20a7cc10f9b3ce2c016736aaf7 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Wed, 22 May 2024 02:07:23 +0000 Subject: [PATCH] - Update to 1.13: * Remove outdated pystrings.swg (#508). * Fix segfault from repr attempting to access attrs on uninitialized instance (#520). * Add Python 3.12 support (#486). * Copy edges keys when copying a graph * Drop Python 3.8 support per SPEC 0 (#465). * Drop Python 3.9 support (#487). * Update documentation building requirements (#488). * Add pyproject.toml (#471). * Stop building pdf of the docs (#503). - Drop patch docdir.patch, no longer needed. - Build the documentation by hand, since now we need to. - Switch to pyproject macros. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pygraphviz?expand=0&rev=29 --- README.txt | 6 +++++ docdir.patch | 15 ------------- pygraphviz-1.11.zip | 3 --- pygraphviz-1.13.tar.gz | 3 +++ python-pygraphviz.changes | 18 +++++++++++++++ python-pygraphviz.spec | 46 +++++++++++++++++++++++++-------------- 6 files changed, 57 insertions(+), 34 deletions(-) create mode 100644 README.txt delete mode 100644 docdir.patch delete mode 100644 pygraphviz-1.11.zip create mode 100644 pygraphviz-1.13.tar.gz diff --git a/README.txt b/README.txt new file mode 100644 index 0000000..8b63d6a --- /dev/null +++ b/README.txt @@ -0,0 +1,6 @@ +.. _examples_gallery: + +Gallery +======= + +Graph visualization examples with pygraphviz. diff --git a/docdir.patch b/docdir.patch deleted file mode 100644 index 6860684..0000000 --- a/docdir.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/setup.py -+++ b/setup.py -@@ -54,7 +54,7 @@ with open("pygraphviz/__init__.py") as f - break - - packages = ["pygraphviz", "pygraphviz.tests"] --docdirbase = f"share/doc/pygraphviz-{version}" -+docdirbase = f"share/doc/packages/pygraphviz-{version}" - data = [ - (docdirbase, glob("*.txt")), - (os.path.join(docdirbase, "examples"), glob("examples/*.py")), diff --git a/pygraphviz-1.11.zip b/pygraphviz-1.11.zip deleted file mode 100644 index f43b750..0000000 --- a/pygraphviz-1.11.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a97eb5ced266f45053ebb1f2c6c6d29091690503e3a5c14be7f908b37b06f2d4 -size 120803 diff --git a/pygraphviz-1.13.tar.gz b/pygraphviz-1.13.tar.gz new file mode 100644 index 0000000..d2d287b --- /dev/null +++ b/pygraphviz-1.13.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ad8aa2f26768830a5a1cfc8a14f022d13df170a8f6fdfd68fd1aa1267000964 +size 104642 diff --git a/python-pygraphviz.changes b/python-pygraphviz.changes index 09cb5ec..ec94075 100644 --- a/python-pygraphviz.changes +++ b/python-pygraphviz.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed May 22 02:06:25 UTC 2024 - Steve Kowalik + +- Update to 1.13: + * Remove outdated pystrings.swg (#508). + * Fix segfault from repr attempting to access attrs on uninitialized + instance (#520). + * Add Python 3.12 support (#486). + * Copy edges keys when copying a graph + * Drop Python 3.8 support per SPEC 0 (#465). + * Drop Python 3.9 support (#487). + * Update documentation building requirements (#488). + * Add pyproject.toml (#471). + * Stop building pdf of the docs (#503). +- Drop patch docdir.patch, no longer needed. +- Build the documentation by hand, since now we need to. +- Switch to pyproject macros. + ------------------------------------------------------------------- Thu Jun 29 07:00:11 UTC 2023 - Andreas Schneider diff --git a/python-pygraphviz.spec b/python-pygraphviz.spec index b62ad32..20b81c0 100644 --- a/python-pygraphviz.spec +++ b/python-pygraphviz.spec @@ -1,7 +1,7 @@ # # spec file for package python-pygraphviz # -# 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 @@ -19,25 +19,32 @@ %bcond_without tests %{?sle15_python_module_pythons} Name: python-pygraphviz -Version: 1.11 +Version: 1.13 Release: 0 Summary: Python interface to Graphviz License: BSD-3-Clause -Group: Development/Languages/Python URL: https://pygraphviz.github.io/ -Source: https://files.pythonhosted.org/packages/source/p/pygraphviz/pygraphviz-%{version}.zip -# PATCH-FIX-UPSTREAM docdir.patch -Patch0: docdir.patch -BuildRequires: %{python_module devel >= 3.8} +Source: https://files.pythonhosted.org/packages/source/p/pygraphviz/pygraphviz-%{version}.tar.gz +# https://github.com/pygraphviz/pygraphviz/issues/532 +Source1: https://raw.githubusercontent.com/pygraphviz/pygraphviz/main/examples/README.txt +BuildRequires: %{python_module devel >= 3.10} # Needed even without tests BuildRequires: %{python_module pytest} +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: graphviz-devel >= 2.42 +BuildRequires: graphviz-gd BuildRequires: libpng-devel BuildRequires: python-rpm-macros +# For building the docs +BuildRequires: python3-Sphinx +BuildRequires: python3-matplotlib +BuildRequires: python3-numpydoc +BuildRequires: python3-pydata-sphinx-theme +BuildRequires: python3-sphinx-gallery BuildRequires: swig -BuildRequires: unzip Requires: graphviz >= 2.42 %if 0%{?suse_version} >= 1550 BuildRequires: pkgconf-pkg-config @@ -50,7 +57,6 @@ PyGraphviz can be used to create and draw networks and graphs with Graphviz. %package -n %{name}-doc Summary: Documentation for %{name} -Group: Documentation/Other Provides: %{python_module pygraphviz-doc = %{version}} %description -n %{name}-doc @@ -58,30 +64,38 @@ This package provides documentation and help files for %{name} %prep %autosetup -p1 -n pygraphviz-%{version} +cp %SOURCE1 examples %build export CFLAGS="%{optflags}" -%python_build +%pyproject_wheel %install export CFLAGS="%{optflags}" -%python_install -%fdupes %{buildroot}%{$python_sitearch} +%pyproject_install +PYTHONPATH=%{buildroot}%{python3_sitearch} make -C doc html +mkdir -p %{buildroot}%{_docdir}/pygraphviz-%{version} +cp -ar doc/build/html/* %{buildroot}%{_docdir}/pygraphviz-%{version} +%python_expand %fdupes %{buildroot}%{$python_sitearch} %if %{with tests} %check -# export PYTEST_ADDOPTS="--doctest-modules --durations=10 --import-mode=importlib" -export PYTEST_ADDOPTS="--import-mode=importlib" +# We don't want to run the tests from the topdir +tmpdir=$(mktemp -d) +cp pygraphviz/tests/* $tmpdir +pushd $tmpdir # skip tests because of gh#pygraphviz/pygraphviz#366 donttest="test_drawing_makes_file or test_drawing_makes_file1 or test_drawing_makes_file or test_drawing_png_output_with_NULL_smoketest" %pytest_arch -k "not ($donttest)" %endif +popd +rm -rf $tmpdir %files %{python_files} %license LICENSE %doc README.rst -%{python_sitearch}/pygraphviz/ -%{python_sitearch}/pygraphviz-%{version}-py*.egg-info +%{python_sitearch}/pygraphviz +%{python_sitearch}/pygraphviz-%{version}.dist-info %files -n %{name}-doc %license LICENSE