diff --git a/b8d3d7b337adeb2fc2ef8a36f3a500e147d7a41b.diff b/new-api.patch similarity index 100% rename from b8d3d7b337adeb2fc2ef8a36f3a500e147d7a41b.diff rename to new-api.patch diff --git a/python-pyxdg.changes b/python-pyxdg.changes index 913bafa..6654689 100644 --- a/python-pyxdg.changes +++ b/python-pyxdg.changes @@ -1,8 +1,16 @@ +------------------------------------------------------------------- +Mon Mar 2 08:27:33 UTC 2020 - Tomáš Chvátal + +- Add setuptools dependency +- Use pytest to run tests rather than nose that will break with + python 3.10 + ------------------------------------------------------------------- Sun Mar 1 01:21:17 UTC 2020 - Mook - Fix Menu.py using attributes that no longer exist Patch from https://gitlab.freedesktop.org/xdg/pyxdg/-/merge_requests/2 + * new-api.patch ------------------------------------------------------------------- Sun Sep 15 06:48:50 UTC 2019 - John Vandenberg diff --git a/python-pyxdg.spec b/python-pyxdg.spec index 4bc3fe6..7685467 100644 --- a/python-pyxdg.spec +++ b/python-pyxdg.spec @@ -23,12 +23,12 @@ Version: 0.26 Release: 0 Summary: Implementations of freedesktop.org standards in python License: LGPL-2.1-only -Group: Development/Languages/Python -URL: http://freedesktop.org/wiki/Software/pyxdg +URL: https://freedesktop.org/wiki/Software/pyxdg Source: https://files.pythonhosted.org/packages/source/p/pyxdg/pyxdg-%{version}.tar.gz Patch0: resource_leak.patch -Patch1: https://gitlab.freedesktop.org/tcallawa/pyxdg/-/commit/b8d3d7b337adeb2fc2ef8a36f3a500e147d7a41b.diff -BuildRequires: %{python_module nose} +Patch1: https://gitlab.freedesktop.org/tcallawa/pyxdg/-/commit/b8d3d7b337adeb2fc2ef8a36f3a500e147d7a41b.diff#/new-api.patch +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: hicolor-icon-theme BuildRequires: python-rpm-macros @@ -63,14 +63,14 @@ PyXDG is a python library to access freedesktop.org standards. Currently support %install %python_install -%python_expand %fdupes %{buildroot}%{python_sitelib} +%python_expand %fdupes %{buildroot}%{$python_sitelib} %check # https://gitlab.freedesktop.org/xdg/pyxdg/issues/15 # test_get_type{,2} both fail but come from s-m-i package for data # https://gitlab.freedesktop.org/xdg/pyxdg/merge_requests/4 %{python_expand sed -i "s/Exec=python.*$/Exec=$python/" test/resources.py -nosetests-%{$python_bin_suffix} -e test_get_type* +PYTHONPATH=%{buildroot}%{$python_sitelib} pytest-%{$python_bin_suffix} test/test-*.py -v -k 'not test_get_type' } %files %{python_files}