twisted verion 20.3.0 does not play well with recent python croptography that was updated in kivy, patches don't work with newer version

[guysoft]

On the develop branch
I get:

08-02 20:23:24.624 23694 24808 I python  :    File "/home/guy/workspace/kivy/kivy-remote-shell/.buildozer/android/app/main.py", line 16, in <module>
08-02 20:23:24.624 23694 24808 I python  :    File "/home/guy/workspace/kivy/kivy-remote-shell/.buildozer/android/platform/build-arm64-v8a_armeabi-v7a/build/python-installs/remoteshell/arm64-v8a/twisted/conch/manhole_ssh.py", line 13, in <module>
08-02 20:23:24.624 23694 24808 I python  :    File "/home/guy/workspace/kivy/kivy-remote-shell/.buildozer/android/platform/build-arm64-v8a_armeabi-v7a/build/python-installs/remoteshell/arm64-v8a/twisted/conch/avatar.py", line 9, in <module>
08-02 20:23:24.624 23694 24808 I python  :    File "/home/guy/workspace/kivy/kivy-remote-shell/.buildozer/android/platform/build-arm64-v8a_armeabi-v7a/build/python-installs/remoteshell/arm64-v8a/twisted/conch/ssh/connection.py", line 17, in <module>
08-02 20:23:24.624 23694 24808 I python  :    File "/home/guy/workspace/kivy/kivy-remote-shell/.buildozer/android/platform/build-arm64-v8a_armeabi-v7a/build/python-installs/remoteshell/arm64-v8a/twisted/conch/ssh/common.py", line 15, in <module>
08-02 20:23:24.624 23694 24808 I python  :  ImportError: cannot import name 'int_from_bytes' from 'cryptography.utils' (/data/user/0/org.kivy.remoteshell/files/app/_python_bundle/site-packages/cryptography/utils.pyc)
08-02 20:23:24.625 23694 24808 I python  : Python for android ended.

I tried to bump the version i the recipe to 25.5.0. But then I get patching failing to apply. Are the patches maintained somewhere so I can re-apply them and draft a PR?
Thanks!

[DEBUG]:        2 out of 2 hunks ignored
Exception in thread background thread for pid 2124041:
Traceback (most recent call last):
  File "/usr/lib/python3.11/threading.py", line 1045, in _bootstrap_inner
    self.run()
  File "/usr/lib/python3.11/threading.py", line 982, in run
    self._target(*self._args, **self._kwargs)
  File "/home/guy/workspace/kivy/kivy-remote-shell/venv/lib/python3.11/site-packages/sh.py", line 1642, in wrap
    fn(*rgs, **kwargs)
  File "/home/guy/workspace/kivy/kivy-remote-shell/venv/lib/python3.11/site-packages/sh.py", line 2647, in background_thread
    handle_exit_code(exit_code)
  File "/home/guy/workspace/kivy/kivy-remote-shell/venv/lib/python3.11/site-packages/sh.py", line 2338, in fn
    return self.command.handle_command_exit_code(exit_code)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/guy/workspace/kivy/kivy-remote-shell/venv/lib/python3.11/site-packages/sh.py", line 823, in handle_command_exit_code
    raise exc
sh.ErrorReturnCode_1: 

  RAN: /usr/bin/patch -t -d /home/guy/workspace/kivy/kivy-remote-shell/.buildozer/android/platform/build-arm64-v8a_armeabi-v7a/build/other_builds/twisted/arm64-v8a__ndk_target_24/twisted -p1 -i /home/guy/workspace/kivy/kivy-remote-shell/python-for-android/pythonforandroid/recipes/twisted/incremental.patch

  STDOUT:
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur twisted-twisted-19.7.0/src/twisted/python/_setup.py twisted-twisted-19.7.0_patched/src/twisted/python/_setup.py
|--- twisted-twisted-19.7.0/src/twisted/python/_setup.py        2019-07-28 11:17:29.000000000 +0200
|+++ twisted-twisted-19.7.0_patched/src/twisted/python/_setup.py        2019-10-21 22:10:03.643068863 +0200
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored


  STDERR:

[INFO]:    STDOUT:
        can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur twisted-twisted-19.7.0/src/twisted/python/_setup.py twisted-twisted-19.7.0_patched/src/twisted/python/_setup.py
|--- twisted-twisted-19.7.0/src/twisted/python/_setup.py        2019-07-28 11:17:29.000000000 +0200
|+++ twisted-twisted-19.7.0_patched/src/twisted/python/_setup.py        2019-10-21 22:10:03.643068863 +0200
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
[INFO]:    STDERR:

Traceback (most recent call last):
  File "<frozen runpy>", line 198, in _run_module_as_main
  File "<frozen runpy>", line 88, in _run_code
  File "/home/guy/workspace/kivy/kivy-remote-shell/python-for-android/pythonforandroid/toolchain.py", line 1246, in <module>
    main()
  File "/home/guy/workspace/kivy/kivy-remote-shell/python-for-android/pythonforandroid/entrypoints.py", line 18, in main
    ToolchainCL()
  File "/home/guy/workspace/kivy/kivy-remote-shell/python-for-android/pythonforandroid/toolchain.py", line 677, in __init__
    getattr(self, command)(args)
  File "/home/guy/workspace/kivy/kivy-remote-shell/python-for-android/pythonforandroid/toolchain.py", line 104, in wrapper_func
    build_dist_from_args(ctx, dist, args)
  File "/home/guy/workspace/kivy/kivy-remote-shell/python-for-android/pythonforandroid/toolchain.py", line 163, in build_dist_from_args
    build_recipes(build_order, python_modules, ctx,
  File "/home/guy/workspace/kivy/kivy-remote-shell/python-for-android/pythonforandroid/build.py", line 497, in build_recipes
    recipe.apply_patches(arch)
  File "/home/guy/workspace/kivy/kivy-remote-shell/python-for-android/pythonforandroid/recipe.py", line 573, in apply_patches
    self.apply_patch(
  File "/home/guy/workspace/kivy/kivy-remote-shell/python-for-android/pythonforandroid/recipe.py", line 290, in apply_patch
    shprint(sh.patch, "-t", "-d", build_dir, "-p1",
  File "/home/guy/workspace/kivy/kivy-remote-shell/python-for-android/pythonforandroid/logger.py", line 167, in shprint
    for line in output:
  File "/home/guy/workspace/kivy/kivy-remote-shell/venv/lib/python3.11/site-packages/sh.py", line 879, in __next__
    self.wait()
  File "/home/guy/workspace/kivy/kivy-remote-shell/venv/lib/python3.11/site-packages/sh.py", line 796, in wait
    self.handle_command_exit_code(exit_code)
  File "/home/guy/workspace/kivy/kivy-remote-shell/venv/lib/python3.11/site-packages/sh.py", line 823, in handle_command_exit_code
    raise exc
sh.ErrorReturnCode_1: 

  RAN: /usr/bin/patch -t -d /home/guy/workspace/kivy/kivy-remote-shell/.buildozer/android/platform/build-arm64-v8a_armeabi-v7a/build/other_builds/twisted/arm64-v8a__ndk_target_24/twisted -p1 -i /home/guy/workspace/kivy/kivy-remote-shell/python-for-android/pythonforandroid/recipes/twisted/incremental.patch

  STDOUT:
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur twisted-twisted-19.7.0/src/twisted/python/_setup.py twisted-twisted-19.7.0_patched/src/twisted/python/_setup.py
|--- twisted-twisted-19.7.0/src/twisted/python/_setup.py        2019-07-28 11:17:29.000000000 +0200
|+++ twisted-twisted-19.7.0_patched/src/twisted/python/_setup.py        2019-10-21 22:10:03.643068863 +0200
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored


  STDERR:

Related

Cryptography was introduced here:
#2962

This is the latest twisted bump
#2135

[guysoft]

Update: will try and draft a pr, think I know what to change

[guysoft]

Update: stuck on PR, because I am not sure how to provide hatch.

I got the patches fixed and all, and the right hatch command, the issue is I can't figure out how to tell the recepie to install hatch in order for it to install twisted, i am getting:
No module named hatch

I tried:

    depends = ['zope_interface', 'incremental', 'constantly']
    hostpython_prerequisites = ["hatch"]

And also hacing it in "depends". but no avail. What I am missing here?
I hope to draft a PR once I get this working

[T-Dynamos]

@guysoft Replace CythonRecipe with PyProjectRecipe.