Accepting request 1240684 from devel:languages:python

- Add patch remove-six.patch:
  * Remove use of six.

OBS-URL: https://build.opensuse.org/request/show/1240684
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-httpbin?expand=0&rev=11
This commit is contained in:
Ana Guerrero 2025-01-29 15:09:46 +00:00 committed by Git OBS Bridge
commit ef053dc5b4
3 changed files with 67 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jan 28 01:22:41 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
- Add patch remove-six.patch:
* Remove use of six.
-------------------------------------------------------------------
Tue Oct 1 14:35:38 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package python-httpbin
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -25,6 +25,8 @@ Summary: HTTP Request and Response Service
License: MIT
URL: https://github.com/psf/httpbin
Source: https://files.pythonhosted.org/packages/source/h/%{modname}/%{modname}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM gh#psf/httpbin#40
Patch0: remove-six.patch
BuildRequires: %{python_module Brotli}
BuildRequires: %{python_module Flask >= 2.2.4}
BuildRequires: %{python_module Werkzeug >= 2.0}
@ -43,7 +45,6 @@ Requires: python-Werkzeug >= 2.2.2
Requires: python-decorator
Requires: python-flasgger
Requires: python-gevent
Requires: python-six
BuildArch: noarch
%python_subpackages
@ -78,6 +79,6 @@ export LANG=en_US.UTF-8
%doc README.md
%license LICENSE
%{python_sitelib}/httpbin
%{python_sitelib}/httpbin-%{version}*-info
%{python_sitelib}/httpbin-%{version}.dist-info
%changelog

57
remove-six.patch Normal file
View File

@ -0,0 +1,57 @@
From 17d02f215e18df999facc20808f47fcbb72f3a18 Mon Sep 17 00:00:00 2001
From: Alexandre Detiste <alexandre.detiste@gmail.com>
Date: Fri, 5 Jan 2024 15:21:04 +0100
Subject: [PATCH] cleanup remaining usage of "six"
---
httpbin/filters.py | 2 +-
httpbin/helpers.py | 3 ++-
pyproject.toml | 1 -
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/httpbin/filters.py b/httpbin/filters.py
index 4deeaaad..a656279e 100644
--- a/httpbin/filters.py
+++ b/httpbin/filters.py
@@ -12,7 +12,7 @@
import brotlicffi as _brotli
-from six import BytesIO
+from io import BytesIO
from decimal import Decimal
from time import time as now
diff --git a/httpbin/helpers.py b/httpbin/helpers.py
index 836c8026..cdf045c0 100644
--- a/httpbin/helpers.py
+++ b/httpbin/helpers.py
@@ -13,6 +13,8 @@
import time
import os
from hashlib import md5, sha256, sha512
+from urllib.parse import urlparse, urlunparse
+
from werkzeug.datastructures import WWWAuthenticate
from werkzeug.http import dump_header
@@ -23,7 +25,6 @@
parse_authorization_header = Authorization.from_header
from flask import request, make_response
-from six.moves.urllib.parse import urlparse, urlunparse
from .structures import CaseInsensitiveDict
diff --git a/pyproject.toml b/pyproject.toml
index c5bdb811..b82f7b6f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -38,7 +38,6 @@ dependencies = [
'greenlet < 3.0; python_version<"3.12"',
'greenlet >= 3.0.0a1; python_version>="3.12.0rc0"',
'importlib-metadata; python_version<"3.8"',
- "six",
"werkzeug >= 2.2.2",
]