#2 Update to 0.7.0a1 (RHBZ#2220464 RHBZ#2226306)
Merged 9 months ago by gui1ty. Opened 11 months ago by gui1ty.
rpms/ gui1ty/python-pyunicorn use_master  into  rawhide

file modified
+1
@@ -1,1 +1,2 @@ 

  /pyunicorn-0.6.1.tar.gz

+ /pyunicorn-master.tar.gz

file removed
-12
@@ -1,12 +0,0 @@ 

- diff -urN a/tox.ini b/tox.ini

- --- a/tox.ini	2019-06-20 16:28:38.000000000 +0200

- +++ b/tox.ini	2021-03-29 21:22:00.844698941 +0200

- @@ -30,7 +30,7 @@

-      networkx

-  commands =

-      {[testenv]commands}

- -    py.test --cov=pyunicorn tests

- +    py.test --cov=pyunicorn -ra -k 'not test_init_str and not testTwinSurrogates and not test_average_link_distance' tests

-  

-  [testenv:style]

-  skipdist = True

@@ -1,16 +0,0 @@ 

- diff -urN a/README.rst b/README.rst

- --- a/README.rst	2019-06-21 10:12:36.000000000 +0200

- +++ b/README.rst	2022-02-19 23:32:41.043399532 +0100

- @@ -2,12 +2,6 @@

-  pyunicorn

-  =========

-  

- -.. image:: https://travis-ci.org/pik-copan/pyunicorn.svg?branch=master

- -    :target: https://travis-ci.org/pik-copan/pyunicorn

- -.. image:: https://codecov.io/gh/pik-copan/pyunicorn/branch/master/graph/badge.svg

- -  :target: https://codecov.io/gh/pik-copan/pyunicorn

- -

- -

-  ``pyunicorn`` (**Uni**\ fied **Co**\ mplex Network and **R**\ ecurre\ **N**\ ce

-  analysis toolbox) is a fully object-oriented Python package for the advanced

-  analysis and modeling of complex networks. Above the standard measures of

file added
+41
@@ -0,0 +1,41 @@ 

+ * Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-13

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

+ 

+ * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-12

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

+ 

+ * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-11

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

+ 

+ * Tue Jun 21 2022 Python Maint <python-maint@redhat.com> - 0.6.1-10

+ - Rebuilt for Python 3.11

+ 

+ * Sat Feb 19 2022 Iztok Fister Jr. <iztokf AT fedoraproject DOT org> - 0.6.1-9

+ - Add subpackage for docs

+ 

+ * Thu Feb 17 2022 Iztok Fister Jr. <iztokf AT fedoraproject DOT org> - 0.6.1-8

+ - Install examples/ in docs

+ 

+ * Thu Feb 17 2022 Iztok Fister Jr. <iztokf AT fedoraproject DOT org> - 0.6.1-7

+ - Improve description; define acronym

+ 

+ * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-6

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

+ 

+ * Mon Dec 06 2021 Orion Poplawski <orion@nwra.com> - 0.6.1-5

+ - Fix igraph dependency (bz#2019113)

+ 

+ * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-4

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

+ 

+ * Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.6.1-3

+ - Rebuilt for Python 3.10

+ 

+ * Mon Mar 29 2021 Iztok Fister Jr. <iztokf AT fedoraproject DOT org> - 0.6.1-2

+ - New patch - one test is failing on s390x

+ 

+ * Mon Mar 29 2021 Iztok Fister Jr. <iztokf AT fedoraproject DOT org> - 0.6.1-1

+ - Multiple licences added

+ 

+ * Mon Mar 22 2021 Iztok Fister Jr. <iztokf AT fedoraproject DOT org> - 0.6.1-1

+ - Initial package

file modified
+27 -69
@@ -9,6 +9,8 @@ 

  %bcond_without doc_pdf

  

  %global pypi_name pyunicorn

+ %global forgeurl https://github.com/pik-copan/pyunicorn

+ %global commit master

  

  %global _description %{expand:

  pyunicorn (Unified Complex Network and RecurreNce analysis toolbox)
@@ -21,8 +23,12 @@ 

  designed for analyzing networks of interacting/interdependent networks.}

  

  Name:           python-%{pypi_name}

- Version:        0.6.1

- Release:        13%{?dist}

+ 

+ %forgemeta

+ 

+ # Set version to preliminary version defined in setup.cfg

+ Version:        0.7.0a1

+ Release:        %{autorelease}

  Summary:        Unified complex network and recurrence analysis toolbox

  

  # The entire source code is BSD except the following files:
@@ -32,49 +38,40 @@ 

  #pyunicorn-0.6.1/pyunicorn/utils/progressbar/widgets.py

  License:        BSD and LGPLv2+

  URL:            http://www.pik-potsdam.de/~donges/pyunicorn/

- Source0:        %{pypi_source pyunicorn}

+ Source0:        %{forgesource}

  

  # patch intended for skipping two tests due to the failed attempts on i686

- Patch0:         0001-Skip-test.patch

+ #Patch0:         0001-Skip-test.patch

  

  # patch removes two badges that are in svg format

  # it resolves problems with building docs

- Patch1:         0002-Remove-badges-in-README.patch

+ #Patch1:         0002-Remove-badges-in-README.patch

  

  BuildRequires:  python3-devel

  BuildRequires:  python3dist(setuptools)

- # Fox %%tox macro

- BuildRequires:  python3-tox-current-env

  

  %if %{with doc_pdf}

  BuildRequires:  make

+ BuildRequires:  python3-sphinx

  BuildRequires:  python3-sphinx-latex

  BuildRequires:  latexmk

  %endif

  

  BuildRequires:  make

  BuildRequires:  gcc-c++

- BuildRequires:  Cython

+ BuildRequires:  Cython < 3~~

  

  BuildRequires:  python3-igraph

  BuildRequires:  numpy

  BuildRequires:  python3-networkx

  BuildRequires:  python3-basemap

- BuildRequires:  python3-sphinx

  BuildRequires:  python3-scipy

  

- # For the patch

- BuildRequires:  git-core

- 

  Requires:  matplotlib

  

  %if %{with tests}

  BuildRequires:  python3-pytest

- BuildRequires:  python3-pytest-cov

- BuildRequires:  python3-pytest-flake8

- BuildRequires:  python3-pytest-xdist

- BuildRequires:  python3-pylint

- BuildRequires:  python3-tox

+ BuildRequires:  python3-cartopy

  %endif

  

  %description %_description
@@ -91,31 +88,33 @@ 

  %{summary}.

  

  %prep

- %autosetup -n %{pypi_name}-%{version}

+ %autosetup -p1 -n %{pypi_name}-%{commit}

  for lib in $(find . -name "*.py"); do

   sed '1{\@^#!/usr/bin/python@d}' $lib > $lib.new &&

   touch -r $lib $lib.new &&

   mv $lib.new $lib

  done

- # Fix igraph dependency

- %if 0%{?fedora} >= 36

- sed -i -e 's/python-igraph/igraph/' requirements.txt tox.ini

- %endif

+ # Disable coverage and fix pytest command (has no option '-n')

+ sed -i -e 's/-n auto //' setup.cfg

  

  %build

  %py3_build

  

- %if %{with doc_pdf}

- %make_build -C docs latex SPHINXOPTS='%{?_smp_mflags}'

- %make_build -C docs/build/latex LATEXMKOPTS='-quiet'

- %endif

  

  %install

  %py3_install

  

+ # We run this in %%install, since Sphinx imports __version__ from pyunicorn.

+ # So, that needs to be installed first.

+ %if %{with doc_pdf}

+ %{py3_test_envvars} %make_build -C docs latex SPHINXOPTS='%{?_smp_mflags}'

+ %{py3_test_envvars} %make_build -C docs/build/latex LATEXMKOPTS='-quiet'

+ %endif

+ 

+ 

  %check

  %if %{with tests}

- %tox -e units

+ %pytest

  %endif

  

  %files -n python3-%{pypi_name}
@@ -132,45 +131,4 @@ 

  %endif

  

  %changelog

- * Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-13

- - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

- 

- * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-12

- - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

- 

- * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-11

- - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

- 

- * Tue Jun 21 2022 Python Maint <python-maint@redhat.com> - 0.6.1-10

- - Rebuilt for Python 3.11

- 

- * Sat Feb 19 2022 Iztok Fister Jr. <iztokf AT fedoraproject DOT org> - 0.6.1-9

- - Add subpackage for docs

- 

- * Thu Feb 17 2022 Iztok Fister Jr. <iztokf AT fedoraproject DOT org> - 0.6.1-8

- - Install examples/ in docs

- 

- * Thu Feb 17 2022 Iztok Fister Jr. <iztokf AT fedoraproject DOT org> - 0.6.1-7

- - Improve description; define acronym

- 

- * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-6

- - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

- 

- * Mon Dec 06 2021 Orion Poplawski <orion@nwra.com> - 0.6.1-5

- - Fix igraph dependency (bz#2019113)

- 

- * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-4

- - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

- 

- * Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.6.1-3

- - Rebuilt for Python 3.10

- 

- * Mon Mar 29 2021 Iztok Fister Jr. <iztokf AT fedoraproject DOT org> - 0.6.1-2

- - New patch - one test is failing on s390x

- 

- * Mon Mar 29 2021 Iztok Fister Jr. <iztokf AT fedoraproject DOT org> - 0.6.1-1

- - Multiple licences added

- 

- * Mon Mar 22 2021 Iztok Fister Jr. <iztokf AT fedoraproject DOT org> - 0.6.1-1

- - Initial package

- 

+ %autochangelog

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (pyunicorn-0.6.1.tar.gz) = f3d1b735c116a8bc0b75e061cb662729201fb9a64001595b7f1a8d9c7d177dcd41bc6217caae79369a0f60e57772d252a4373344fbffc2b245a31247fac3cfde

+ SHA512 (pyunicorn-master.tar.gz) = b5813a3505894384fb3bee840954bd30fc67e7b359fd4efc512bc1ffe8c89bcd1107a9c199f44ec478fc1d8a402e4d0dc4e56ca45014f6b059b0b6e3a90b1083

  • Build from master branch
  • Use forge macros for that
  • Drop patches (no longer required)
  • Clean up BRs
  • Switch to pytest and fix command (unknown option '-n')
  • Move BR python3-sphinx into conditional
  • Use Cython < 3.0.0 (compat package)
  • Clean up BRs for testing (python3-pytest-flake8 is retired)
  • Tests now require python3-cartopy
  • Generate docs in %install
  • Convert to %autorelease and %autochangelog

This depends on the fix for python-basemap.

For some reason Copr doesn't like %pytest, while it builds just fine with fedpkg mockbuild. No idea what's going on there.

I also tried dropping -v. But that didn't change anything.

For some reason Copr doesn't like %pytest, while it builds just fine with fedpkg mockbuild. No idea what's going on there.

It seems I had some leftover stuff in my chroot. Building in freshly cleaned chroot, I get the same error. I'll look into it and update.

2 new commits added

  • Update to 0.7.0a1 (RHBZ#2220464 RHBZ#2226306)
  • Convert to %autorelease and %autochangelog
11 months ago

All sorted. In setup.cfg I had to remove -n auto, which is passed to pytest. Not sure what version of pytest upstream is using. That still gets rid of tox, which does a lot of other stuff we don't care about and in the end calls pytest for the tests, anyway.

This ready to go once python-basemap has been fixed.

2 new commits added

  • Update to 0.7.0a1 (RHBZ#2220464 RHBZ#2226306)
  • Convert to %autorelease and %autochangelog
11 months ago

This is ready to be merged with python-basemap being fixed in rawhide now.

Pull-Request has been merged by gui1ty

9 months ago