From fa97aed1c5af062fb72403996896886a15caa610 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 12 Aug 2025 10:41:44 +0000 Subject: [PATCH] import OL python-websockets-14.2-2.el10_0 --- .gitignore | 2 +- .python-websockets.metadata | 2 +- SOURCES/remove-shell-true.patch | 37 +++++++++++++++ SPECS/python-websockets.spec | 79 ++++++++++++++++----------------- 4 files changed, 78 insertions(+), 42 deletions(-) create mode 100644 SOURCES/remove-shell-true.patch diff --git a/.gitignore b/.gitignore index b0ab6c2..6ace296 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/websockets-11.0.3.tar.gz +SOURCES/websockets-14.2.tar.gz diff --git a/.python-websockets.metadata b/.python-websockets.metadata index 5237d0d..e4a3d65 100644 --- a/.python-websockets.metadata +++ b/.python-websockets.metadata @@ -1 +1 @@ -3a82ef3e6015d985564ed04d2fbc308e0ee8d187 SOURCES/websockets-11.0.3.tar.gz +b30f7f15e69192894d232e8097f49006865203e0 SOURCES/websockets-14.2.tar.gz diff --git a/SOURCES/remove-shell-true.patch b/SOURCES/remove-shell-true.patch new file mode 100644 index 0000000..b84c667 --- /dev/null +++ b/SOURCES/remove-shell-true.patch @@ -0,0 +1,37 @@ +diff --git a/experiments/compression/corpus.py b/experiments/compression/corpus.py +index 56e2621..c8bd343 100644 +--- a/experiments/compression/corpus.py ++++ b/experiments/compression/corpus.py +@@ -10,16 +10,17 @@ import time + + def github_commits(): + OAUTH_TOKEN = getpass.getpass("OAuth Token? ") +- COMMIT_API = ( +- f'curl -H "Authorization: token {OAUTH_TOKEN}" ' +- f"https://api.github.com/repos/python-websockets/websockets/git/commits/:sha" +- ) ++ ++ def fetch_commit(sha): ++ url = f"https://api.github.com/repos/python-websockets/websockets/git/commits/{sha}" ++ headers = ["-H", f"Authorization: token {OAUTH_TOKEN}"] ++ cmd = ["curl"] + headers + [url] ++ return subprocess.check_output(cmd) + + commits = [] + + head = subprocess.check_output( +- "git rev-parse origin/main", +- shell=True, ++ ["git", "rev-parse", "origin/main"], + text=True, + ).strip() + todo = [head] +@@ -27,7 +28,7 @@ def github_commits(): + + while todo: + sha = todo.pop(0) +- commit = subprocess.check_output(COMMIT_API.replace(":sha", sha), shell=True) ++ commit = fetch_commit(sha) + commits.append(commit) + seen.add(sha) + for parent in json.loads(commit)["parents"]: diff --git a/SPECS/python-websockets.spec b/SPECS/python-websockets.spec index d820921..c538930 100644 --- a/SPECS/python-websockets.spec +++ b/SPECS/python-websockets.spec @@ -1,23 +1,29 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.6.5) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 2; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + %global pypi_name websockets -%ifarch x86_64 -%bcond_without tests -%endif - Name: python-%{pypi_name} -Version: 11.0.3 -Release: 6%{?dist} +Version: 14.2 +Release: %autorelease Summary: Implementation of the WebSocket Protocol for Python -License: BSD +License: BSD-3-Clause URL: https://github.com/aaugustin/websockets Source0: %{url}/archive/%{version}/%{pypi_name}-%{version}.tar.gz +# remove shell=True from experiments/compression/corpus.py +Patch0: remove-shell-true.patch + BuildRequires: gcc -%if %{with tests} -BuildRequires: python3dist(pytest) -%endif %global _description %{expand: websockets is a library for developing WebSocket servers and clients in @@ -39,26 +45,6 @@ BuildRequires: python3-devel %prep %autosetup -n %{pypi_name}-%{version} -p1 -# Upstream uses a src package but does not specify this explicitly in the -# pyproject.toml. This causes the build to fail on CentOS Stream 9 and RHEL 9. -# Workaround this problem by adding a very small setup.cfg file that specifies where -# the source code lives inside `src`. -%if %{defined el9} -cat << EOF > setup.cfg -[metadata] -name = websockets - -[options] -package_dir= - =src -packages=find: - -[options.packages.find] -where=src -EOF -%endif - - %generate_buildrequires %pyproject_buildrequires @@ -72,22 +58,33 @@ EOF %check %pyproject_check_import -%if %{with tests} -# Skip some tests that require network connectivity and/or a running daemon. -# Investigate: test_server_shuts_down_* tests hang or fail on Python 3.12 -%pytest -v --ignore compliance --ignore tests/sync -k "not test_explicit_host_port and not test_server_shuts_down" -%endif - %files -n python3-%{pypi_name} -f %{pyproject_files} %doc README.rst %changelog -* Tue Jan 30 2024 Major Hayden - 11.0.3-6 -- Bump revision to add gating.yaml +## START: Generated by rpmautospec +* Thu Jul 17 2025 Kseniia Nivnia - 14.2-2 +- Add patch to remove shell=True -* Tue Aug 15 2023 Major Hayden - 11.0.3-5 -- Add setup.cfg for RHEL 9 and CentOS Stream 9 +* Tue Jul 15 2025 Kseniia Nivnia - 14.2-1 +- Update to version 14.2 Resolves: RHEL-103750 + +* Tue Oct 29 2024 Troy Dawson - 12.0-5 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 12.0-4 +- Bump release for June 2024 mass rebuild + +* Fri Jan 26 2024 Fedora Release Engineering - 12.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 12.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jan 03 2024 Mikel Olasagasti Uranga - 12.0-1 +- Update to 12.0 rhbz#2245452 * Fri Jul 21 2023 Fedora Release Engineering - 11.0.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild @@ -254,3 +251,5 @@ EOF * Wed Aug 26 2015 Julien Enselme - 2.6-1 - Initial package + +## END: Generated by rpmautospec