From 351e49ce7fd1ca848872ea0319ca88111c3dd861 Mon Sep 17 00:00:00 2001 From: BKSteve Date: Wed, 13 Nov 2024 17:19:15 +0700 Subject: [PATCH 1/3] rebase --- spk/sickchill/Makefile | 11 ++- spk/sickchill/src/requirements-crossenv.txt | 16 +-- spk/sickchill/src/requirements-pure.txt | 103 ++++++++++---------- 3 files changed, 68 insertions(+), 62 deletions(-) diff --git a/spk/sickchill/Makefile b/spk/sickchill/Makefile index bab1eaf2196..7981c7850e9 100644 --- a/spk/sickchill/Makefile +++ b/spk/sickchill/Makefile @@ -1,6 +1,6 @@ SPK_NAME = sickchill -SPK_VERS = 20230627 -SPK_REV = 10 +SPK_VERS = 20240301 +SPK_REV = 11 SPK_ICON = src/sickchill.png PYTHON_PACKAGE = python311 @@ -8,7 +8,7 @@ PYTHON_PACKAGE = python311 SPK_DEPENDS = "python311>=3.11.5-8" # archs without C++11 support are not supported: -UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS) +UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS) $(ARMv7L_ARCHS) # [lxml] DEPENDS += cross/libxml2 @@ -21,6 +21,9 @@ ENV += SODIUM_INSTALL=system # [cryptography] DEPENDS += cross/cryptography +# [mediainfo] +DEPENDS += cross/mediainfo + WHEELS = src/requirements-crossenv.txt src/requirements-pure.txt @@ -28,7 +31,7 @@ MAINTAINER = miigotu DESCRIPTION = Automatic Video Library Manager for TV Shows. It watches for new episodes of your favorite shows, and when they are posted it does its magic. STARTABLE = yes DISPLAY_NAME = SickChill -CHANGELOG = "1. A wheel based install, git installs are not supported by upstream.
2. Python update to 3.11
3. Deprecated ARMv5 (88f628x) as no compiler support for updated dependencies
4. Migrate to OpenSSL 3.1.2
5. Fix for newer shared python" +CHANGELOG = "1. A wheel based install, git installs not supported by upstream.
2. Python update to 3.11.10, OpenSSL 3.1.2
3. Deprecated ARMv5/7 as no compiler support for updated dependencies" HOMEPAGE = https://sickchill.github.io/ LICENSE = GPLv3+ diff --git a/spk/sickchill/src/requirements-crossenv.txt b/spk/sickchill/src/requirements-crossenv.txt index a8acdb27ac1..c1d9a3ec3e0 100644 --- a/spk/sickchill/src/requirements-crossenv.txt +++ b/spk/sickchill/src/requirements-crossenv.txt @@ -1,10 +1,10 @@ -cffi==1.15.1 +cffi==1.17.0 # cryptography ==> cross/cryptography -greenlet==2.0.2 -lxml==4.9.2 -MarkupSafe==2.1.2 -msgpack==1.0.5 +greenlet==3.0.3 +lxml==5.3.0 +MarkupSafe==2.1.5 +msgpack==1.0.7 PyNaCl==1.5.0 -SQLAlchemy==2.0.12 -tornado==6.2 -wrapt==1.15.0 +SQLAlchemy==2.0.32 +tornado==6.4 +wrapt==1.16.0 diff --git a/spk/sickchill/src/requirements-pure.txt b/spk/sickchill/src/requirements-pure.txt index 09b2f03ad2c..c1e2f0926bd 100644 --- a/spk/sickchill/src/requirements-pure.txt +++ b/spk/sickchill/src/requirements-pure.txt @@ -1,88 +1,91 @@ -sickchill==2023.6.27 +sickchill==2024.3.1 appdirs==1.4.4 -attrs==22.2.0 -babelfish==0.6.0 -beautifulsoup4==4.12.0 +attrs==24.2.0 +babelfish==0.6.1 +beautifulsoup4==4.12.3 beekeeper-alt==2022.9.3 bencode.py==4.0.0 -CacheControl==0.12.11 -cacheyou==23.2 +CacheControl==0.14.1 # certifi ==> python 3.11 # cffi ==> crossenv -chardet==5.1.0 -charset-normalizer==3.1.0 -cinemagoer==2022.12.27 -click==8.1.3 -configobj==5.0.8 +chardet==5.2.0 +charset-normalizer==3.4.0 +cinemagoer==2023.5.1 +click==8.1.7 +configobj==5.0.9 # cryptography ==> cross/cryptography decorator==5.1.1 -deluge-client==1.9.0 -Deprecated==1.2.13 -dogpile.cache==1.1.8 -enzyme==0.4.1 -Flask==2.2.3 -future==0.18.3 +deluge-client==1.10.2 +Deprecated==1.2.14 +dogpile.cache==1.3.3 +enzyme==0.5.2 +Flask==3.0.3 +flask-sqlalchemy==3.1.1 +future==1.0.0 gntp==1.0.3 # greenlet ==> crossenv -guessit==3.7.1 -idna==3.4 +guessit==3.8.0 +html5lib==1.1 +idna==3.10 ifaddr==0.2.0 imagesize==1.4.1 -IMDbPY==2022.7.9 ipaddress==1.0.23 -jsonrpclib-pelix==0.4.3.2 +jsonrpclib-pelix==0.4.3.3 +Js2Py==0.74 +jwt==1.3.1 kodipydent-alt==2022.9.3 # lxml ==> crossenv -Mako==1.2.4 -markdown2==2.4.8 +Mako==1.3.6 +markdown2==2.5.1 # MarkupSafe ==> crossenv -mock==5.0.1 +# mock==5.1.0 ==> test remove # msgpack ==> crossenv new-rtorrent-python==1.0.1a0 oauthlib==3.2.2 -packaging==23.0 -pbr==5.11.1 -pluggy==1.0.0 -profilehooks==1.12.0 +packaging==24.2 +pbr==6.1.0 +pluggy==1.5.0 +profilehooks==1.13.0 putio.py==8.7.0 -pycparser==2.21 -PyGithub==1.58.1 -PyJWT==2.6.0 -pymediainfo==6.0.1 +pycparser==2.22 +PyGithub==2.5.0 +PyJWT==2.9.0 +pymediainfo==6.1.0 # PyNaCl ==> crossenv PyNMA==1.0 -pyOpenSSL==23.2.0 -pyparsing==3.0.9 +pyOpenSSL==24.2.1 +pyparsing==3.2.0 pysrt==1.1.2 -pytest==7.2.2 -python-dateutil==2.8.2 -python-slugify==8.0.1 +# pytest==8.3.3 ==> test remove +python-dateutil==2.9.0.post0 +python-slugify==8.0.4 python-twitter==3.5 python3-fanart==2.0.0 -pytz==2023.2 -qbittorrent-api==2023.3.44 -rarfile==4.0 +pytz==2024.2 +qbittorrent-api==2024.10.68 +rarfile==4.2 rebulk==3.2.0 -requests==2.28.2 -requests-oauthlib==1.3.1 -Send2Trash==1.8.0 +requests==2.32.3 +requests-oauthlib==2.0.0 +Send2Trash==1.8.3 # setuptool ==> python 3.11 # six ==> python 3.11 -soupsieve==2.4 +soupsieve==2.6 # SQLAlchemy ==> crossenv -stevedore==5.0.0 -subliminal==2.1.0 +stevedore==5.3.0 +subliminal==2.2.1 text-unidecode==1.3 timeago==1.0.16 tmdbsimple==2.9.1 # tornado ==> crossenv tus.py==1.3.4 tvdbsimple==1.0.6 -Unidecode==1.3.6 -urllib3==1.26.15 -validators==0.20.0 +Unidecode==1.3.8 +urllib3==2.2.3 +validators==0.34.0 # virtualenv ==> python 3.11 win-inet-pton==1.1.0 # wrapt ==> crossenv -xmltodict==0.13.0 +xmltodict==0.14.2 +zipp==3.21.0 From b5f014c04adfaf3bfeb9a3712042dc6ab1401d5b Mon Sep 17 00:00:00 2001 From: hgy59 Date: Fri, 15 Nov 2024 13:39:41 +0100 Subject: [PATCH 2/3] sickchill: adjust requirements - remove obsolete requirements - remove requirements not referenced by sickchill - including requirements for dev package and git installs - update greenlet and add version specific requirements files - use greenlet==3.1.1 for DSM 7 (gcc >= 5) - limit greenlet to 3.1.0 for gcc < 5 - downgrade pyOpenSSL to 23.2.0 (compatible with cryptography==41.0.3) - enable build for ARMv7L - move charset_normalizer to crossenv requirements --- spk/sickchill/Makefile | 21 ++++++------ .../requirements-crossenv-greenlet-latest.txt | 3 ++ .../src/requirements-crossenv-greenlet-v3.txt | 4 +++ spk/sickchill/src/requirements-crossenv.txt | 15 ++++----- spk/sickchill/src/requirements-pure.txt | 32 +++++-------------- 5 files changed, 31 insertions(+), 44 deletions(-) create mode 100644 spk/sickchill/src/requirements-crossenv-greenlet-latest.txt create mode 100644 spk/sickchill/src/requirements-crossenv-greenlet-v3.txt diff --git a/spk/sickchill/Makefile b/spk/sickchill/Makefile index 7981c7850e9..c0d5de69784 100644 --- a/spk/sickchill/Makefile +++ b/spk/sickchill/Makefile @@ -7,23 +7,16 @@ PYTHON_PACKAGE = python311 SPK_DEPENDS = "python311>=3.11.5-8" -# archs without C++11 support are not supported: -UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS) $(ARMv7L_ARCHS) +# archs without C++11 support are not supported [greenlet] +UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS) # [lxml] DEPENDS += cross/libxml2 DEPENDS += cross/libxslt -# [PyNaCl] -DEPENDS += cross/libsodium -ENV += SODIUM_INSTALL=system - # [cryptography] DEPENDS += cross/cryptography -# [mediainfo] -DEPENDS += cross/mediainfo - WHEELS = src/requirements-crossenv.txt src/requirements-pure.txt @@ -31,7 +24,7 @@ MAINTAINER = miigotu DESCRIPTION = Automatic Video Library Manager for TV Shows. It watches for new episodes of your favorite shows, and when they are posted it does its magic. STARTABLE = yes DISPLAY_NAME = SickChill -CHANGELOG = "1. A wheel based install, git installs not supported by upstream.
2. Python update to 3.11.10, OpenSSL 3.1.2
3. Deprecated ARMv5/7 as no compiler support for updated dependencies" +CHANGELOG = "1. A wheel based install, git installs not supported by upstream.
2. Python update to 3.11.10, OpenSSL 3.1.7
3. Deprecated ARMv5 (88f628x) as no compiler support for updated dependencies" HOMEPAGE = https://sickchill.github.io/ LICENSE = GPLv3+ @@ -55,13 +48,17 @@ include ../../mk/spksrc.python.mk ifeq ($(call version_lt, $(TC_GCC), 4.8.1),1) -# archs without C++11 support are not supported: -UNSUPPORTED_ARCHS = $(ARCHS) +# archs without C++11 support are not supported [greenlet] +UNSUPPORTED_ARCHS = $(ARCH) endif # [greenlet] ifeq ($(call version_lt, ${TC_GCC}, 5.0),1) WHEELS_CPPFLAGS = [greenlet] -std=c++11 -fpermissive +# supported version <=3.1.0 +WHEELS += src/requirements-crossenv-greenlet-v3.txt +else +WHEELS += src/requirements-crossenv-greenlet-latest.txt endif # prefere native python tools (pip, maturin, ...) diff --git a/spk/sickchill/src/requirements-crossenv-greenlet-latest.txt b/spk/sickchill/src/requirements-crossenv-greenlet-latest.txt new file mode 100644 index 00000000000..96cc0a6f3be --- /dev/null +++ b/spk/sickchill/src/requirements-crossenv-greenlet-latest.txt @@ -0,0 +1,3 @@ +# [greenlet] +# - Mandatory require full c++11 support +greenlet==3.1.1 diff --git a/spk/sickchill/src/requirements-crossenv-greenlet-v3.txt b/spk/sickchill/src/requirements-crossenv-greenlet-v3.txt new file mode 100644 index 00000000000..e1474f4f5aa --- /dev/null +++ b/spk/sickchill/src/requirements-crossenv-greenlet-v3.txt @@ -0,0 +1,4 @@ +# [greenlet] +# - Mandatory require full c++11 support +# - latest version supported by ARMv7L (arch-hi3535) +greenlet==3.1.0 diff --git a/spk/sickchill/src/requirements-crossenv.txt b/spk/sickchill/src/requirements-crossenv.txt index c1d9a3ec3e0..06591f5282c 100644 --- a/spk/sickchill/src/requirements-crossenv.txt +++ b/spk/sickchill/src/requirements-crossenv.txt @@ -1,10 +1,9 @@ -cffi==1.17.0 +cffi==1.17.1 +charset_normalizer==3.4.0 # cryptography ==> cross/cryptography -greenlet==3.0.3 +#greenlet==3.1.1 ==> dedicated requirements file lxml==5.3.0 -MarkupSafe==2.1.5 -msgpack==1.0.7 -PyNaCl==1.5.0 -SQLAlchemy==2.0.32 -tornado==6.4 -wrapt==1.16.0 +MarkupSafe==3.0.2 +msgpack==1.1.0 +SQLAlchemy==2.0.36 +tornado==6.4.1 diff --git a/spk/sickchill/src/requirements-pure.txt b/spk/sickchill/src/requirements-pure.txt index c1e2f0926bd..51ec1185ab8 100644 --- a/spk/sickchill/src/requirements-pure.txt +++ b/spk/sickchill/src/requirements-pure.txt @@ -1,7 +1,6 @@ sickchill==2024.3.1 appdirs==1.4.4 -attrs==24.2.0 babelfish==0.6.1 beautifulsoup4==4.12.3 beekeeper-alt==2022.9.3 @@ -10,54 +9,40 @@ CacheControl==0.14.1 # certifi ==> python 3.11 # cffi ==> crossenv chardet==5.2.0 -charset-normalizer==3.4.0 +# charset-normalizer==3.4.0 ==> crossenv cinemagoer==2023.5.1 click==8.1.7 configobj==5.0.9 # cryptography ==> cross/cryptography decorator==5.1.1 deluge-client==1.10.2 -Deprecated==1.2.14 dogpile.cache==1.3.3 -enzyme==0.5.2 -Flask==3.0.3 -flask-sqlalchemy==3.1.1 +enzyme==0.4.1 future==1.0.0 gntp==1.0.3 # greenlet ==> crossenv guessit==3.8.0 -html5lib==1.1 idna==3.10 ifaddr==0.2.0 imagesize==1.4.1 ipaddress==1.0.23 jsonrpclib-pelix==0.4.3.3 -Js2Py==0.74 -jwt==1.3.1 kodipydent-alt==2022.9.3 # lxml ==> crossenv Mako==1.3.6 markdown2==2.5.1 # MarkupSafe ==> crossenv -# mock==5.1.0 ==> test remove # msgpack ==> crossenv new-rtorrent-python==1.0.1a0 oauthlib==3.2.2 -packaging==24.2 +packaging==23.2 pbr==6.1.0 -pluggy==1.5.0 profilehooks==1.13.0 putio.py==8.7.0 pycparser==2.22 -PyGithub==2.5.0 -PyJWT==2.9.0 -pymediainfo==6.1.0 -# PyNaCl ==> crossenv PyNMA==1.0 -pyOpenSSL==24.2.1 -pyparsing==3.2.0 +pyOpenSSL==23.2.0 pysrt==1.1.2 -# pytest==8.3.3 ==> test remove python-dateutil==2.9.0.post0 python-slugify==8.0.4 python-twitter==3.5 @@ -69,23 +54,22 @@ rebulk==3.2.0 requests==2.32.3 requests-oauthlib==2.0.0 Send2Trash==1.8.3 -# setuptool ==> python 3.11 +# setuptools ==> python 3.11 # six ==> python 3.11 soupsieve==2.6 # SQLAlchemy ==> crossenv stevedore==5.3.0 -subliminal==2.2.1 +subliminal==2.1.0 text-unidecode==1.3 timeago==1.0.16 tmdbsimple==2.9.1 # tornado ==> crossenv tus.py==1.3.4 tvdbsimple==1.0.6 +typing_extensions==4.12.2 Unidecode==1.3.8 urllib3==2.2.3 -validators==0.34.0 +validators==0.22.0 # virtualenv ==> python 3.11 win-inet-pton==1.1.0 -# wrapt ==> crossenv xmltodict==0.14.2 -zipp==3.21.0 From 83a77a0e398363d9ad7fbedc50f45ab22f059ce0 Mon Sep 17 00:00:00 2001 From: hgy59 Date: Sat, 16 Nov 2024 16:03:19 +0100 Subject: [PATCH 3/3] add requirements for optional "speedups" feature --- spk/sickchill/src/requirements-pure.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/spk/sickchill/src/requirements-pure.txt b/spk/sickchill/src/requirements-pure.txt index 51ec1185ab8..734d179b652 100644 --- a/spk/sickchill/src/requirements-pure.txt +++ b/spk/sickchill/src/requirements-pure.txt @@ -5,7 +5,7 @@ babelfish==0.6.1 beautifulsoup4==4.12.3 beekeeper-alt==2022.9.3 bencode.py==4.0.0 -CacheControl==0.14.1 +cachecontrol==0.14.1 # certifi ==> python 3.11 # cffi ==> crossenv chardet==5.2.0 @@ -73,3 +73,12 @@ validators==0.22.0 # virtualenv ==> python 3.11 win-inet-pton==1.1.0 xmltodict==0.14.2 + + +# requirements for optional "speedups" feature +html5lib==1.1 +Js2Py==0.74 +pyjsparser==2.7.1 +pymediainfo==6.1.0 +tzlocal==5.2 +webencodings==0.5.1