🔥 Remove python2 tests from Makefile, travis.yml and push.yml

Author: opacam

.github/workflows/push.yml

@@ -57,7 +57,7 @@ jobs:
     - name: Build apk for Python 3 ${{ matrix.build-arch }}
       run: |
         mkdir -p apks
-        make docker/run/make/with-artifact/testapps/python3/${{ matrix.build-arch }}
+        make docker/run/make/with-artifact/testapps/${{ matrix.build-arch }}
     - uses: actions/upload-artifact@v1
       with:
         name: bdisttest_python3_sqlite_openssl_googlendk__${{ matrix.build-arch }}-debug-1.1.apk

.travis.yml

@@ -36,9 +36,6 @@ jobs:
         - tox -- tests/ --ignore tests/test_pythonpackage.py
       name: "Tox Pep8"
       env: TOXENV=pep8
-    - <<: *unittests
-      name: "Tox Python 2"
-      env: TOXENV=py27
     - <<: *unittests
       name: "Tox Python 3 & Coverage"
       env: TOXENV=py3
@@ -48,7 +45,7 @@ jobs:
       name: Python 3 arm64-v8a (with numpy)
       stage: build testapps
       before_script: make docker/pull
-      script: make docker/run/make/testapps/python3/arm64-v8a
+      script: make docker/run/make/testapps/arm64-v8a
     - <<: *testapps
       name: Python 3 armeabi-v7a
       os: osx
@@ -57,10 +54,7 @@ jobs:
         # installs java 1.8, android's SDK/NDK and p4a
         - make -f ci/makefiles/osx.mk
         - export JAVA_HOME=/Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home
-      script: make testapps/python3/armeabi-v7a PYTHON_WITH_VERSION=python3
-    - <<: *testapps
-      name: Python 2 armeabi-v7a
-      script: make docker/run/make/testapps/python2/armeabi-v7a
+      script: make testapps/armeabi-v7a PYTHON_WITH_VERSION=python3
     - <<: *testapps
       name: Rebuild updated recipes
       script: travis_wait 30 make docker/run/make/rebuild_updated_recipes

Makefile

@@ -35,18 +35,13 @@ rebuild_updated_recipes: virtualenv
 	ANDROID_SDK_HOME=$(ANDROID_SDK_HOME) ANDROID_NDK_HOME=$(ANDROID_NDK_HOME) \
 	$(PYTHON) ci/rebuild_updated_recipes.py
 
-testapps/python2/armeabi-v7a: virtualenv
-	. $(ACTIVATE) && cd testapps/ && \
-    python setup_testapp_python2_sqlite_openssl.py apk --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
-    --requirements sdl2,pyjnius,kivy,python2,openssl,requests,sqlite3,setuptools
-
-testapps/python3/arm64-v8a: virtualenv
+testapps/arm64-v8a: virtualenv
 	. $(ACTIVATE) && cd testapps/ && \
     python setup_testapp_python3_sqlite_openssl.py apk --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
     --requirements libffi,sdl2,pyjnius,kivy,python3,openssl,requests,sqlite3,setuptools,numpy \
     --arch=arm64-v8a
 
-testapps/python3/armeabi-v7a: virtualenv
+testapps/armeabi-v7a: virtualenv
 	. $(ACTIVATE) && cd testapps/ && \
     python setup_testapp_python3_sqlite_openssl.py apk --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
     --arch=armeabi-v7a
@@ -77,11 +72,7 @@ docker/run/make/%: docker/build
 	docker run --rm --env-file=.env $(DOCKER_IMAGE) make $*
 
 docker/run/make/with-artifact/%: docker/build
-ifeq (,$(findstring python3,$($*)))
 	$(eval $@_APP_NAME := bdisttest_python3_sqlite_openssl_googlendk)
-else
-	$(eval $@_APP_NAME := bdisttest_python2_sqlite_openssl)
-endif
 	$(eval $@_APP_ARCH := $(shell basename $*))
 	docker run --name p4a-latest --env-file=.env $(DOCKER_IMAGE) make $*
 	docker cp p4a-latest:/home/user/app/testapps/$($@_APP_NAME)__$($@_APP_ARCH)-debug-1.1-.apk ./apks