Skip to content

Commit

Permalink
cleanup python
Browse files Browse the repository at this point in the history
- python311-wheels for ARMv7L (crossenv for numpy-1.22.4) - didn't fix it
- add PLIST files for python312 and python313
- remove lxml==4.9.3 in python311-wheels/src/requirements-crossenv.txt (build only lxml==5.3.0)
  • Loading branch information
hgy59 committed Nov 28, 2024
1 parent 15eb382 commit eb79654
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 12 deletions.
2 changes: 0 additions & 2 deletions cross/python313/PLIST
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ lnk:bin/pydoc3
rsc:bin/pydoc3.13
lnk:bin/python3
bin:bin/python3.13
rsc:bin/python3.13-config
lnk:bin/python3-config
rsc:etc/mime.types
rsc:include/python3.13/pyconfig.h
lnk:lib/libpython3.13.so
Expand Down
14 changes: 14 additions & 0 deletions mk/crossenv/requirements-numpy-1.22.4.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
pip==23.2.1
setuptools==63.4.3
wheel==0.41.2
#
cffi==1.15.1
cryptography==41.0.3
Cython==0.29.36
flit==3.9.0
maturin==1.2.3
msgpack==1.0.5
poetry==1.6.1
scikit-build==0.17.6
setuptools-rust==1.7.0
setuptools-scm==7.1.0
1 change: 0 additions & 1 deletion spk/python311-wheels/src/requirements-crossenv.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ gevent==24.2.1

# [lxml]
# Depends: libxml2, libxslt
lxml==4.9.3
lxml==5.3.0

# [mysqlclient]
Expand Down
2 changes: 1 addition & 1 deletion spk/python311/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ SPK_ICON = src/python3.png
# And compiler must support std=c++11 (OlD_PPC_ARCHS fail, but ARMv5_ARCHS have no issue).
UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)

DEPENDS = cross/$(SPK_NAME)
DEPENDS = cross/python311
DEPENDS += cross/pip

MAINTAINER = SynoCommunity
Expand Down
8 changes: 3 additions & 5 deletions spk/python312/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ SPK_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(SPK_VERS))).$(word 2,$(subst ., ,$
SPK_REV = 1
SPK_ICON = src/python3.png

# Platform "powerpc-none-linux-gnuspe" with compiler "gcc" is not supported by the
# CPython core team, see https://peps.python.org/pep-0011/ for more information.
# And compiler must support std=c++11 (OlD_PPC_ARCHS fail, but ARMv5_ARCHS have no issue).
UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
# Compiler must support std=c++11
UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS)

DEPENDS = cross/python312
DEPENDS += cross/pip
Expand All @@ -18,7 +16,7 @@ DESCRIPTION_FRE = Language de programmation Python.
DESCRIPTION_SPN = Lenguaje de programación Python.
STARTABLE = no
DISPLAY_NAME = Python 3.12
CHANGELOG = "1. Initial Python 3.13.7 package release"
CHANGELOG = "1. Initial Python 3.12.7 package release"

HOMEPAGE = https://www.python.org
LICENSE = PSF
Expand Down
1 change: 1 addition & 0 deletions spk/python312/PLIST
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rsc:share/wheelhouse
4 changes: 1 addition & 3 deletions spk/python313/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ SPK_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(SPK_VERS))).$(word 2,$(subst ., ,$
SPK_REV = 1
SPK_ICON = src/python3.png

# Platform "powerpc-none-linux-gnuspe" with compiler "gcc" is not supported by the
# CPython core team, see https://peps.python.org/pep-0011/ for more information.
# And compiler must support std=c++11 (both OLD_PPC_ARCHS and ARMv5_ARCHS now fails).
# Compiler must support std=c++11
UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS)

DEPENDS = cross/python313
Expand Down
1 change: 1 addition & 0 deletions spk/python313/PLIST
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rsc:share/wheelhouse

0 comments on commit eb79654

Please sign in to comment.