From 56c3bf353b79c9309ac022e78aa00f2c1dfc3266a03465704876e6594df29288 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 4 Aug 2023 11:48:49 +0000 Subject: [PATCH] Accepting request 1101522 from home:dgarcia:branches:devel:languages:python - Remove no-stdpy-pyc.patch - Call directly to the sphinx module with the specific python interpreter to avoid the usage of default python, bsc#1213698. OBS-URL: https://build.opensuse.org/request/show/1101522 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-blinker?expand=0&rev=37 --- no-stdpy-pyc.patch | 18 ------------------ python-blinker.changes | 7 +++++++ python-blinker.spec | 8 ++++---- 3 files changed, 11 insertions(+), 22 deletions(-) delete mode 100644 no-stdpy-pyc.patch diff --git a/no-stdpy-pyc.patch b/no-stdpy-pyc.patch deleted file mode 100644 index bf4ca6d..0000000 --- a/no-stdpy-pyc.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- - docs/conf.py | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/docs/conf.py -+++ b/docs/conf.py -@@ -1,6 +1,11 @@ -+import sys -+ - from pallets_sphinx_themes import get_version - from pallets_sphinx_themes import ProjectLink - -+# https://stackoverflow.com/q/34025113/164233 -+sys.dont_write_bytecode = True -+ - project = "Blinker" - copyright = "2010 Jason Kirtland" - release, version = get_version("blinker", placeholder=None) diff --git a/python-blinker.changes b/python-blinker.changes index ac39c4f..6c0f9c3 100644 --- a/python-blinker.changes +++ b/python-blinker.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jul 31 12:04:02 UTC 2023 - Daniel Garcia + +- Remove no-stdpy-pyc.patch +- Call directly to the sphinx module with the specific python + interpreter to avoid the usage of default python, bsc#1213698. + ------------------------------------------------------------------- Wed Jul 26 22:09:11 UTC 2023 - Matej Cepl diff --git a/python-blinker.spec b/python-blinker.spec index ff89214..3093be6 100644 --- a/python-blinker.spec +++ b/python-blinker.spec @@ -25,9 +25,6 @@ License: MIT Group: Development/Languages/Python URL: https://github.com/pallets-eco/blinker/ Source: https://files.pythonhosted.org/packages/source/b/blinker/blinker-%{version}.tar.gz -# PATCH-FIX-OPENSUSE no-stdpy-pyc.patch bsc#[0-9]+ mcepl@suse.com -# Persuade Sphinx not to generate *.pyc files -Patch0: no-stdpy-pyc.patch BuildRequires: %{python_module Pallets-Sphinx-Themes} BuildRequires: %{python_module Sphinx} BuildRequires: %{python_module pip} @@ -75,7 +72,10 @@ This sub-package contains the HTML documentation. %{python_expand pushd docs export PYTHONPATH=%{buildroot}%{$python_sitelib} -make html +# Do not call "make html" directly because it'll use python3 by +# default and that could produce .pyc files from different python +# versions in the package bsc#1213698 +$python -m sphinx -M html . _build popd %fdupes %{buildroot}%{$python_sitelib}