update to py3-telegram-0.16.0, tested with net/tg
patch to drop RDEP on setuptools, it's only used to locate the bundled linux/darwin libs which we remove anyway (there's a newer version, but it needs an extra dep)
This commit is contained in:
parent
68cf916b42
commit
77c488cf43
|
@ -1,10 +1,9 @@
|
||||||
COMMENT = Python wrapper for Telegram tdlib
|
COMMENT = Python wrapper for Telegram tdlib
|
||||||
|
|
||||||
MODPY_EGG_VERSION = 0.15.0
|
MODPY_EGG_VERSION = 0.16.0
|
||||||
|
|
||||||
DISTNAME = python-telegram-${MODPY_EGG_VERSION}
|
DISTNAME = python-telegram-${MODPY_EGG_VERSION}
|
||||||
PKGNAME = ${DISTNAME:S/^python-/py-/}
|
PKGNAME = ${DISTNAME:S/^python-/py-/}
|
||||||
REVISION = 1
|
|
||||||
|
|
||||||
CATEGORIES = net
|
CATEGORIES = net
|
||||||
|
|
||||||
|
@ -13,16 +12,16 @@ HOMEPAGE = https://github.com/alexander-akhmetov/python-telegram
|
||||||
# MIT
|
# MIT
|
||||||
PERMIT_PACKAGE = Yes
|
PERMIT_PACKAGE = Yes
|
||||||
|
|
||||||
MODULES = lang/python
|
MODULES = lang/python
|
||||||
|
|
||||||
MODPY_PI = Yes
|
MODPY_PI = Yes
|
||||||
|
MODPY_PYBUILD = setuptools
|
||||||
|
|
||||||
FLAVORS = python3
|
FLAVORS = python3
|
||||||
FLAVOR = python3
|
FLAVOR = python3
|
||||||
|
|
||||||
RUN_DEPENDS = devel/py-setuptools${MODPY_FLAVOR} \
|
RUN_DEPENDS = net/tdlib
|
||||||
net/tdlib
|
NO_TEST = Yes
|
||||||
MODPY_PYTEST = No
|
|
||||||
|
|
||||||
# remove bundled binaries
|
# remove bundled binaries
|
||||||
post-install:
|
post-install:
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
SHA256 (python-telegram-0.15.0.tar.gz) = Na2NIiVgYexKbEqjN58hfkgxwFdCTL7Z7D3WEhL4wXA=
|
SHA256 (python-telegram-0.16.0.tar.gz) = uNRy6DKSdOqfqW0QFMqpGowP1VEL7xa+3iR1nDWIKxo=
|
||||||
SIZE (python-telegram-0.15.0.tar.gz) = 14943955
|
SIZE (python-telegram-0.16.0.tar.gz) = 15597183
|
||||||
|
|
|
@ -1,27 +1,16 @@
|
||||||
use system tdjson, not the bundled one
|
we have the system library and ctypes.util.find_library("tdjson") finds it
|
||||||
|
correctly, the fallback to pkg_resources isn't used (and wouldn't work anyway
|
||||||
|
as that only provides linux/darwin libraries so they're removed)
|
||||||
|
|
||||||
Index: telegram/tdjson.py
|
Index: telegram/tdjson.py
|
||||||
--- telegram/tdjson.py.orig
|
--- telegram/tdjson.py.orig
|
||||||
+++ telegram/tdjson.py
|
+++ telegram/tdjson.py
|
||||||
@@ -2,6 +2,7 @@ import json
|
@@ -5,8 +5,6 @@ import ctypes.util
|
||||||
import logging
|
|
||||||
import platform
|
|
||||||
from ctypes import CDLL, CFUNCTYPE, c_int, c_char_p, c_double, c_void_p, c_longlong
|
from ctypes import CDLL, CFUNCTYPE, c_int, c_char_p, c_double, c_void_p, c_longlong
|
||||||
+from ctypes.util import find_library
|
|
||||||
from typing import Any, Dict, Optional, Union
|
from typing import Any, Dict, Optional, Union
|
||||||
|
|
||||||
import pkg_resources
|
-import pkg_resources
|
||||||
@@ -10,12 +11,7 @@ logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
def _get_tdjson_lib_path() -> str:
|
|
||||||
- if platform.system().lower() == 'darwin':
|
|
||||||
- lib_name = 'darwin/libtdjson.dylib'
|
|
||||||
- else:
|
|
||||||
- lib_name = 'linux/libtdjson.so'
|
|
||||||
-
|
-
|
||||||
- return pkg_resources.resource_filename('telegram', f'lib/{lib_name}')
|
logger = logging.getLogger(__name__)
|
||||||
+ return find_library('tdjson')
|
|
||||||
|
|
||||||
|
|
||||||
class TDJson:
|
|
||||||
|
|
|
@ -1,11 +1,20 @@
|
||||||
lib/python${MODPY_VERSION}/site-packages/python_telegram-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
|
lib/python${MODPY_VERSION}/site-packages/python_telegram-${MODPY_EGG_VERSION}.dist-info/
|
||||||
|
lib/python${MODPY_VERSION}/site-packages/python_telegram-${MODPY_EGG_VERSION}.dist-info/METADATA
|
||||||
|
lib/python${MODPY_VERSION}/site-packages/python_telegram-${MODPY_EGG_VERSION}.dist-info/RECORD
|
||||||
|
lib/python${MODPY_VERSION}/site-packages/python_telegram-${MODPY_EGG_VERSION}.dist-info/WHEEL
|
||||||
|
lib/python${MODPY_VERSION}/site-packages/python_telegram-${MODPY_EGG_VERSION}.dist-info/top_level.txt
|
||||||
lib/python${MODPY_VERSION}/site-packages/telegram/
|
lib/python${MODPY_VERSION}/site-packages/telegram/
|
||||||
lib/python${MODPY_VERSION}/site-packages/telegram/__init__.py
|
lib/python${MODPY_VERSION}/site-packages/telegram/__init__.py
|
||||||
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}/
|
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}/
|
||||||
|
lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||||
lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
|
lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
|
||||||
|
lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||||
lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
|
lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
|
||||||
|
lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}tdjson.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||||
lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}tdjson.${MODPY_PYC_MAGIC_TAG}pyc
|
lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}tdjson.${MODPY_PYC_MAGIC_TAG}pyc
|
||||||
|
lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||||
lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
|
lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
|
||||||
|
lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}worker.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||||
lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}worker.${MODPY_PYC_MAGIC_TAG}pyc
|
lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}worker.${MODPY_PYC_MAGIC_TAG}pyc
|
||||||
lib/python${MODPY_VERSION}/site-packages/telegram/client.py
|
lib/python${MODPY_VERSION}/site-packages/telegram/client.py
|
||||||
lib/python${MODPY_VERSION}/site-packages/telegram/tdjson.py
|
lib/python${MODPY_VERSION}/site-packages/telegram/tdjson.py
|
||||||
|
|
Loading…
Reference in New Issue
Block a user