Refresh requirements

SynoCommunity · Jan 27, 2025 · c34a00d · c34a00d
1 parent faf9d52
commit c34a00d
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 27 deletions.
diff --git a/spk/ffsync/Makefile b/spk/ffsync/Makefile
@@ -8,7 +8,7 @@ DEPENDS = cross/syncstorage-rs cross/diesel
 PYTHON_PACKAGE = python312
 WHEELS = src/requirements-crossenv.txt src/requirements-pure.txt
 
-UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(PPC_ARCHS)
+UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS) $(ARMv7L_ARCHS)
 
 REQUIRED_MIN_DSM = 6.0
 SPK_DEPENDS = MariaDB10:$(PYTHON_PACKAGE)
@@ -36,21 +36,19 @@ ADMIN_PORT = $(SERVICE_PORT)
 DEPENDS += cross/openssl3
 
 # [mysqlclient]
-ENV += MYSQLCLIENT_CFLAGS="$(CFLAGS) -I$(STAGING_INSTALL_PREFIX)/include/mysql -I$(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR)"
+ENV += MYSQLCLIENT_CFLAGS="$(CFLAGS) -I$(STAGING_INSTALL_PREFIX)/include/mysql -I$(STAGING_INSTALL_PREFIX)/include/mariadb -I$(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR)"
 ENV += MYSQLCLIENT_LDFLAGS="$(LDFLAGS)"
 
 POST_STRIP_TARGET = ffsync_extra_install
 
 include ../../mk/spksrc.python.mk
 
 # [greenlet]
-ifeq ($(call version_ge, $(TC_GCC), 4.9),1)
-WHEELS += src/requirements-crossenv-greenlet-v2.txt
-ifeq ($(call version_lt, $(TC_GCC), 5.0),1)
-WHEELS_CPPFLAGS += [greenlet] -std=c++11 -fpermissive
-endif
+ifeq ($(call version_ge, $(TC_GCC), 5.0),1)
+WHEELS += src/requirements-crossenv-greenlet-v3.txt
 else
-WHEELS += src/requirements-crossenv-greenlet-v1.txt
+WHEELS += src/requirements-crossenv-greenlet-v3-gcc4.txt
+WHEELS_CPPFLAGS += [greenlet] -std=c++11 -fpermissive
 endif
 
 

diff --git a/...src/requirements-crossenv-greenlet-v2.txt → ...equirements-crossenv-greenlet-v3-gcc4.txt b/...src/requirements-crossenv-greenlet-v2.txt → ...equirements-crossenv-greenlet-v3-gcc4.txt
diff --git a/...src/requirements-crossenv-greenlet-v1.txt → ...src/requirements-crossenv-greenlet-v3.txt b/...src/requirements-crossenv-greenlet-v1.txt → ...src/requirements-crossenv-greenlet-v3.txt
@@ -5,5 +5,5 @@
 ##
 
 # [greenlet]
-#   - gcc < 5.0 (DSM6) Last known working version
-greenlet==1.1.3
+#   - Mandatory require full c++20 support added with gcc >= 8
+greenlet==3.1.1
diff --git a/spk/ffsync/src/requirements-crossenv.txt b/spk/ffsync/src/requirements-crossenv.txt
@@ -7,6 +7,8 @@
 #  ENV += OPENSSL_INCLUDE_DIR=$(STAGING_INSTALL_PREFIX)/include/
 cryptography==42.0.8
 
+PyFxA==0.7.7
+
 # From tools/tokenserver/requirements.txt
 
 # [mysqlclient]
@@ -16,10 +18,11 @@ cryptography==42.0.8
 #  MYSQLCLIENT_LDFLAGS
 mysqlclient==2.1.1
 
-sqlalchemy==1.4.46
+PyBrowserID==0.14.0
+SQLAlchemy==1.4.46
 
 # further crossenv dependencies
 cffi==1.17.1
-charset_normalizer==3.3.2
-# greenlet==3.0.3    => supported version depends on gcc version
-zope.interface==7.0.3
+charset_normalizer==3.4.1
+#greenlet               => supported version depends on gcc version
+zope.interface==7.2
diff --git a/spk/ffsync/src/requirements-pure.txt b/spk/ffsync/src/requirements-pure.txt
@@ -1,31 +1,32 @@
 # From requirements.txt
 
-pyfxa==0.7.7
+#pyfxa                  => crossenv
 tokenlib==2.0.0
 
 # From tools/tokenserver/requirements.txt
 
+backoff==2.2.1
 boto==2.49.0
+datadog==0.50.2
 hawkauthlib==2.0.0
+#pybrowserid            => crossenv
 pyramid==2.0.2
-#sqlalchemy==1.4.46     => crossenv
+#sqlalchemy             => crossenv
 testfixtures==8.3.0
-#tokenlib==2.0.0        => same as above
-PyBrowserID==0.14.0
-datadog==0.50.0
-backoff==2.2.1
+tokenlib==2.0.0
 
 
 # further dependencies
 hupper==1.12.1
-idna==3.8
+idna==3.10
 PasteDeploy==3.1.0
-plaster==1.1.2
 plaster_pastedeploy==1.0.1
-PyJWT==2.9.0
+plaster==1.1.2
+pycparser==2.22
+PyJWT==2.10.1
 requests==2.32.3
 translationstring==1.4
-urllib3==2.2.2
-venusian==3.1.0
-WebOb==1.8.8
-zope.deprecation==5.0
+urllib3==2.3.0
+venusian==3.1.1
+WebOb==1.8.9
+zope.deprecation==5.1