diff --git a/mk/spksrc.wheel.mk b/mk/spksrc.wheel.mk index 5340d54f0bd..a3d8d9acc2c 100644 --- a/mk/spksrc.wheel.mk +++ b/mk/spksrc.wheel.mk @@ -52,6 +52,18 @@ wheeldownload: url="" ; \ fi ; \ version=$$(echo $${requirement#*[<>=]=} | cut -f1 -d' ') ; \ + # If no version was provided then find the latest version ; \ + if [ "$${version}" == "$${name}" ]; then \ + query="curl -s https://pypi.org/pypi/$${name}/json" ; \ + query+=" | jq -r '.releases[][]" ; \ + query+=" | select(.packagetype==\"sdist\")" ; \ + query+=" | .filename'" ; \ + query+=" | sort -V" ; \ + query+=" | tail -1" ; \ + query+=" | sed -e 's/.tar.gz//g' -e 's/.zip//g'" ; \ + query+=" | awk -F'-' '{print \$$2}'" ; \ + version=$$(eval $${query} 2>/dev/null) ; \ + fi ; \ $(MSG) pip download [$${name}], version [$${version}]$$([ "$${url}" ] && echo ", URL: [$${url}] ") ; \ if [ "$$(grep -s egg <<< $${requirement})" ] ; then \ echo "WARNING: Skipping download URL - Downloaded at build time" ; \ diff --git a/spk/borgbackup/Makefile b/spk/borgbackup/Makefile index 961369a5f7e..8ddede1e63b 100644 --- a/spk/borgbackup/Makefile +++ b/spk/borgbackup/Makefile @@ -1,5 +1,5 @@ SPK_NAME = borgbackup -SPK_VERS = 1.2.4 +SPK_VERS = 1.2.6 SPK_REV = 14 SPK_ICON = src/$(SPK_NAME).png @@ -30,7 +30,7 @@ DESCRIPTION = Deduplicating backup program with compression and authenticated en DISPLAY_NAME = Borg STARTABLE = no -CHANGELOG = "1. Update borg to v1.2.4
2. Update borgmatic to v1.8.0.
3. Update emborg to v1.37.
4. Migrate to python 3.11
5. Mark ARMv5 as unsupported" +CHANGELOG = "1. Update borg to v1.2.6
2. Update borgmatic to v1.8.2.
3. Update emborg to v1.37.
4. Migrate to python 3.11
5. Mark ARMv5 as unsupported" HOMEPAGE = https://borgbackup.readthedocs.io LICENSE = 3-Clause BSD @@ -49,11 +49,7 @@ ENV += BORG_LIBB2_PREFIX="$(STAGING_INSTALL_PREFIX)" include ../../mk/spksrc.common.mk # [rpds-py] -# maturin canot be built as pre-requisite crossenv -ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH)) -WHEELS += src/requirements-crossenv-rpds-py.txt # Requires path to maturin from crossenv ENV += PATH=$(WORK_DIR)/crossenv/build/bin:$(PATH) -endif include ../../mk/spksrc.python.mk diff --git a/spk/borgbackup/src/requirements-crossenv-rpds-py.txt b/spk/borgbackup/src/requirements-crossenv-rpds-py.txt deleted file mode 100644 index 08524639538..00000000000 --- a/spk/borgbackup/src/requirements-crossenv-rpds-py.txt +++ /dev/null @@ -1,13 +0,0 @@ -## -## All configurations below are optional and -## are provided to demonstrate how to build -## various wheels. Uncoment to enable. -## - -# [rpds-py] -# Require environment variables -# PYO3_CROSS_LIB_DIR=$(STAGING_INSTALL_PREFIX)/lib/ -# PYO3_CROSS_INCLUDE_DIR=$(STAGING_INSTALL_PREFIX)/include/ -# Requires path to maturin from crossenv -# ENV += PATH=$(WORK_DIR)/crossenv/build/bin:$(PATH) -rpds-py==0.9.2 diff --git a/spk/borgbackup/src/requirements-crossenv.txt b/spk/borgbackup/src/requirements-crossenv.txt index 0000edcfd90..9e62c72f2cf 100644 --- a/spk/borgbackup/src/requirements-crossenv.txt +++ b/spk/borgbackup/src/requirements-crossenv.txt @@ -1,9 +1,17 @@ # requirements that need crossenv to build wheel for -borgbackup==1.2.4 +borgbackup==1.2.6 charset-normalizer==3.2.0 -llfuse==1.4.4 -msgpack==1.0.5 # used compiled verrsion for performance +llfuse==1.5.0 +msgpack==1.0.5 # used compiled verrsion for performance pyrsistent==0.19.3 ruamel.yaml.clib==0.2.7 + +# [rpds-py] +# Require environment variables +# PYO3_CROSS_LIB_DIR=$(STAGING_INSTALL_PREFIX)/lib/ +# PYO3_CROSS_INCLUDE_DIR=$(STAGING_INSTALL_PREFIX)/include/ +# Requires path to maturin from crossenv +# ENV += PATH=$(WORK_DIR)/crossenv/build/bin:$(PATH) +rpds-py==0.10.2 diff --git a/spk/borgbackup/src/requirements-pure.txt b/spk/borgbackup/src/requirements-pure.txt index ee3f9b4d71c..58d5b712799 100644 --- a/spk/borgbackup/src/requirements-pure.txt +++ b/spk/borgbackup/src/requirements-pure.txt @@ -4,8 +4,10 @@ appdirs==1.4.4 arrow==1.2.3 attrs==23.1.0 -borgmatic==1.8.0 +#borgbackup ==> crossenv +borgmatic==1.8.2 #certifi ==> python311:pure +#charset-normalizer ==> crossenv colorama==0.4.6 #distlib ==> python311:pure docopt==0.6.2 @@ -13,17 +15,20 @@ emborg==1.37 #filelock ==> python311:pure idna==3.4 inform==1.28 -jsonschema==4.18.4 +jsonschema==4.19.0 jsonschema-specifications==2023.7.1 +#llfuse ==> crossenv #msgpack ==> crossenv nestedtext==3.6 packaging==23.1 #platformdirs ==> python311:pure -pyparsing==3.1.0 +pyparsing==3.1.1 +#pyrsistent ==> crossenv python-dateutil==2.8.2 quantiphy==2.19 -referencing==0.30.0 +referencing==0.30.2 requests==2.31.0 +#rpds-py ==> crossenv ruamel.yaml==0.17.32 #ruamel.yaml.clib ==> crossenv #six ==> python311:pure