1
0

Accepting request 942918 from devel:languages:python

OBS-URL: https://build.opensuse.org/request/show/942918
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-semantic_version?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2021-12-30 14:55:16 +00:00 committed by Git OBS Bridge
commit 95f9c1ba04
3 changed files with 48 additions and 4 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Dec 27 11:47:19 UTC 2021 - Ben Greiner <code@bnavigator.de>
- Make it work with Django 4
* add sematicversion-pr123-dj40.patch
* gh#rbarrois/python-semanticversion#123
* Don't test django app on python36: Django 4 dropped it
-------------------------------------------------------------------
Fri Dec 10 07:01:40 UTC 2021 - Steve Kowalik <steven.kowalik@suse.com>

View File

@ -33,13 +33,16 @@ License: BSD-2-Clause
Group: Development/Languages/Python
URL: https://github.com/rbarrois/python-semanticversion
Source: https://files.pythonhosted.org/packages/source/s/semantic_version/semantic_version-%{version}.tar.gz
# PATCH-FIX-UPSTREAM sematicversion-pr123-dj40.patch -- gh#rbarrois/python-semanticversion#123
Patch1: sematicversion-pr123-dj40.patch
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
BuildArch: noarch
%if %{with test}
BuildRequires: %{python_module Django >= 1.11}
BuildRequires: %{python_module pytest}
# Django 4.0 dropped support for Python < 3.8
BuildRequires: %{python_module Django >= 1.11 if (%python-base without python36-base)}
%endif
%python_subpackages
@ -48,7 +51,7 @@ This small python library provides a few tools to handle `SemVer`_ in Python.
It follows strictly the 2.0.0 version of the SemVer scheme.
%prep
%setup -q -n semantic_version-%{version}
%autosetup -p1 -n semantic_version-%{version}
%build
%python_build
@ -61,14 +64,17 @@ It follows strictly the 2.0.0 version of the SemVer scheme.
%if %{with test}
%check
%pytest
# Django 4.0 dropped support for Python < 3.8
python36_flags="--ignore tests/test_django.py"
%pytest ${$python_flags}
%else
%files %{python_files}
%license LICENSE
%doc README.rst ChangeLog
%{python_sitelib}/*
%{python_sitelib}/semantic_version
%{python_sitelib}/semantic_version-%{version}*-info
%endif
%changelog

View File

@ -0,0 +1,30 @@
From 93c7028c8d4f2ca894734f39b7cb393b259c4cab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Barrois?= <raphael.barrois@paylead.fr>
Date: Mon, 8 Nov 2021 14:18:29 +0100
Subject: [PATCH 3/4] Add support for Django 4.0
The gettext_lazy function has a different name between Django 2.x and
4.x; use the right one according to the version.
Closes #113, #121
Index: semantic_version-2.8.5/semantic_version/django_fields.py
===================================================================
--- semantic_version-2.8.5.orig/semantic_version/django_fields.py
+++ semantic_version-2.8.5/semantic_version/django_fields.py
@@ -4,8 +4,14 @@
import warnings
+import django
from django.db import models
-from django.utils.translation import ugettext_lazy as _
+
+if django.VERSION >= (3, 0):
+ # See https://docs.djangoproject.com/en/dev/releases/3.0/#features-deprecated-in-3-0
+ from django.utils.translation import gettext_lazy as _
+else:
+ from django.utils.translation import ugettext_lazy as _
from . import base