Accepting request 1043008 from devel:languages:python

OBS-URL: https://build.opensuse.org/request/show/1043008
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-python-for-android?expand=0&rev=5

arch-tests.patch

@@ -1,110 +0,0 @@
-commit 02df176254d687e073243fbb8d9264412b423abd
-Author: John Vandenberg <jayvdb@gmail.com>
-Date:   Sun Nov 15 14:49:34 2020 +0700
-
-    Support tests on varied arch
-
-diff --git a/tests/recipes/test_icu.py b/tests/recipes/test_icu.py
-index 00cfbdbb..39c29047 100644
---- a/tests/recipes/test_icu.py
-+++ b/tests/recipes/test_icu.py
-@@ -1,10 +1,10 @@
- import os
- import unittest
- from unittest import mock
--from platform import system
- 
- from tests.recipes.recipe_ctx import RecipeCtx
- from pythonforandroid.recipes.icu import ICURecipe
-+from pythonforandroid.util import build_platform
- 
- 
- class TestIcuRecipe(RecipeCtx, unittest.TestCase):
-@@ -48,7 +48,7 @@ class TestIcuRecipe(RecipeCtx, unittest.TestCase):
-     ):
-         mock_find_executable.return_value = os.path.join(
-             self.ctx._ndk_dir,
--            f"toolchains/llvm/prebuilt/{system().lower()}-x86_64/bin/clang",
-+            f"toolchains/llvm/prebuilt/{build_platform}/bin/clang",
-         )
-         mock_archs_glob.return_value = [
-             os.path.join(self.ctx._ndk_dir, "toolchains", "llvm")
-diff --git a/tests/test_archs.py b/tests/test_archs.py
-index 61887e0e..62ea711d 100644
---- a/tests/test_archs.py
-+++ b/tests/test_archs.py
-@@ -8,7 +8,7 @@ from pythonforandroid.bootstrap import Bootstrap
- from pythonforandroid.distribution import Distribution
- from pythonforandroid.recipe import Recipe
- from pythonforandroid.build import Context
--from pythonforandroid.util import BuildInterruptingException
-+from pythonforandroid.util import BuildInterruptingException, build_platform
- from pythonforandroid.archs import (
-     Arch,
-     ArchARM,
-@@ -72,7 +72,7 @@ class ArchSetUpBaseClass(object):
-         # should be the same for all the tests (no more gcc compiler)
-         self.expected_compiler = (
-             f"/opt/android/android-ndk/toolchains/"
--            f"llvm/prebuilt/{system().lower()}-x86_64/bin/clang"
-+            f"llvm/prebuilt/{build_platform}/bin/clang"
-         )
- 
- 
-diff --git a/tests/test_bootstrap.py b/tests/test_bootstrap.py
-index f1cff914..8fcedb53 100644
---- a/tests/test_bootstrap.py
-+++ b/tests/test_bootstrap.py
-@@ -4,7 +4,6 @@ import sh
- import unittest
- 
- from unittest import mock
--from platform import system
- 
- from pythonforandroid.bootstrap import (
-     _cmp_bootstraps_by_priority, Bootstrap, expand_dependencies,
-@@ -13,7 +12,7 @@ from pythonforandroid.distribution import Distribution, generate_dist_folder_nam
- from pythonforandroid.recipe import Recipe
- from pythonforandroid.archs import ArchARMv7_a
- from pythonforandroid.build import Context
--from pythonforandroid.util import BuildInterruptingException
-+from pythonforandroid.util import BuildInterruptingException, build_platform
- 
- from test_graph import get_fake_recipe
- 
-@@ -531,7 +530,7 @@ class GenericBootstrapTest(BaseClassSetupBootstrap):
-     ):
-         mock_find_executable.return_value = os.path.join(
-             self.ctx._ndk_dir,
--            f"toolchains/llvm/prebuilt/{system().lower()}-x86_64/bin/clang",
-+            f"toolchains/llvm/prebuilt/{build_platform}/bin/clang",
-         )
-         mock_glob.return_value = [
-             os.path.join(self.ctx._ndk_dir, "toolchains", "llvm")
-diff --git a/tests/test_recipe.py b/tests/test_recipe.py
-index ef5e1ad4..ffe254cb 100644
---- a/tests/test_recipe.py
-+++ b/tests/test_recipe.py
-@@ -5,12 +5,12 @@ import unittest
- import warnings
- from unittest import mock
- from backports import tempfile
--from platform import system
- 
- from pythonforandroid.build import Context
- from pythonforandroid.recipe import Recipe, import_recipe
- from pythonforandroid.archs import ArchAarch_64
- from pythonforandroid.bootstrap import Bootstrap
-+from pythonforandroid.util import build_platform
- from test_bootstrap import BaseClassSetupBootstrap
- 
- 
-@@ -284,7 +284,7 @@ class TesSTLRecipe(BaseClassSetupBootstrap, unittest.TestCase):
-         """
-         expected_compiler = (
-             f"/opt/android/android-ndk/toolchains/"
--            f"llvm/prebuilt/{system().lower()}-x86_64/bin/clang"
-+            f"llvm/prebuilt/{build_platform}/bin/clang"
-         )
-         mock_find_executable.return_value = expected_compiler
-         mock_glob.return_value = ["llvm"]

python-for-android-2022.9.4.tar.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ffeb70e722674e8e6ed1db5dd18a46ba43d8e2cc90c7afdb1d7d014f9f9ade2c
+oid sha256:8e837b2ac1b45af968704edfc609d45614b587ce0cdf25c9337a76d6025e5ab0
-size 1605367
+size 1672609

python-python-for-android.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Dec 14 22:37:51 UTC 2022 - John Vandenberg <jayvdb@gmail.com>
+
+- Remove arch-tests.patch that was removed from spec in previous change
+
+-------------------------------------------------------------------
+Mon Dec 12 17:33:31 UTC 2022 - pgajdos@suse.com
+
+- really use 2022.09.04 tarball
+- six is not required
+
 -------------------------------------------------------------------
 Thu Oct  6 22:26:44 UTC 2022 - Yogalakshmi Arunachalam <yarunachalam@suse.com>
 

python-python-for-android.spec

@@ -16,9 +16,7 @@
 #
 
 
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%define version_with_zeros 2022.09.04
-%define version_with_zeros 2020.06.02
-%define skip_python2 1
 Name:           python-python-for-android
 Version:        2022.9.4
 Release:        0
@@ -27,8 +25,6 @@ License:        MIT
 URL:            https://github.com/kivy/python-for-android
 Source:         https://github.com/kivy/python-for-android/archive/v%{version_with_zeros}.tar.gz#/python-for-android-%{version}.tar.gz
 Source1:        python-python-for-android-rpmlintrc
-# https://github.com/kivy/python-for-android/pull/2355
-Patch0:         arch-tests.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
@@ -36,7 +32,6 @@ Requires:       python-Jinja2
 Requires:       python-appdirs
 Requires:       python-colorama >= 0.3.3
 Requires:       python-pep517
-Requires:       python-six
 Requires:       python-toml
 Requires(post): update-alternatives
 Requires(postun):update-alternatives
@@ -54,7 +49,6 @@ BuildRequires:  %{python_module pep517}
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module sh >= 1.10}
-BuildRequires:  %{python_module six}
 BuildRequires:  %{python_module toml}
 BuildRequires:  %{python_module wheel}
 BuildRequires:  autoconf
@@ -74,8 +68,7 @@ BuildRequires:  unzip
 Android APK packager for Python scripts and apps
 
 %prep
-%setup -q -n python-for-android-%{version_with_zeros}
+%autosetup -p1 -n python-for-android-%{version_with_zeros}
-%patch0 -p1
 
 sed -i "1{s:#!.*$:#!%{_bindir}/bash:}" pythonforandroid/bootstraps/common/build/gradlew
 
@@ -117,7 +110,7 @@ export PYTHONPATH=${PWD}:${PWD}/tests/
 # Five failures due to venv attempting download of pip, wheel, setuptools
 skip_tests="test_get_dep_names_of_package or test_get_package_dependencies or test_venv or test_get_package_as_folder or test_extract_metainfo_files_from_package"
 # Unable to download NDK
-skip_tests="$skip_tests or (TestToolchainCL and test_create)"
+skip_tests="$skip_tests or (TestToolchainCL and test_create) or test_create_python_bundle"
 
 %pytest -rs tests -k "not ($skip_tests)"