8000 Merge pull request #2488 from misl6/release-2021.09.05 · djastral232/python-for-android@4563f3e · GitHub
[go: up one dir, main page]
Skip to content

Commit 4563f3e

Browse files
misl6misl6
authored
Merge pull request kivy#2488 from misl6/release-2021.09.05
Release 2021.09.05
2 parents 5a94d07 + 3685388 commit 4563f3e

File tree

124 files changed

+3328
-831
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+3328
-831
lines changed

‎.env

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# used by coveralls.io, refs:
2-
# https://coveralls-python.readthedocs.io/en/latest/usage/tox.html#travisci
2+
# https://coveralls-python.readthedocs.io/en/latest/usage/tox.html#github-actions
33
CI
4-
TRAVIS
5-
TRAVIS_BRANCH
6-
TRAVIS_JOB_ID
7-
TRAVIS_PULL_REQUEST
4+
GITHUB_ACTIONS
5+
GITHUB_REF
6+
GITHUB_SHA
7+
GITHUB_HEAD_REF
8+
GITHUB_REPOSITORY
9+
GITHUB_RUN_ID
10+
GITHUB_TOKEN

‎.github/workflows/push.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- name: Checkout python-for-android
1212
uses: actions/checkout@v2
1313
- name: Set up Python 3.7
14-
uses: actions/setup-python@v1.1.0
14+
uses: actions/setup-python@v2.2.1
1515
with:
1616
python-version: 3.7
1717
- name: Run flake8
@@ -32,7 +32,7 @@ jobs:
3232
- name: Checkout python-for-android
3333
uses: actions/checkout@v2
3434
- name: Set up Python ${{ matrix.python-version }}
35-
uses: actions/setup-python@v1.1.0
35+
uses: actions/setup-python@v2.2.1
3636
with:
3737
python-version: ${{ matrix.python-version }}
3838
- name: Tox tests

‎.github/workflows/pypi-release.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: PyPI release
2+
on: [push]
3+
4+
jobs:
5+
pypi_release:
6+
runs-on: ubuntu-latest
7+
steps:
8+
- uses: actions/checkout@v2
9+
- name: Set up Python 3.x
10+
uses: actions/setup-python@v2
11+
with:
12+
python-version: 3.x
13+
- name: Install dependencies
14+
run: |
15+
python -m pip install --upgrade setuptools wheel twine
16+
- name: Build
17+
run: |
18+
python setup.py sdist bdist_wheel
19+
twine check dist/*
20+
- name: Publish package
21+
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
22+
uses: pypa/gh-action-pypi-publish@v1.4.2
23+
with:
24+
user: __token__
25+
password: ${{ secrets.pypi_password }}

‎.travis.yml

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎CHANGELOG.md

Lines changed: 1659 additions & 0 deletions
Large diffs are not rendered by default.

‎Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ENV HOME_DIR="/home/${USER}"
4545
ENV WORK_DIR="${HOME_DIR}/app" \
4646
PATH="${HOME_DIR}/.local/bin:${PATH}" \
4747
ANDROID_HOME="${HOME_DIR}/.android" \
48-
JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64"
48+
JAVA_HOME="/usr/lib/jvm/java-13-openjdk-amd64"
4949

5050

5151
# install system dependencies
@@ -69,7 +69,7 @@ RUN dpkg --add-architecture i386 \
6969
libssl-dev \
7070
libstdc++6:i386 \
7171
libtool \
72-
openjdk-8-jdk \
72+
openjdk-13-jdk \
7373
patch \
7474
pkg-config \
7575
python3 \
@@ -98,8 +98,8 @@ RUN mkdir ${ANDROID_HOME} && chown --recursive ${USER} ${HOME_DIR} ${ANDROID_HOM
9898
USER ${USER}
9999

100100
# Download and install android's NDK/SDK
101-
COPY ci/makefiles/android.mk /tmp/android.mk
102-
RUN make --file /tmp/android.mk target_os=linux \
101+
COPY --chown=user:user ci/makefiles/android.mk /tmp/android.mk
102+
RUN make --file /tmp/android.mk \
103103
&& sudo rm /tmp/android.mk
104104

105105
# install python-for-android from current branch

‎MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ recursive-include doc *
66
prune doc/build
77

88
recursive-include pythonforandroid *.py *.tmpl biglink liblink
9-
recursive-include pythonforandroid/recipes *.py *.patch *.c *.pyx Setup *.h
9+
recursive-include pythonforandroid/recipes *.py *.patch *.diff *.c *.pyx Setup *.h
1010

1111
recursive-include pythonforandroid/bootstraps *.properties *.xml *.java *.tmpl *.txt *.png *.aidl *.py *.sh *.c *.h *.html *.patch
1212

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ all: virtualenv
2020

2121
$(VIRTUAL_ENV):
2222
python3 -m venv $(VIRTUAL_ENV)
23-
$(PIP) install Cython==0.29.19
23+
$(PIP) install Cython
2424
$(PIP) install -e .
2525

2626
virtualenv: $(VIRTUAL_ENV)

‎README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
python-for-android
22
==================
33

4-
[![Build Status](https://travis-ci.org/kivy/python-for-android.svg?branch=develop)](https://travis-ci.org/kivy/python-for-android)
54
[![Unit tests & build apps](https://github.com/kivy/python-for-android/workflows/Unit%20tests%20&%20build%20apps/badge.svg?branch=develop)](https://github.com/kivy/python-for-android/actions?query=workflow%3A%22Unit+tests+%26+build+apps%22)
65
[![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)
76
[![Backers on Open Collective](https://opencollective.com/kivy/backers/badge.svg)](#backers)

‎ci/constants.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ class TargetPython(Enum):
2626
# mpmath package with a version >= 0.19 required
2727
'sympy',
2828
'vlc',
29+
# need extra gfortran NDK system add-on
30+
'lapack', 'scipy',
2931
])
3032

3133
BROKEN_RECIPES = {

0 commit comments

Comments
 (0)
0