[Buildroot] [PATCH v2 2/2] package/python-web2py: bump to version 3.3.3

[Angelo Compagnucci <angelo.compagnucci@gmail.com>]

web2py 3.3.3 stores binaries/*.zip with Git LFS, so the archive
generated from the git repository depends on git-lfs being installed on
the build host: it contains either the zip files or their LFS pointers,
with different hashes.

So download the release tag archive with the github helper instead,
which doesn't include the git submodules (pydal, yatl and rocket3): in
that case, gluon imports the installed modules, provided by
python-pydal, python-yatl and the new python-rocket3 package.
host-python-rocket3 is needed to generate the admin panel password.

Update the list of files not installed on the target, as some of them
were renamed, removed or added in the new version, and also exclude the
Buildroot stamp and file list files.

Changes:
https://github.com/web2py/web2py/compare/v3.1.1...v3.3.3

Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
---
Changes v1 -> v2:
  - use the comparison between the tags as changelog [Julien]
  - download the release tag archive with the github helper and use the
    python-pydal, python-yatl and new python-rocket3 packages instead of
    the git submodules, as the git archive hash depended on git-lfs
    being installed [Julien]
  - update the list of files not installed on the target
---
 package/python-web2py/Config.in          |  1 +
 package/python-web2py/python-web2py.hash |  2 +-
 package/python-web2py/python-web2py.mk   | 40 +++++++++++++++++-------
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/package/python-web2py/Config.in b/package/python-web2py/Config.in
index 0c141d9fc5..83ce4b3e74 100644
--- a/package/python-web2py/Config.in
+++ b/package/python-web2py/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_PYTHON_WEB2PY
 	bool "python-web2py"
 	select BR2_PACKAGE_PYTHON_PYDAL # runtime
+	select BR2_PACKAGE_PYTHON_ROCKET3 # runtime
 	select BR2_PACKAGE_PYTHON3_ZLIB # runtime
 	select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime
 	select BR2_PACKAGE_PYTHON3_SQLITE # runtime
diff --git a/package/python-web2py/python-web2py.hash b/package/python-web2py/python-web2py.hash
index b100a1fec8..5e7fd0d9b4 100644
--- a/package/python-web2py/python-web2py.hash
+++ b/package/python-web2py/python-web2py.hash
@@ -1,3 +1,3 @@
 # sha256 locally computed
-sha256  b22b5c2db862cdef9e0feace1c8841741a14eb5e735b674d6ce2bd5c7f4cac64  python-web2py-v3.1.1-git4.tar.gz
+sha256  38655b8f1c9737348b61669ccb2beaecdba1f6bf1e9a5cfa697a14b660b31a78  python-web2py-v3.3.3.tar.gz
 sha256  2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe  LICENSE.web2py.txt
diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk
index 68847a2385..168c1d3445 100644
--- a/package/python-web2py/python-web2py.mk
+++ b/package/python-web2py/python-web2py.mk
@@ -4,11 +4,9 @@
 #
 ################################################################################
 
-PYTHON_WEB2PY_VERSION_UPSTREAM = 3.1.1
+PYTHON_WEB2PY_VERSION_UPSTREAM = 3.3.3
 PYTHON_WEB2PY_VERSION = v$(PYTHON_WEB2PY_VERSION_UPSTREAM)
-PYTHON_WEB2PY_SITE = https://github.com/web2py/web2py.git
-PYTHON_WEB2PY_SITE_METHOD = git
-PYTHON_WEB2PY_GIT_SUBMODULES = YES
+PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,$(PYTHON_WEB2PY_VERSION))
 PYTHON_WEB2PY_LICENSE = LGPL-3.0
 PYTHON_WEB2PY_LICENSE_FILES = LICENSE.web2py.txt
 PYTHON_WEB2PY_CPE_ID_VENDOR = web2py
@@ -21,20 +19,33 @@ PYTHON_WEB2PY_EXCLUSIONS = \
 	welcome.w2p \
 	applications/examples \
 	applications/welcome \
+	binaries \
 	deposit \
+	docker \
 	docs \
 	examples \
 	extras \
 	handlers \
 	scripts \
-	ABOUT \
+	.codecov.yml \
+	.gitattributes \
+	.github \
+	.gitignore \
+	.gitmodules \
+	.travis.yml \
+	ABOUT.web2py.txt \
 	anyserver.py \
-	CHANGELOG \
+	app.yaml \
+	appveyor.yml \
+	CHANGELOG.md \
+	gae.nix \
 	Makefile \
-	MANIFEST.in \
-	README.markdown \
-	setup.py \
-	tox.ini
+	README.md \
+	requirements.gae.txt \
+	requirements.txt \
+	SECURITY.md \
+	tox.ini \
+	versioning-and-support-policy.md
 
 define PYTHON_WEB2PY_GENERATE_PASSWORD
 	$(HOST_DIR)/bin/python -c 'import os; \
@@ -44,15 +55,22 @@ define PYTHON_WEB2PY_GENERATE_PASSWORD
 endef
 
 ifeq ($(BR2_PACKAGE_PYTHON_WEB2PY_INSTALL_ADMIN),y)
+# gluon imports rocket3 to generate the password
+PYTHON_WEB2PY_DEPENDENCIES += host-python-rocket3
 PYTHON_WEB2PY_POST_BUILD_HOOKS += PYTHON_WEB2PY_GENERATE_PASSWORD
 else
 PYTHON_WEB2PY_EXCLUSIONS += applications/admin
 endif
 
+# The build directory also contains the Buildroot stamp and file list
+# files, which must not be installed.
 define PYTHON_WEB2PY_INSTALL_TARGET_CMDS
 	mkdir -p $(TARGET_DIR)/var/www/web2py
 	rsync -a $(@D)/ $(TARGET_DIR)/var/www/web2py/ \
-		$(addprefix --exclude=,$(PYTHON_WEB2PY_EXCLUSIONS))
+		$(addprefix --exclude=,$(PYTHON_WEB2PY_EXCLUSIONS)) \
+		--exclude='.stamp_*' \
+		--exclude='.files-list*' \
+		--exclude=.applied_patches_list
 endef
 
 define PYTHON_WEB2PY_INSTALL_INIT_SYSV
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot