📝 Update docs

Author: opacam

README.md

@@ -116,9 +116,10 @@ has been adapted for that feature. Also be aware that more recent versions of th
 Android's NDK may not work.
 
 Those mentioned changes has been done this way to make easier the transition
-between python3 and python2. We will slowly phase out python2 support
-towards 2020...so...if you are using python2 in your projects you should
-consider migrating it into python3.
+between python3 and python2.
+
+On march of 2020 we dropped python2 support since the python team dropped
+python2 support.
 
 ## Contributors
 

doc/source/buildoptions.rst

@@ -8,17 +8,7 @@ This page contains instructions for using different build options.
 Python versions
 ---------------
 
-python2
-~~~~~~~
-
-Select this by adding it in your requirements, e.g. ``--requirements=python2``.
-
-This option builds Python 2.7.2 for your selected Android
-architecture. There are no special requirements, all the building is
-done locally.
-
-
-python3
+Python3
 ~~~~~~~
 
 Python3 is supported in two ways. The default method uses CPython 3.7+
@@ -31,6 +21,15 @@ e.g. ``--requirements=python3``.
           then add libffi to your requirements,
           e.g. ``--requirements=kivy,libffi,python3``.
 
+Python2
+~~~~~~~
+
+python-for-android no longer supports building for Python 2.
+
+
+.. note:: The last python-for-android version supporting Python2 was `v2019.10.06
+          <https://github.com/kivy/python-for-android/archive/v2019.10.06.zip>`__
+
 
 CrystaX python3
 ~~~~~~~~~~~~~~~
@@ -60,7 +59,7 @@ sdl2
 ~~~~
 
 Use this with ``--bootstrap=sdl2``, or just include the
-``sdl2`` recipe, e.g. ``--requirements=sdl2,python2``.
+``sdl2`` recipe, e.g. ``--requirements=sdl2,python3``.
 
 SDL2 is a popular cross-platform depelopment library, particularly for
 games. It has its own Android project support, which
@@ -120,7 +119,7 @@ webview
 ~~~~~~~
 
 You can use this with ``--bootstrap=webview``, or include the
-``webviewjni`` recipe, e.g. ``--requirements=webviewjni,python2``.
+``webviewjni`` recipe, e.g. ``--requirements=webviewjni,python3``.
 
 The webview bootstrap gui is, per the name, a WebView displaying a
 webpage, but this page is hosted on the device via a Python

doc/source/contribute.rst

@@ -75,7 +75,7 @@ Release checklist
   - `python3 setup_testapp_python3_sqlite_openssl.py apk`
     - [ ] `armeabi-v7a`
     - [ ] `arm64-v8a`
-  - `python3 setup_testapp_python2.py apk`
+  - `python3 setup_testapp_python3.py apk`
     - [ ] `armeabi-v7a`
     - [ ] `arm64-v8a`
 - [ ] Check that the version number is correct

doc/source/distutils.rst

@@ -25,9 +25,6 @@ This however has these caveats:
   or even cause build errors. (Sorry, our internal processing is
   just not smart enough to honor them properly at this point)
 
-- If you don't use Python 3 per default, you still need to specify
-  ``--requirements python2`` (without any additional dependencies)
-
 - The dependency analysis at the start may be quite slow and delay
   your build
 
@@ -117,7 +114,7 @@ store them in setup.py by passing the ``options`` parameter to
     from setuptools import find_packages
 
     options = {'apk': {'debug': None,  # use None for arguments that don't pass a value
-                       'requirements': 'sdl2,pyjnius,kivy,python2',
+                       'requirements': 'sdl2,pyjnius,kivy,python3',
                        'android-api': 19,
                        'ndk-dir': '/path/to/ndk',
                        'dist-name': 'bdisttest',

doc/source/quickstart.rst

@@ -185,9 +185,7 @@ an `.apk` file.
 
 *Compatibility notes:*
 
-- While python2 is still supported by python-for-android,
-  it will possibly no longer receive patches by the python creators
-  themselves in 2020. Migration to Python 3 is recommended!
+- Python2 is not supported by python-for-android.
 
 
 Build a WebView application

doc/source/recipes.rst

@@ -41,7 +41,7 @@ The basic declaration of a recipe is as follows::
       patches = ['some_fix.patch']  # Paths relative to the recipe dir
 
       depends = ['kivy', 'sdl2']  # These are just examples
-      conflicts = ['python2'] 
+      conflicts = ['generickndkbuild']
     
   recipe = YourRecipe()
 
@@ -61,15 +61,15 @@ when the recipe is imported.
 The actual build process takes place via three core methods::
 
       def prebuild_arch(self, arch):
-          super(YourRecipe, self).prebuild_arch(arch)
+          super().prebuild_arch(arch)
           # Do any pre-initialisation
 
       def build_arch(self, arch):
-          super(YourRecipe, self).build_arch(arch)
+          super().build_arch(arch)
           # Do the main recipe build
          
       def postbuild_arch(self, arch):
-          super(YourRecipe, self).build_arch(arch)
+          super().build_arch(arch)
           # Do any clearing up
 
 These methods are always run in the listed order; prebuild, then
@@ -86,7 +86,7 @@ context manager defined in toolchain.py::
 
   from pythonforandroid.toolchain import current_directory
   def build_arch(self, arch):
-      super(YourRecipe, self).build_arch(arch)
+      super().build_arch(arch)
       with current_directory(self.get_build_dir(arch.arch)):
           with open('example_file.txt', 'w') as fileh:
               fileh.write('This is written to a file within the build dir')
@@ -178,7 +178,7 @@ environment for any processes that you call. It is convenient to do
 this using the ``sh`` module as follows::
 
   def build_arch(self, arch):
-      super(YourRecipe, self).build_arch(arch)
+      super().build_arch(arch)
       env = self.get_recipe_env(arch)
       sh.echo('$PATH', _env=env)  # Will print the PATH entry from the
                                   # env dict
@@ -196,7 +196,7 @@ the following when compiling for SDL2, in order to tell Kivy what
 backend to use::
 
     def get_recipe_env(self, arch):
-        env = super(KivySDL2Recipe, self).get_recipe_env(arch)
+        env = super().get_recipe_env(arch)
         env['USE_SDL2'] = '1'
 
         env['KIVY_SDL2_PATH'] = ':'.join([
@@ -256,7 +256,7 @@ for the Vispy module::
       version = 'master'
       url = 'https://github.com/vispy/vispy/archive/{version}.zip'
 
-      depends = ['python2', 'numpy']
+      depends = ['python3', 'numpy']
       
       site_packages_name = 'vispy'
 
@@ -272,7 +272,7 @@ Python installation.
 For reference, the code that accomplishes this is the following::
 
     def build_arch(self, arch):
-        super(PythonRecipe, self).build_arch(arch)
+        super().build_arch(arch)
         self.install_python_package()
 
     def install_python_package(self):
@@ -426,15 +426,15 @@ overrides if you do not use them::
         url = 'http://example.com/example-{version}.tar.gz'
         # {version} will be replaced with self.version when downloading
 
-        depends = ['python2', 'numpy']  # A list of any other recipe names
+        depends = ['python3', 'numpy']  # A list of any other recipe names
                                         # that must be built before this
                                         # one
 
         conflicts = []  # A list of any recipe names that cannot be built
                         # alongside this one
 
         def get_recipe_env(self, arch):
-            env = super(YourRecipe, self).get_recipe_env(arch)
+            env = super().get_recipe_env(arch)
             # Manipulate the env here if you want
             return env
 
@@ -444,19 +444,19 @@ overrides if you do not use them::
             return True
 
         def prebuild_arch(self, arch):
-            super(YourRecipe, self).prebuild_arch(self)
+            super().prebuild_arch(self)
             # Do any extra prebuilding you want, e.g.:
             self.apply_patch('path/to/patch.patch')
 
         def build_arch(self, arch):
-            super(YourRecipe, self).build_arch(self)
+            super().build_arch(self)
             # Build the code. Make sure to use the right build dir, e.g.
             with current_directory(self.get_build_dir(arch.arch)):
                 sh.ls('-lathr')  # Or run some commands that actually do
                                  # something
 
         def postbuild_arch(self, arch):
-            super(YourRecipe, self).prebuild_arch(self)
+            super().prebuild_arch(self)
             # Do anything you want after the build, e.g. deleting
             # unnecessary files such as documentation
 

doc/source/troubleshooting.rst

@@ -132,8 +132,8 @@ AttributeError: 'Context' object has no attribute 'hostpython'
 
 This is a known bug in some releases. To work around it, add your
 python requirement explicitly,
-e.g. :code:`--requirements=python2,kivy`. This also applies when using
-buildozer, in which case add python2 to your buildozer.spec requirements.
+e.g. :code:`--requirements=python3,kivy`. This also applies when using
+buildozer, in which case add python3 to your buildozer.spec requirements.
 
 linkname too long
 ~~~~~~~~~~~~~~~~~