[testapp] Rename setup_test_app.py to setup.py

opacam · opacam · commit 9eb532578f3d · 2020-03-14T15:30:02.000+01:00
Because reducing filename to `setup.py` will make our cli arguments shorter and source code cleaner
diff --git a/Makefile b/Makefile
@@ -38,14 +38,14 @@ rebuild_updated_recipes: virtualenv
 testapps/python2/%: virtualenv
 	$(eval $@_APP_ARCH := $(shell basename $*))
 	. $(ACTIVATE) && cd testapps/on_device_unit_tests/ && \
-    python setup_test_app.py apk --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
+    python setup.py apk --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
     --requirements sdl2,pyjnius,kivy,python2,openssl,requests,sqlite3,setuptools \
     --arch=$($@_APP_ARCH)
 
 testapps/python3/%: virtualenv
 	$(eval $@_APP_ARCH := $(shell basename $*))
 	. $(ACTIVATE) && cd testapps/on_device_unit_tests/ && \
-    python setup_test_app.py apk --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
+    python setup.py apk --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
     --requirements sdl2,pyjnius,kivy,python3,openssl,requests,sqlite3,setuptools,numpy \
     --arch=$($@_APP_ARCH)
 
diff --git a/ci/rebuild_updated_recipes.py b/ci/rebuild_updated_recipes.py
@@ -55,7 +55,6 @@ def build(target_python, requirements):
     """
     if not requirements:
         return
-    testapp = 'setup_test_app.py'
     android_sdk_home = os.environ['ANDROID_SDK_HOME']
     android_ndk_home = os.environ['ANDROID_NDK_HOME']
     requirements.add(target_python.name)
@@ -64,7 +63,7 @@ def build(target_python, requirements):
     with current_directory('testapps/on_device_unit_tests/'):
         # iterates to stream the output
         for line in sh.python(
-                testapp, 'apk', '--sdk-dir', android_sdk_home,
+                'setup.py', 'apk', '--sdk-dir', android_sdk_home,
                 '--ndk-dir', android_ndk_home, '--requirements',
                 requirements, _err_to_out=True, _iter=True):
             print(line)
diff --git a/doc/source/testing_pull_requests.rst b/doc/source/testing_pull_requests.rst
@@ -172,7 +172,7 @@ Installing python-for-android using the github's branch of the pull request
 
     .. code-block:: bash
 
-        python3 setup_test_app.py apk \
+        python3 setup.py apk \
             --ndk-dir=/media/DEVEL/Android/android-ndk-r20 \
             --sdk-dir=/media/DEVEL/Android/android-sdk-linux \
             --android-api=27 \
@@ -183,7 +183,7 @@ Installing python-for-android using the github's branch of the pull request
 Things that you should know:
 
     - In the example above, we override some variables that are set in
-      `setup_test_app.py`, you could also override them by editing this file
+      `setup.py`, you could also override them by editing this file
     - be sure to at least edit the following arguments when running the above
       command, since the default set in there it's unlikely that match your
       installation:
diff --git a/testapps/on_device_unit_tests/README.rst b/testapps/on_device_unit_tests/README.rst
@@ -15,7 +15,7 @@ It currently supports three app `modes`:
 The main tests are for the recipes built in the apk. Each module (or
 other tool) is at least imported and subject to some basic check.
 
-This test app can be build via `setup_test_app.py` or via buildozer. In both
+This test app can be build via `setup.py` or via buildozer. In both
 cases it will build a basic kivy app with a set of tests defined via the
 `requirements` keyword (specified at build time).
 
@@ -26,7 +26,7 @@ permissions in your device to use such app).
 Building the app with python-for-android
 ========================================
 
-You can use the provided file `setup_test_app.py`. Check our `Makefile
+You can use the provided file `setup.py`. Check our `Makefile
 <https://github.com/kivy/python-for-android/blob/develop/Makefile>`__ to guess
 how to build the test app, or also you can look at `testing pull requests documentation
 <https://github.com/kivy/python-for-android/blob/develop/doc/source/testing_pull_requests.rst>`__,
diff --git a/testapps/on_device_unit_tests/setup.py b/testapps/on_device_unit_tests/setup.py
diff --git a/testapps/on_device_unit_tests/test_app/main.py b/testapps/on_device_unit_tests/test_app/main.py
@@ -14,9 +14,9 @@
   -  A unittest app (webview bootstrap)
   -  A non-gui unittests app
 
-If you install/build this app via the `setup_test_app.py` file, a file named
+If you install/build this app via the `setup.py` file, a file named
 `app_requirements.txt` will be generated which will contain the requirements
-that we passed to the `setup_test_app.py` via arguments, which will determine
+that we passed to the `setup.py` via arguments, which will determine
 the unittests that this app will run.
 
 .. note:: This app is made to be working on desktop and on an android device.
@@ -27,7 +27,7 @@
          these on desktop just by editing the file `app_requirements.txt`,
          which should be located at the same location than this file. This
          `app_requirements.txt` file, it's autogenerated when the
-         `setup_test_app.py` is ran, so in certain circumstances, you may need
+         `setup.py` is ran, so in certain circumstances, you may need
          to create it. Also be aware that each `python-for-android` recipe
          that you want to test should be in a new line, taking into account the
          case of the recipe.
