diff --git a/spk/flexget/Makefile b/spk/flexget/Makefile index ee3ad0eb831..5238d7ec878 100644 --- a/spk/flexget/Makefile +++ b/spk/flexget/Makefile @@ -1,6 +1,6 @@ SPK_NAME = flexget -SPK_VERS = 3.7.10 -SPK_REV = 13 +SPK_VERS = 3.13.16 +SPK_REV = 14 SPK_ICON = src/${SPK_NAME}.png PYTHON_PACKAGE = python311 @@ -10,7 +10,7 @@ WHEELS = src/requirements-crossenv.txt src/requirements-pure.txt MAINTAINER = SynoCommunity DESCRIPTION = FlexGet is a multipurpose automation tool for content like torrents, nzbs, podcasts, comics, series, movies, etc. It can use different kinds of sources like RSS-feeds, html pages, csv files, search engines and there are even plugins for sites that do not provide any kind of useful feeds. DISPLAY_NAME = FlexGet -CHANGELOG = "1. Update FlexGet to version 3.7.10
2. Migrate to python 3.11" +CHANGELOG = "1. Update FlexGet to version 3.13.16" STARTABLE = yes HOMEPAGE = https://flexget.com/ @@ -32,23 +32,24 @@ USE_ALTERNATE_TMPDIR = 1 SPK_USR_LOCAL_LINKS = bin:env/bin/flexget bin:env/bin/flexget-headless -# [cryptography] -DEPENDS += cross/cryptography - -# [greenlet] == 2.0.1 -# gcc < 4.9 only supports greenlet v1.x -UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(ARMv7L_ARCHS) $(OLD_PPC_ARCHS) - -# [PyYAML] -DEPENDS += cross/libyaml +# Needs atomic to build +UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS) $(ARMv7L_ARCHS) include ../../mk/spksrc.python.mk -# [greenlet] == 2.0.1 -ifeq ($(call version_lt, $(TC_GCC), 5.0),1) +# [greenlet] +ifeq ($(call version_ge, $(TC_GCC), 5.0),1) +WHEELS += src/requirements-crossenv-greenlet-v3.txt +else ifeq ($(call version_ge, $(TC_GCC), 4.9)$(call version_lt, $(TC_GCC), 5.0),11) +WHEELS += src/requirements-crossenv-greenlet-v3-gcc4.txt WHEELS_CPPFLAGS += [greenlet] -std=c++11 -fpermissive +else +WHEELS += src/requirements-crossenv-greenlet-v1.txt endif +# [Pendulum] +DEPENDS += cross/pendulum + .PHONY: flexget_extra_install flexget_extra_install: install -m 644 src/config.yml $(STAGING_DIR)/share/ diff --git a/spk/flexget/src/requirements-crossenv-greenlet-v1.txt b/spk/flexget/src/requirements-crossenv-greenlet-v1.txt new file mode 100644 index 00000000000..eab2e8a8b4f --- /dev/null +++ b/spk/flexget/src/requirements-crossenv-greenlet-v1.txt @@ -0,0 +1,9 @@ +## +## All configurations below are optional and +## are provided to demonstrate how to build +## various wheels. Uncoment to enable. +## + +# [greenlet] +# - gcc < 5.0 (DSM6) Last known working version +greenlet==1.1.3 diff --git a/spk/flexget/src/requirements-crossenv-greenlet-v3-gcc4.txt b/spk/flexget/src/requirements-crossenv-greenlet-v3-gcc4.txt new file mode 100644 index 00000000000..c2b4802c7ad --- /dev/null +++ b/spk/flexget/src/requirements-crossenv-greenlet-v3-gcc4.txt @@ -0,0 +1,9 @@ +## +## All configurations below are optional and +## are provided to demonstrate how to build +## various wheels. Uncoment to enable. +## + +# [greenlet] +# - Mandatory require full c++11 support +greenlet==3.0.3 diff --git a/spk/flexget/src/requirements-crossenv-greenlet-v3.txt b/spk/flexget/src/requirements-crossenv-greenlet-v3.txt new file mode 100644 index 00000000000..5bbea72b664 --- /dev/null +++ b/spk/flexget/src/requirements-crossenv-greenlet-v3.txt @@ -0,0 +1,9 @@ +## +## All configurations below are optional and +## are provided to demonstrate how to build +## various wheels. Uncoment to enable. +## + +# [greenlet] +# - Mandatory require full c++20 support added with gcc >= 8 +greenlet==3.1.1 diff --git a/spk/flexget/src/requirements-crossenv.txt b/spk/flexget/src/requirements-crossenv.txt index cecb992fe44..fdd7b99930a 100644 --- a/spk/flexget/src/requirements-crossenv.txt +++ b/spk/flexget/src/requirements-crossenv.txt @@ -1,21 +1,13 @@ -# Snapshot from Jul. 23rd 2023 +# Snapshot from Jan. 18th 2025 -aniso8601==9.0.1 -Brotli==1.0.9 -cffi==1.15.1 -charset-normalizer==2.1.1 -#cryptography ==> cross/cryptography -dulwich==0.21.5 -greenlet==2.0.1 -MarkupSafe==2.1.1 -msgpack==1.0.5 -psutil==5.9.4 -pydantic==1.10.2 -pyrsistent==0.19.2 +Brotli==1.1.0 +charset-normalizer==3.4.1 +#greenlet==3.1.1 => supported version depends on gcc version +MarkupSafe==3.0.2 +#pendulum==3.0.0 => cross/pendulum +psutil==6.1.1 PyYAML==6.0.2 -SQLAlchemy==2.0.15 - -# Building will generate a non-optimized build: py3-none-any -# At installation time it will pip download a c++17 compiled -# optimized build, in case of failure fall-back on this one. -rapidfuzz==2.15.1 +rpds-py==0.22.3 +SQLAlchemy==2.0.37 +time-machine==2.16.0 +zstandard==0.23.0 diff --git a/spk/flexget/src/requirements-pure.txt b/spk/flexget/src/requirements-pure.txt index 9bee2066890..15a0098b45f 100644 --- a/spk/flexget/src/requirements-pure.txt +++ b/spk/flexget/src/requirements-pure.txt @@ -1,109 +1,76 @@ -# Snapshot from Jul. 23rd 2023 +# Snapshot from Jan. 18th 2025 -#aniso8601 ==> crossenv -APScheduler==3.10.1 -attrs==22.1.0 +aniso8601==10.0.0 +APScheduler==3.11.0 +attrs==24.3.0 autocommand==2.2.2 -babelfish==0.6.0 -beautifulsoup4==4.11.1 -#Brotli ==> crossenv -build==0.10.0 -CacheControl==0.12.14 -cachy==0.3.0 -#certifi ==> py311 -#cffi ==> crossenv -chardet==5.1.0 -cheroot==9.0.0 -CherryPy==18.8.0 -cleo==2.0.1 -click==8.1.3 -clikit==0.5.1 +babelfish==0.6.1 +backports.tarfile==1.2.0 +beautifulsoup4==4.12.3 +blinker==1.9.0 +#Brotli ==> crossenv +#certifi ==> py311 +#charset-normalizer ==> crossenv +cheroot==10.0.1 +CherryPy==18.10.0 +click==8.1.8 colorama==0.4.6 -colorclass==2.2.2 -commonmark==0.9.1 -crashtest==0.4.1 -#cryptography ==> cross/cryptography -#distlib ==> py311 -feedparser==6.0.10 -#filelock ==> py311 -Flask==2.2.5 -Flask-Compress==1.13 -Flask-Cors==3.0.10 -Flask-Login==0.6.2 -Flask-RESTful==0.3.9 -flask-restx==1.0.3 -FlexGet==3.7.10 -#greenlet ==> crossenv -guessit==3.5.0 +feedparser==6.0.11 +Flask==3.1.0 +Flask-Compress==1.17 +Flask-Cors==5.0.0 +Flask-Login==0.6.3 +flask-restx==1.3.0 +FlexGet==3.13.16 +#greenlet ==> crossenv +guessit==3.8.0 html5lib==1.1 -idna==3.4 -importlib-metadata==6.8.0 -inflect==6.0.2 -installer==0.7.0 -itsdangerous==2.1.2 -jaraco.classes==3.2.3 -jaraco.collections==3.8.0 -jaraco.context==4.2.0 -jaraco.functools==3.5.2 -jaraco.text==3.11.0 -jeepney==0.8.0 -Jinja2==3.1.2 -jsonschema==4.17.3 -keyring==23.13.1 -lockfile==0.12.2 -loguru==0.6.0 -#Markupsafe ==> crossenv -more-itertools==9.0.0 -packaging==22.0 -pastel==0.2.1 -pexpect==4.8.0 -pkginfo==1.9.6 -platformdirs==3.9.1 -plumbum==1.8.0 -poetry==1.5.1 -poetry-core==1.6.1 -poetry-plugin-export==1.4.0 -portend==3.1.0 -progressbar==2.5 -#psutil ==> crossenv -ptyprocess==0.7.0 -pycparser==2.21 -Pygments==2.13.0 -pylev==1.4.0 +idna==3.10 +importlib_resources==6.5.2 +itsdangerous==2.2.0 +jaraco.collections==5.1.0 +jaraco.context==6.0.1 +jaraco.functools==4.1.0 +jaraco.text==4.0.0 +Jinja2==3.1.5 +jsonschema==4.23.0 +jsonschema-specifications==2024.10.1 +loguru==0.7.3 +markdown-it-py==3.0.0 +#MarkupSafe ==> crossenv +mdurl==0.1.2 +more-itertools==10.6.0 +packaging==24.2 +#pendulum ==> crossenv +plumbum==1.9.0 +portend==3.2.0 +#psutil ==> crossenv +Pygments==2.19.1 pynzb==0.1.0 -pyparsing==3.0.9 -pyproject_hooks==1.0.0 -#pyrsistent ==> crossenv +pyparsing==3.2.1 PyRSS2Gen==1.1 -python-dateutil==2.8.2 -pytz==2022.6 -pytz-deprecation-shim==0.1.0.post0 -#PyYAML ==> crossenv -rebulk==3.1.0 -requests==2.31.0 -requests-toolbelt==1.0.0 -rich==12.6.0 -rpyc==5.3.1 -SecretStorage==3.3.3 +python-dateutil==2.9.0.post0 +pytz==2024.2 +#PyYAML ==> crossenv +rebulk==3.2.0 +referencing==0.36.1 +requests==2.32.3 +rich==13.9.4 +#rpds-py ==> crossenv +rpyc==6.0.1 +setuptools==75.7.0 sgmllib3k==1.0.0 -shellingham==1.5.0.post1 -#six ==> py311 -soupsieve==2.3.2.post1 -#SQLAlchemy ==> crossenv -tempora==5.1.0 -terminaltables==3.1.10 -tomlkit==0.11.8 -transmission-rpc==4.3.0 -trove-classifiers==2023.7.6 -typing_extensions==4.7.1 -tzdata==2022.7 -tzlocal==4.2 -urllib3==1.26.13 -#virtualenv ==> py311 +#six ==> py311 +soupsieve==2.6 +#SQLAlchemy ==> crossenv +tempora==5.8.0 +#time-machine ==> crossenv +typing_extensions==4.12.2 +tzdata==2024.2 +tzlocal==5.2 +urllib3==1.26.20 webencodings==0.5.1 -Werkzeug==2.2.3 -woops==0.2.1 -zc.lockfile==2.0 -zipp==3.16.2 +Werkzeug==3.1.3 +zc.lockfile==3.0.post1 +#zstandard ==> crossenv zxcvbn==4.4.28 -zxcvbn-python==4.4.24