From 673132b30c8dc06657419f0639d7a09060ed941edb421bdd579873f26305f685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 1 Mar 2019 19:38:20 +0000 Subject: [PATCH] Accepting request 680621 from home:frispete:python - remove everything to build docs: - local-intersphinx-inventories.patch - fetch-intersphinx-inventories.sh - python3.inv - crypto.inv OBS-URL: https://build.opensuse.org/request/show/680621 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyOpenSSL?expand=0&rev=57 --- .gitattributes | 3 --- crypto.inv | 3 --- fetch-intersphinx-inventories.sh | 5 ----- local-intersphinx-inventories.patch | 13 ------------- python-pyOpenSSL.changes | 9 +++++++++ python-pyOpenSSL.spec | 21 --------------------- python3.inv | 3 --- 7 files changed, 9 insertions(+), 48 deletions(-) delete mode 100644 crypto.inv delete mode 100644 fetch-intersphinx-inventories.sh delete mode 100644 local-intersphinx-inventories.patch delete mode 100644 python3.inv diff --git a/.gitattributes b/.gitattributes index e6096f7..9b03811 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,6 +21,3 @@ *.xz filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text -## Specific LFS patterns -crypto.inv filter=lfs diff=lfs merge=lfs -text -python3.inv filter=lfs diff=lfs merge=lfs -text diff --git a/crypto.inv b/crypto.inv deleted file mode 100644 index 264442d..0000000 --- a/crypto.inv +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41ce8ae745441735db7d7745cc412146c483377c44cda20d7844e0e1141e19a2 -size 9076 diff --git a/fetch-intersphinx-inventories.sh b/fetch-intersphinx-inventories.sh deleted file mode 100644 index 8ccb9af..0000000 --- a/fetch-intersphinx-inventories.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -wget -O python3.inv https://docs.python.org/3/objects.inv -wget -O crypto.inv https://cryptography.io/en/latest/objects.inv - diff --git a/local-intersphinx-inventories.patch b/local-intersphinx-inventories.patch deleted file mode 100644 index 8d4f5f1..0000000 --- a/local-intersphinx-inventories.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: b/doc/conf.py -=================================================================== ---- a/doc/conf.py -+++ b/doc/conf.py -@@ -254,6 +254,6 @@ man_pages = [ - ] - - intersphinx_mapping = { -- "https://docs.python.org/3": None, -- "https://cryptography.io/en/latest/": None, -+ "https://docs.python.org/3": "python3.inv", -+ "https://cryptography.io/en/latest/": "crypto.inv", - } diff --git a/python-pyOpenSSL.changes b/python-pyOpenSSL.changes index 72836db..98f1afb 100644 --- a/python-pyOpenSSL.changes +++ b/python-pyOpenSSL.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Mar 1 18:06:10 UTC 2019 - Hans-Peter Jansen + +- remove everything to build docs: + - local-intersphinx-inventories.patch + - fetch-intersphinx-inventories.sh + - python3.inv + - crypto.inv + ------------------------------------------------------------------- Mon Feb 25 19:56:35 UTC 2019 - Todd R diff --git a/python-pyOpenSSL.spec b/python-pyOpenSSL.spec index 0fcc20a..63feebd 100644 --- a/python-pyOpenSSL.spec +++ b/python-pyOpenSSL.spec @@ -26,14 +26,10 @@ License: Apache-2.0 Group: Development/Languages/Python URL: https://github.com/pyca/pyopenssl Source: https://files.pythonhosted.org/packages/source/p/pyOpenSSL/pyOpenSSL-%{version}.tar.gz -Source1: python3.inv -Source2: crypto.inv -Source3: fetch-intersphinx-inventories.sh Patch1: skip-networked-test.patch Patch2: openssl-1.1.0i.patch Patch3: openssl-1.1.1.patch Patch4: tls13-renegotiation.patch -Patch5: local-intersphinx-inventories.patch BuildRequires: %{python_module cffi} BuildRequires: %{python_module cryptography >= 2.3.0} BuildRequires: %{python_module flaky} @@ -42,7 +38,6 @@ BuildRequires: %{python_module pytest >= 3.0.1} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros -BuildRequires: python3-Sphinx Requires: python-cffi Requires: python-cryptography >= 2.3.0 Requires: python-six >= 1.5.2 @@ -63,28 +58,16 @@ pyOpenSSL is now a pure-Python project with a dependency on a new project, cryptography (), which provides (among other things) a cffi-based interface to OpenSSL. -%package -n %{name}-doc -Summary: Documentation for %{name} -Group: Documentation/HTML - -%description -n %{name}-doc -Provides documentation for %{name}. - %prep %setup -q -n pyOpenSSL-%{version} %autopatch -p1 -# prepare local intersphinx inventories, fetch with fetch-intersphinx-inventories.sh -cp -v %{S:1} doc/ -cp -v %{S:2} doc/ - %build %python_build %install %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} -PYTHONPATH="%{buildroot}%{python3_sitelib}" python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo %check export LC_ALL=en_US.UTF-8 @@ -98,8 +81,4 @@ py.test-%{$python_bin_suffix} -m "not network" -k "not test_export_text" %{python_sitelib}/OpenSSL/ %{python_sitelib}/pyOpenSSL-%{version}-py*.egg-info -%files -n %{name}-doc -%doc build/sphinx/html/ -%doc examples/ - %changelog diff --git a/python3.inv b/python3.inv deleted file mode 100644 index 99ffcde..0000000 --- a/python3.inv +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c8b6fe404be5534e725ad69abf2a0f7deb6a2972b6500584df61102ce20d7fd -size 102981