diff --git a/1.5.tar.gz b/1.5.tar.gz deleted file mode 100644 index a75ada2..0000000 --- a/1.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d7e04ed4eea04611f571de336c6613c7657e6c1175d77b42b3776c2067f175ec -size 18514 diff --git a/1.6.tar.gz b/1.6.tar.gz new file mode 100644 index 0000000..7eead8b --- /dev/null +++ b/1.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7feebbda6e40463096e49bc7ffeccfe644e5db307083d1e323609b8c1682fdd2 +size 18446 diff --git a/python-purl.changes b/python-purl.changes index 5ea706d..6afb484 100644 --- a/python-purl.changes +++ b/python-purl.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Oct 17 10:46:23 UTC 2022 - pgajdos@suse.com + +- version update to 1.6 + * Use `pytest` insteed of `nose`. + * Fix warning around regex string. +- deleted patches + - use_pytest.patch (upstreamed) + ------------------------------------------------------------------- Mon May 4 12:41:10 UTC 2020 - Paolo Stivanin diff --git a/python-purl.spec b/python-purl.spec index 430a878..bf93ad4 100644 --- a/python-purl.spec +++ b/python-purl.spec @@ -1,7 +1,7 @@ # # spec file for package python-purl # -# Copyright (c) 2020 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 @@ -18,15 +18,13 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-purl -Version: 1.5 +Version: 1.6 Release: 0 Summary: An immutable URL class for URL building and manipulation License: MIT Group: Development/Languages/Python URL: https://github.com/codeinthehole/purl Source: https://github.com/codeinthehole/purl/archive/%{version}.tar.gz -# https://github.com/codeinthehole/purl/pull/42 -Patch0: use_pytest.patch BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six} @@ -41,7 +39,6 @@ An immutable URL class for URL building and manipulation. %prep %setup -q -n purl-%{version} -%patch0 -p1 %build %python_build @@ -51,7 +48,9 @@ An immutable URL class for URL building and manipulation. %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%pytest tests/utils_tests.py tests/expansion_tests.py tests/template_tests.py tests/url_tests.py +pushd tests +%pytest +popd %files %{python_files} %doc README.rst diff --git a/use_pytest.patch b/use_pytest.patch deleted file mode 100644 index 01bdd59..0000000 --- a/use_pytest.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -ru a/makefile b/makefile ---- a/makefile 2019-03-10 21:51:02.000000000 +0100 -+++ b/makefile 2020-05-04 14:33:39.928123174 +0200 -@@ -3,7 +3,7 @@ - python setup.py develop - - test: -- nosetests -+ pytest tests/ - - package: clean - # Test these packages in a fresh virtualenvs: -Only in b: .pytest_cache -diff -ru a/requirements.txt b/requirements.txt ---- a/requirements.txt 2019-03-10 21:51:02.000000000 +0100 -+++ b/requirements.txt 2020-05-04 14:33:54.216151730 +0200 -@@ -4,5 +4,5 @@ - wheel==0.33.1 - - # Testing --nose==1.3.7 -+pytest - tox==3.7.0 -diff -ru a/runtests.sh b/runtests.sh ---- a/runtests.sh 2019-03-10 21:51:02.000000000 +0100 -+++ b/runtests.sh 2020-05-04 14:34:09.352181984 +0200 -@@ -1,5 +1,3 @@ - #!/usr/bin/env bash - --# The doctests only work in Python2.* due to unicode issues that I --# don't know how to solve. --nosetests --with-doctest --doctest-extension=rst -s $@ -+pytest tests/ -diff -ru a/tests/expansion_tests.py b/tests/expansion_tests.py ---- a/tests/expansion_tests.py 2019-03-10 21:51:02.000000000 +0100 -+++ b/tests/expansion_tests.py 2020-05-04 14:29:32.167627853 +0200 -@@ -1,8 +1,6 @@ - # -*- coding: utf-8 -*- - import collections - --from nose.tools import eq_ -- - from purl.template import expand - - # Define variables as in the RFC (http://tools.ietf.org/html/rfc6570) -@@ -117,7 +115,7 @@ - - - def assert_expansion(template, fields, expected): -- eq_(expand(template, fields), expected) -+ assert expand(template, fields) == expected - - - def test_expansion(): -diff -ru a/tox.ini b/tox.ini ---- a/tox.ini 2019-03-10 21:51:02.000000000 +0100 -+++ b/tox.ini 2020-05-04 14:30:03.975691441 +0200 -@@ -7,5 +7,5 @@ - envlist = py26, py27, py34, pypy - - [testenv] --commands = nosetests [] -+commands = pytest - deps = -r{toxinidir}/requirements.txt