Browse Source

Merge pull request #16462 from commodo/python-sync-host-pip-reqs

python3-package.mk: add check for dependencies in host-pip-requirements
lilik-openwrt-22.03
Alexandru Ardelean 3 years ago
committed by GitHub
parent
commit
c5d49e35f3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 1 deletions
  1. +12
    -0
      lang/python/python3-package.mk
  2. +0
    -0
      net/seafile-seahub/Django-1.11.txt
  3. +1
    -1
      net/seafile-seahub/Makefile

+ 12
- 0
lang/python/python3-package.mk View File

@ -204,6 +204,17 @@ define Py3Build/FindStdlibDepends
$(SHELL) $(python3_mk_path)python3-find-stdlib-depends.sh -n "$(PKG_NAME)" "$(PKG_BUILD_DIR)"
endef
ifneq ($(strip $(PYPI_NAME)),)
define Py3Build/CheckHostPipVersionMatch
if grep -q "$(PYPI_NAME)==" $(python3_mk_path)host-pip-requirements/*.txt ; then \
if ! grep -q "$(PYPI_NAME)==$(PKG_VERSION)" $(python3_mk_path)host-pip-requirements/*.txt ; then \
printf "\nPlease update version of $(PYPI_NAME) to $(PKG_VERSION) in 'host-pip-requirements'/\n\n" ; \
exit 1 ; \
fi \
fi
endef
endif
define Py3Build/Compile/Default
$(if $(PYTHON3_PKG_HOST_PIP_INSTALL_ARGS), \
$(call HostPython3/PipInstall,$(PYTHON3_PKG_HOST_PIP_INSTALL_ARGS)) \
@ -226,5 +237,6 @@ ifeq ($(strip $(PYTHON3_PKG_BUILD)),1)
ifeq ($(PY3),stdlib)
Hooks/Configure/Post+=Py3Build/FindStdlibDepends
endif
Hooks/Configure/Post+=Py3Build/CheckHostPipVersionMatch
Build/Compile=$(Py3Build/Compile)
endif

lang/python/host-pip-requirements/Django-1.11.txt → net/seafile-seahub/Django-1.11.txt View File


+ 1
- 1
net/seafile-seahub/Makefile View File

@ -21,7 +21,7 @@ PKG_LICENSE_FILES:=LICENSE.txt
PKG_BUILD_DIR:=$(BUILD_DIR)/seahub-$(PKG_VERSION)-server
HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:=Django-1.11
HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:=./Django-1.11.txt
PKG_BUILD_PARALLEL:=1
PYTHON3_PKG_BUILD:=0


Loading…
Cancel
Save