forked from pool/python-pytest-freezegun
Accepting request 1084152 from devel:languages:python:pytest
- Add patch use-packaging.patch: * Use packaging.Version, stops packages relying on this to fail. OBS-URL: https://build.opensuse.org/request/show/1084152 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pytest-freezegun?expand=0&rev=4
This commit is contained in:
@@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed May 3 03:17:36 UTC 2023 - Steve Kowalik <steven.kowalik@suse.com>
|
||||||
|
|
||||||
|
- 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 <dmueller@suse.com>
|
Fri Apr 21 12:31:39 UTC 2023 - Dirk Müller <dmueller@suse.com>
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,6 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
|
|
||||||
%define skip_python2 1
|
%define skip_python2 1
|
||||||
%{?sle15_python_module_pythons}
|
%{?sle15_python_module_pythons}
|
||||||
Name: python-pytest-freezegun
|
Name: python-pytest-freezegun
|
||||||
@@ -24,9 +23,10 @@ Version: 0.4.2
|
|||||||
Release: 0
|
Release: 0
|
||||||
Summary: Fixtures in freeze_time
|
Summary: Fixtures in freeze_time
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: Development/Languages/Python
|
|
||||||
URL: https://github.com/ktosiek/pytest-freezegun
|
URL: https://github.com/ktosiek/pytest-freezegun
|
||||||
Source: https://github.com/ktosiek/pytest-freezegun/archive/%{version}.tar.gz
|
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 devel}
|
||||||
BuildRequires: %{python_module setuptools}
|
BuildRequires: %{python_module setuptools}
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
@@ -44,7 +44,7 @@ BuildRequires: %{python_module pytest >= 3.0.0}
|
|||||||
Wrap tests with fixtures in freeze_time
|
Wrap tests with fixtures in freeze_time
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n pytest-freezegun-%{version}
|
%autosetup -p1 -n pytest-freezegun-%{version}
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%python_build
|
%python_build
|
||||||
@@ -59,6 +59,8 @@ Wrap tests with fixtures in freeze_time
|
|||||||
%files %{python_files}
|
%files %{python_files}
|
||||||
%doc README.rst
|
%doc README.rst
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
%{python_sitelib}/*
|
%{python_sitelib}/pytest_freezegun.py
|
||||||
|
%pycache_only %{python_sitelib}/__pycache__/pytest_freezegun*.pyc
|
||||||
|
%{python_sitelib}/pytest_freezegun-%{version}*info
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
|||||||
31
use-packaging.patch
Normal file
31
use-packaging.patch
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
From 7f9c2db5269615e5e2dceb08dff896208eeb6f9c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Christofer Bertonha <christoferbertonha@gmail.com>
|
||||||
|
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')
|
||||||
Reference in New Issue
Block a user