From 2a13f0c0052c30f6d0ef511c55b71097bc6dda6b Mon Sep 17 00:00:00 2001 From: Alexander Taylor Date: Thu, 6 Jun 2019 21:31:23 +0100 Subject: [PATCH 1/4] Updated project status images to develop branch --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 101edfffce..f27e16ab7c 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ python-for-android ================== -[![Build Status](https://travis-ci.org/kivy/python-for-android.svg?branch=master)](https://travis-ci.org/kivy/python-for-android) -[![Coverage Status](https://coveralls.io/repos/github/kivy/python-for-android/badge.svg?branch=master&kill_cache=1)](https://coveralls.io/github/kivy/python-for-android?branch=master) +[![Build Status](https://travis-ci.org/kivy/python-for-android.svg?branch=develop)](https://travis-ci.org/kivy/python-for-android) +[![Coverage Status](https://coveralls.io/repos/github/kivy/python-for-android/badge.svg?branch=develop&kill_cache=1)](https://coveralls.io/github/kivy/python-for-android?branch=develop) [![Backers on Open Collective](https://opencollective.com/kivy/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/kivy/sponsors/badge.svg)](#sponsors) From 60b22630ba25b13a004920f866c676414a3b21d0 Mon Sep 17 00:00:00 2001 From: Alexander Taylor Date: Thu, 6 Jun 2019 21:47:36 +0100 Subject: [PATCH 2/4] Updated build checklist to add arch checkboxes --- doc/source/contribute.rst | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/source/contribute.rst b/doc/source/contribute.rst index 749fb2ffed..62cbf6482f 100644 --- a/doc/source/contribute.rst +++ b/doc/source/contribute.rst @@ -68,6 +68,10 @@ Release checklist - [ ] Run the tests locally via `tox`: this performs some long-running tests that are skipped on Travis. - [ ] Build and run the [on_device_unit_tests](https://github.com/kivy/python-for-android/tree/master/testapps/on_device_unit_tests) app using buildozer. Check that they all pass. - [ ] Build and run the following [testapps](https://github.com/kivy/python-for-android/tree/master/testapps) for arch `armeabi-v7a` and `arm64-v8a`: - - [ ] `python3 setup_testapp_python3_sqlite_openssl.py apk` - - [ ] `python3 setup_testapp_python2.py apk` + - `python3 setup_testapp_python3_sqlite_openssl.py apk` + - [ ] `armeabi-v7a` + - [ ] `arm64-v8a` + - `python3 setup_testapp_python2.py apk` + - [ ] `armeabi-v7a` + - [ ] `arm64-v8a` - [ ] Check that the version number is correct From 275f95630c4f6ddddd25503fddcbeaaae58581f7 Mon Sep 17 00:00:00 2001 From: Alexander Taylor Date: Thu, 6 Jun 2019 22:56:16 +0100 Subject: [PATCH 3/4] Updated version to 2019.06.06 --- pythonforandroid/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pythonforandroid/__init__.py b/pythonforandroid/__init__.py index 3699b0d245..54b160fe59 100644 --- a/pythonforandroid/__init__.py +++ b/pythonforandroid/__init__.py @@ -1,2 +1,2 @@ -__version__ = '0.7.1' +__version__ = '2019.06.06' From 0da0f39de8ca612fcf1f07d7713cf8e80b7de193 Mon Sep 17 00:00:00 2001 From: Alexander Taylor Date: Sat, 8 Jun 2019 13:48:41 +0100 Subject: [PATCH 4/4] Updated default modified_recipes target branch to develop --- ci/rebuild_updated_recipes.py | 2 +- setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/rebuild_updated_recipes.py b/ci/rebuild_updated_recipes.py index e561c94826..32b0fda0f6 100755 --- a/ci/rebuild_updated_recipes.py +++ b/ci/rebuild_updated_recipes.py @@ -31,7 +31,7 @@ from ci.constants import TargetPython, CORE_RECIPES, BROKEN_RECIPES -def modified_recipes(branch='origin/master'): +def modified_recipes(branch='origin/develop'): """ Returns a set of modified recipes between the current branch and the one in param. diff --git a/setup.py b/setup.py index f045f0d47f..3cd86e4f4f 100644 --- a/setup.py +++ b/setup.py @@ -88,8 +88,8 @@ def recursively_include(results, directory, patterns): long_description=long_description, author='The Kivy team', author_email='kivy-dev@googlegroups.com', - url='https://github.com/kivy/python-for-android', - license='MIT', + url='https://github.com/kivy/python-for-android', + license='MIT', install_requires=install_reqs, entry_points={ 'console_scripts': [