From d6c644a4f9878a72fed29c8339d07ae7c6175111b661e77c37ecff09ffa359a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 23 Apr 2020 11:56:53 +0000 Subject: [PATCH] - Force the interpreter to match the one during build - Mypy should use python3 to generate stuff not python2 * no-python2.patch OBS-URL: https://build.opensuse.org/package/show/science:machinelearning/python-onnx?expand=0&rev=19 --- no-python2.patch | 10 ++++++++++ python-onnx.changes | 7 +++++++ python-onnx.spec | 4 +++- 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 no-python2.patch diff --git a/no-python2.patch b/no-python2.patch new file mode 100644 index 0000000..d8ac7f4 --- /dev/null +++ b/no-python2.patch @@ -0,0 +1,10 @@ +Index: onnx-1.6.0/tools/protoc-gen-mypy.py +=================================================================== +--- onnx-1.6.0.orig/tools/protoc-gen-mypy.py ++++ onnx-1.6.0/tools/protoc-gen-mypy.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + # Taken from https://github.com/dropbox/mypy-protobuf/blob/d984389124eae6dbbb517f766b9266bb32171510/python/protoc-gen-mypy + # (Apache 2.0 License) diff --git a/python-onnx.changes b/python-onnx.changes index 318b891..764b0a8 100644 --- a/python-onnx.changes +++ b/python-onnx.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Apr 23 11:49:13 UTC 2020 - Tomáš Chvátal + +- Force the interpreter to match the one during build +- Mypy should use python3 to generate stuff not python2 + * no-python2.patch + ------------------------------------------------------------------- Thu Apr 23 10:35:15 UTC 2020 - Tomáš Chvátal diff --git a/python-onnx.spec b/python-onnx.spec index 5b60e51..569df7b 100644 --- a/python-onnx.spec +++ b/python-onnx.spec @@ -27,6 +27,7 @@ URL: https://onnx.ai/ Source0: https://github.com/onnx/onnx/archive/v%{version}.tar.gz#/onnx-%{version}.tar.gz Source1: %{name}-rpmlintrc Patch0: protobuf.patch +Patch1: no-python2.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module numpy} BuildRequires: %{python_module protobuf} @@ -59,7 +60,7 @@ community of partners. %setup -q -n onnx-%{version} # avoid bundles rm -rf third_party -%patch0 -p1 +%autopatch -p1 # say that the cmake was already built (we used our macros) sed -i -e 's:built = False:built = True:g' setup.py # do not require extra pytest modules @@ -79,6 +80,7 @@ sed -i -e '/pytest-runner/d' setup.py -DBUILD_ONNX_PYTHON=ON \ -DBUILD_SHARED_LIBS=OFF \ -DBUILD_STATIC_LIBS=ON \ + -DPYTHON_EXECUTABLE="%{_bindir}/$python" \ -DPY_EXT_SUFFIX="`$python-config --extension-suffix`" %cmake_build ; cd .. }