From 71c1686b29a6464e716213e05a60b6feb558776dcd9d6377e4317f8ab054d911 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Wed, 3 May 2023 03:18:20 +0000 Subject: [PATCH] - Add patch use-packaging.patch: * Use packaging.Version, stops packages relying on this to fail. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-freezegun?expand=0&rev=7 --- python-pytest-freezegun.changes | 6 ++++++ python-pytest-freezegun.spec | 10 ++++++---- use-packaging.patch | 31 +++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 use-packaging.patch diff --git a/python-pytest-freezegun.changes b/python-pytest-freezegun.changes index dca2e71..9051c42 100644 --- a/python-pytest-freezegun.changes +++ b/python-pytest-freezegun.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 3 03:17:36 UTC 2023 - Steve Kowalik + +- Add patch use-packaging.patch: + * Use packaging.Version, stops packages relying on this to fail. + ------------------------------------------------------------------- Fri Apr 21 12:31:39 UTC 2023 - Dirk Müller diff --git a/python-pytest-freezegun.spec b/python-pytest-freezegun.spec index bcf08ad..d7634b2 100644 --- a/python-pytest-freezegun.spec +++ b/python-pytest-freezegun.spec @@ -16,7 +16,6 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 %{?sle15_python_module_pythons} Name: python-pytest-freezegun @@ -24,9 +23,10 @@ Version: 0.4.2 Release: 0 Summary: Fixtures in freeze_time License: MIT -Group: Development/Languages/Python URL: https://github.com/ktosiek/pytest-freezegun Source: https://github.com/ktosiek/pytest-freezegun/archive/%{version}.tar.gz +# PATCH-FIX-UPSTREAM gh#ktosiek/pytest-freezegun#39 +Patch0: use-packaging.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: fdupes @@ -44,7 +44,7 @@ BuildRequires: %{python_module pytest >= 3.0.0} Wrap tests with fixtures in freeze_time %prep -%setup -q -n pytest-freezegun-%{version} +%autosetup -p1 -n pytest-freezegun-%{version} %build %python_build @@ -59,6 +59,8 @@ Wrap tests with fixtures in freeze_time %files %{python_files} %doc README.rst %license LICENSE -%{python_sitelib}/* +%{python_sitelib}/pytest_freezegun.py +%pycache_only %{python_sitelib}/__pycache__/pytest_freezegun*.pyc +%{python_sitelib}/pytest_freezegun-%{version}*info %changelog diff --git a/use-packaging.patch b/use-packaging.patch new file mode 100644 index 0000000..f9e90d9 --- /dev/null +++ b/use-packaging.patch @@ -0,0 +1,31 @@ +From 7f9c2db5269615e5e2dceb08dff896208eeb6f9c Mon Sep 17 00:00:00 2001 +From: Christofer Bertonha +Date: Fri, 2 Sep 2022 16:32:50 +0200 +Subject: [PATCH] Fix distutils.version deprecation + +--- + pytest_freezegun.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pytest_freezegun.py b/pytest_freezegun.py +index a08133f..e4d2719 100644 +--- a/pytest_freezegun.py ++++ b/pytest_freezegun.py +@@ -2,7 +2,7 @@ + + import pytest + +-from distutils.version import LooseVersion ++from packaging.version import Version + from freezegun import freeze_time + + +@@ -14,7 +14,7 @@ def get_closest_marker(node, name): + """ + Get our marker, regardless of pytest version + """ +- if LooseVersion(pytest.__version__) < LooseVersion('3.6.0'): ++ if Version(pytest.__version__) < Version('3.6.0'): + return node.get_marker('freeze_time') + else: + return node.get_closest_marker('freeze_time')