DL-Mirrors/termux-packages
0
0
Fork 1
mirror of https://github.com/termux-pacman/termux-packages.git synced 2026-02-11 12:20:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
5ef10b2b4bb500c068b30c2125ea5cfdeebd7c81
termux-packages/packages/python/debpython.patch
termux-pacman-bot f38dd0ee93 tree-wide: port debpython to termux 
- debpython is the commands `py3compile` and `py3clean` from Debian. I
  am calling them that because a large chunk of their source code is
  found inside a folder inside Debian's source code named "debpython"
  - 5348f70466

- rather than packaging `.pyc` files into packages, `py3compile` and
  `py3clean` can be called from `postinst` and `prerm` scripts to
  generate all `.pyc` for the `.py` files in the package immediately
  after the package is installed, and remove all `.pyc` files immediately
  before uninstalling the package, respectively

- fixes the error `trying to overwrite '/data/data/com.termux/files/usr/lib/python3.12/__pycache__/cProfile.cpython-312.pyc'` when packages were built on-device, but at the same time, also:

- prevents the warnings `dpkg: warning: while removing python, directory '/data/data/com.termux/files/usr/lib/python3.12/site-packages' not empty so not removed` as long as no packages were installed using `pip`

- The `termux_step_create_python_debscripts.sh` can configure work on debpython (i.e. its `py3copile` and `py3clean` commands) from the glibc package `python-glibc`, if some glibc package is being compiled.

- New variables have been implemented:
- `TERMUX_PYTHON_CROSSENV_BUILDHOME` - location of crossenv's python build libraries.
- `TERMUX_PKG_PYTHON_RUNTIME_DEPS` - configures the installation of the python modules via pip3 in the pkg's debscripts. If not configured in the package, it will use the value from `TERMUX_PKG_PYTHON_TARGET_DEPS`. If the variable is set to `false`, then the customization of installing python modules will be disabled, even if the `TERMUX_PKG_PYTHON_TARGET_DEPS` variable is set in the package.
- `TERMUX_SUBPKG_PYTHON_RUNTIME_DEPS` - configures the installation of the python modules via pip3 in the subpkg's debscripts.

- Implemented reconfiguration of prefixes in python module `sysconfig` and setting in `TERMUX_PYTHON_CROSSENV_BUILDHOME`, so that python modules from crossenv building can specify system paths of termux for correct compilation.

- Added automatic addition of `python-glibc{-glibc}` dependency when using the `TERMUX_PKG_PYTHON_RUNTIME_DEPS` (for pkg; will be disabled, i.e. will not be added, if the variable is set to `false`) or `TERMUX_SUBPKG_PYTHON_RUNTIME_DEPS` (for subpkg) value.

> How to add a new Python package after this?

Everything is the same, except, now, this block is no longer necessary in `build.sh`.

```bash
termux_step_create_debscripts() {
	cat <<- EOF > ./postinst
	#!$TERMUX_PREFIX/bin/sh
	echo "Installing dependencies through pip..."
	pip3 install ${TERMUX_PKG_PYTHON_TARGET_DEPS//, / }
	EOF
}
```

- Instead, `scripts/build/termux_step_create_python_debscripts.sh` can now detect the presence of `pip` package lists in `$TERMUX_PKG_PYTHON_TARGET_DEPS`, `$TERMUX_SUBPKG_PYTHON_TARGET_DEPS`, and the `METADATA` file of the Python package if it exists, and automatically insert them as a block into the `postinst` script for all relevant packages.
- `$TERMUX_PKG_PYTHON_TARGET_DEPS` is used for `pip` dependencies that are both on-device build-time and on-device run-time dependencies, and `$TERMUX_PKG_PYTHON_RUNTIME_DEPS` is used for runtime-only `pip` dependencies. `$TERMUX_PKG_PYTHON_RUNTIME_DEPS` overrides `$TERMUX_PKG_PYTHON_TARGET_DEPS` for runtime dependencies,
  - i.e. if `TERMUX_PKG_PYTHON_RUNTIME_DEPS` is not specified, but `TERMUX_PKG_PYTHON_TARGET_DEPS` is, then `TERMUX_PKG_PYTHON_TARGET_DEPS` will be used as both on-device build and on-device runtime dependencies,
  - but if `TERMUX_PKG_PYTHON_RUNTIME_DEPS` is specified, then `TERMUX_PKG_PYTHON_TARGET_DEPS`, if specified, is used only for on-device build-time dependencies.
- If `python-pip` is not already in the dependencies of any package that needs it, the build will fail with an error instructing maintainers to add `python-pip` to the dependencies of the package that needs it.

Co-authored-by: Maxython <mixython@gmail.com>
2026-01-18 09:39:03 +00:00

204 lines
9.2 KiB
Diff
Raw Blame History

diff --git a/debpython/debpython/__init__.py b/debpython/debpython/__init__.py
index fa6b667..b3b63e1 100644
--- a/debpython/debpython/__init__.py
+++ b/debpython/debpython/__init__.py
@@ -8,7 +8,7 @@ from subprocess import PIPE, Popen
from pickle import dumps
log = logging.getLogger(__name__)
-PUBLIC_DIR_RE = re.compile(r'.*?/usr/lib/python(\d(?:.\d+)?)/(site|dist)-packages')
+PUBLIC_DIR_RE = re.compile(r'.*?@TERMUX_PREFIX@/lib/python(\d(?:.\d+)?)/(site|dist)-packages')
class memoize:
diff --git a/debpython/debpython/files.py b/debpython/debpython/files.py
index 39ef978..5899a7a 100644
--- a/debpython/debpython/files.py
+++ b/debpython/debpython/files.py
@@ -48,7 +48,20 @@ def from_package(package_name, extensions=('.py',)):
extensions = tuple(extensions) # .endswith doesn't like list
env = environ.copy()
env["LC_ALL"] = "C.UTF-8"
- process = Popen(('/usr/bin/dpkg', '-L', package_name), stdout=PIPE,
+ env["LD_PRELOAD"] = ""
+ process = Popen(['@TERMUX_PREFIX@/bin/bash', '-c',
+ 'source @TERMUX_PREFIX_CLASSICAL@/bin/termux-setup-package-manager && echo ${TERMUX_APP_PACKAGE_MANAGER}'],
+ stdout=PIPE)
+ termux_app_package_manager = process.communicate()[0].decode()[0:-1]
+ if termux_app_package_manager == "apt":
+ package_manager = "@TERMUX_PREFIX_CLASSICAL@/bin/dpkg"
+ package_manager_list_argument = "-L"
+ elif termux_app_package_manager == "pacman":
+ package_manager = "@TERMUX_PREFIX_CLASSICAL@/bin/pacman"
+ package_manager_list_argument = "-Qql"
+ else:
+ raise Exception(f"cannot determine system package manager ({termux_app_package_manager})!")
+ process = Popen((package_manager, package_manager_list_argument, package_name), stdout=PIPE,
stderr=PIPE, env=env)
stdout, stderr = process.communicate()
if process.returncode != 0:
diff --git a/debpython/debpython/interpreter.py b/debpython/debpython/interpreter.py
index 45b14db..6334661 100644
--- a/debpython/debpython/interpreter.py
+++ b/debpython/debpython/interpreter.py
@@ -171,16 +171,16 @@ class Interpreter:
#if not version:
# version = Version(DEFAULT)
if self.impl == 'pypy':
- path = '/usr/lib/pypy/dist-packages/'
+ path = '@TERMUX_PREFIX@/lib/pypy/dist-packages/'
elif version << Version('2.6'):
- path = "/usr/lib/python%s/site-packages/" % version
+ path = "@TERMUX_PREFIX@/lib/python%s/site-packages/" % version
elif version << Version('3.0'):
- path = "/usr/lib/python%s/dist-packages/" % version
+ path = "@TERMUX_PREFIX@/lib/python%s/dist-packages/" % version
else:
- path = '/usr/lib/python3/dist-packages/'
+ path = '@TERMUX_PREFIX@/lib/python@TERMUX_PYTHON_VERSION@/site-packages/'
if gdb:
- path = "/usr/lib/debug%s" % path
+ path = "@TERMUX_PREFIX@/lib/debug%s" % path
if package:
path = "debian/%s%s" % (package, path)
diff --git a/debpython/debpython/version.py b/debpython/debpython/version.py
index 2d7ed69..f4abf31 100644
--- a/debpython/debpython/version.py
+++ b/debpython/debpython/version.py
@@ -42,13 +42,8 @@ log = logging.getLogger(__name__)
_supported = environ.get('DEBPYTHON3_SUPPORTED')
_default = environ.get('DEBPYTHON3_DEFAULT')
if not _supported or not _default:
- _config = ConfigParser()
- _config.read('/usr/share/python3/debian_defaults')
- if not _default:
- _default = _config.get('DEFAULT', 'default-version')[6:]
- if not _supported:
- _supported = _config.get('DEFAULT', 'supported-versions')\
- .replace('python', '')
+ _supported = "@TERMUX_PYTHON_VERSION@"
+ _default = _supported
try:
DEFAULT = tuple(int(i) for i in _default.split('.'))
except Exception:
@@ -257,10 +252,10 @@ def get_requested_versions(vrange=None, available=None):
if available:
versions = set(v for v in versions
- if exists("/usr/bin/python%d.%d" % v))
+ if exists("@TERMUX_PREFIX@/bin/python%d.%d" % v))
elif available is False:
versions = set(v for v in versions
- if not exists("/usr/bin/python%d.%d" % v))
+ if not exists("@TERMUX_PREFIX@/bin/python%d.%d" % v))
return versions
diff --git a/debpython/py3clean b/debpython/py3clean
index 8e7c3f3..62edeb5 100755
--- a/debpython/py3clean
+++ b/debpython/py3clean
@@ -1,4 +1,4 @@
-#! /usr/bin/python3
+#! @TERMUX_PREFIX@/bin/python@TERMUX_PYTHON_VERSION@
# vim: et ts=4 sw=4
# Copyright © 2010-2012 Piotr Ożarowski <piotr@debian.org>
@@ -27,7 +27,7 @@ import sys
from glob import glob
from os import environ, remove, rmdir
from os.path import dirname, basename, exists, join, splitext
-sys.path.insert(1, '/usr/share/python3/')
+sys.path.insert(1, '@TERMUX_PREFIX@/lib/python@TERMUX_PYTHON_VERSION@/')
from debpython import files as dpf
from debpython.interpreter import Interpreter
from debpython.version import SUPPORTED, getver, vrepr
@@ -156,13 +156,13 @@ def destroyer(magic_tag=None): # ;-)
def main():
usage = '%prog [-V VERSION] [-p PACKAGE] [DIR_OR_FILE]'
- parser = optparse.OptionParser(usage, version='%prog DEVELV')
+ parser = optparse.OptionParser(usage, version='%prog @TERMUX_PKG_FULLVERSION@')
parser.add_option('-v', '--verbose', action='store_true', dest='verbose',
help='turn verbose mode on')
parser.add_option('-q', '--quiet', action='store_false', dest='verbose',
default=False, help='be quiet')
parser.add_option('-p', '--package',
- help='specify Debian package name to clean')
+ help='specify Termux package name to clean')
parser.add_option('-V', dest='version',
help='specify Python version to clean')
diff --git a/debpython/py3compile b/debpython/py3compile
index 14cbf4e..f2b0fed 100755
--- a/debpython/py3compile
+++ b/debpython/py3compile
@@ -1,4 +1,4 @@
-#! /usr/bin/python3
+#! @TERMUX_PREFIX@/bin/python@TERMUX_PYTHON_VERSION@
# vim: et ts=4 sw=4
# Copyright © 2010-2012 Piotr Ożarowski <piotr@debian.org>
@@ -30,7 +30,7 @@ import sys
from os import environ, listdir, mkdir
from os.path import dirname, exists, isdir, join
from subprocess import PIPE, Popen
-sys.path.insert(1, '/usr/share/python3/')
+sys.path.insert(1, '@TERMUX_PREFIX@/lib/python@TERMUX_PYTHON_VERSION@/')
from debpython.version import SUPPORTED, debsorted, vrepr, \
get_requested_versions, parse_vrange, getver
from debpython import files as dpf, PUBLIC_DIR_RE, memoize
@@ -56,7 +56,7 @@ Examples:
### EXCLUDES ###################################################
@memoize
-def get_exclude_patterns_from_dir(name='/usr/share/python3/bcep/'):
+def get_exclude_patterns_from_dir(name='@TERMUX_PREFIX@/share/python3/bcep/'):
"""Return patterns for files that shouldn't be bytecompiled."""
if not isdir(name):
return []
@@ -156,7 +156,7 @@ def filter_files(files, e_patterns, compile_versions):
def py_compile(version, optimize, workers):
if not isinstance(version, str):
version = vrepr(version)
- cmd = ["/usr/bin/python" + version]
+ cmd = ["@TERMUX_PREFIX@/bin/python" + version]
if optimize:
cmd.append("-O")
cmd += ["-m", "py_compile", "-"]
@@ -224,7 +224,7 @@ def compile(files, versions, force, optimize, e_patterns=None):
def main():
usage = '%prog [-V [X.Y][-][A.B]] DIR_OR_FILE [-X REGEXPR]\n' +\
' %prog -p PACKAGE'
- parser = optparse.OptionParser(usage, version='%prog DEVELV',
+ parser = optparse.OptionParser(usage, version='%prog @TERMUX_PKG_FULLVERSION@',
option_class=Option)
parser.add_option('-v', '--verbose', action='store_true', dest='verbose',
help='turn verbose mode on')
@@ -236,7 +236,7 @@ def main():
parser.add_option('-O', action='store_true', dest='optimize',
default=False, help="byte-compile to .pyo files")
parser.add_option('-p', '--package',
- help='specify Debian package name whose files should be bytecompiled')
+ help='specify Termux package name whose files should be bytecompiled')
parser.add_option('-V', type='version_range', dest='vrange',
help="""force private modules to be bytecompiled
with Python version from given range, regardless of the default Python version
@@ -262,12 +262,12 @@ You may use this option multiple times to build up a list of things to exclude.'
if options.regexpr and not args:
parser.error('--exclude option works with private directories '
- 'only, please use /usr/share/python3/bcep to specify '
+ 'only, please use @TERMUX_PREFIX@/share/python3/bcep to specify '
'public modules to skip')
if options.vrange and options.vrange[0] == options.vrange[1] and\
options.vrange != (None, None) and\
- exists("/usr/bin/python%d.%d" % options.vrange[0]):
+ exists("@TERMUX_PREFIX@/bin/python%d.%d" % options.vrange[0]):
# specific version requested, use it even if it's not in SUPPORTED
versions = {options.vrange[0]}
else:
Reference in New Issue View Git Blame Copy Permalink