Skip to content
Snippets Groups Projects
Verified Commit 2226b531 authored by Richard Muzik's avatar Richard Muzik
Browse files

patches/packages: drop host-pip-requirements patches

Usage of host-pip-requirements will no longer be supported, so we
changed how the dependencies are handled.
Related merge request: packages!1113
parent 26c38a17
Branches
1 merge request!681Python packages repairs
From 38b2d3f7daa27a9cce88b458bb1fbc389f64bdf2 Mon Sep 17 00:00:00 2001
From: Josef Schlehofer <pepe.schlehofer@gmail.com>
Date: Thu, 24 Dec 2020 12:56:45 +0100
Subject: [PATCH] host-pip-requirements: add Babel
Sent to upstream: https://github.com/openwrt/packages/pull/14329
One package (reforis-distutils [1]), which is not in this repo and it is required for Turris routers
because of reForis (simplified user interface), which is being developed
depends on Babel host package [2].
It fails with:
ERROR: Could not open requirements file: [Errno 2] No such file or directory: '/foo-omnia/build/feeds/packages/lang/python/host-pip-requirements/Babel.txt'
I tried to remove HOST_PYTHON3_PACKAGE_BUILD_DEPENDS (as Babel is
dependency for the package), then
reforis-distutils is compiled and package is created, but thing is that
if I want to try compile package reForis [3] then it fails with
following output:
ERROR: Could not find a version that satisfies the requirement reforis_distutils (from versions: none)
ERROR: No matching distribution found for reforis_distutils
Traceback (most recent call last):
File "/foo/mox/build/staging_dir/hostpkg/lib/python3.8/site-packages/setuptools/installer.py", line 128, in fetch_build_egg
subprocess.check_call(cmd)
File "/foo/mox/build/staging_dir/target-aarch64_cortex-a53_musl/usr/lib/python3.8/subprocess.py", line 364, in check_call
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['/foo/mox/build/staging_dir/hostpkg/bin/python3.8', '-m', 'pip', '--disable-pip-version-check', 'wheel', '--no-deps', '-w', '/foo/mox/build/tmp/tmp3s9rxjym', '--quiet', '--find-links', 'git+https://gitlab.nic.cz/turris/reforis/reforis-distutils.git#egg=reforis-distutils', 'reforis_distutils']' returned non-zero exit status 1.
No matter if I add python3-babel into reForis dependency.
This was working on OpenWrt 19.07, but there is regression in OpenWrt
master, which I fixed as packages reForis-distutils and reForis are
compiled successfully with this commit.
[1] https://gitlab.nic.cz/turris/turris-os-packages/-/blob/v5.1.4/web/reforis/reforis-distutils/Makefile#L23
[2] https://gitlab.nic.cz/turris/reforis/reforis-distutils/-/blob/v0.1.0/setup.py#L13
[3] https://gitlab.nic.cz/turris/turris-os-packages/-/blob/v5.1.4/web/reforis/reforis/Makefile
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
---
lang/python/host-pip-requirements/Babel.txt | 3 +++
1 file changed, 3 insertions(+)
create mode 100644 lang/python/host-pip-requirements/Babel.txt
diff --git a/lang/python/host-pip-requirements/Babel.txt b/lang/python/host-pip-requirements/Babel.txt
new file mode 100644
index 000000000..b0a787d17
--- /dev/null
+++ b/lang/python/host-pip-requirements/Babel.txt
@@ -0,0 +1,3 @@
+Babel==2.9.1 --hash=sha256:bc0c176f9f6a994582230df350aa6e05ba2ebe4b3ac317eab29d9be5d2768da0
+pytz==2022.1 --hash=sha256:1e760e2fe6a8163bc0b3d9a19c4f84342afa0a2affebfaa84b01b978a02ecaa7
+
--
2.25.1
From 3629a0f867d34396b87372c2f024e7f2f809c426 Mon Sep 17 00:00:00 2001
From: Josef Schlehofer <pepe.schlehofer@gmail.com>
Date: Fri, 16 Apr 2021 12:54:21 +0200
Subject: [PATCH 2/3] host-pip-requirements: add MarkupSafe for Foris
Foris requires as host package MarkupSafe
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
---
lang/python/host-pip-requirements/MarkupSafe.txt | 1 +
1 file changed, 1 insertion(+)
create mode 100644 lang/python/host-pip-requirements/MarkupSafe.txt
diff --git a/lang/python/host-pip-requirements/MarkupSafe.txt b/lang/python/host-pip-requirements/MarkupSafe.txt
new file mode 100644
index 000000000..14d044fff
--- /dev/null
+++ b/lang/python/host-pip-requirements/MarkupSafe.txt
@@ -0,0 +1 @@
+MarkupSafe==2.1.0 --hash=sha256:80beaf63ddfbc64a0452b841d8036ca0611e049650e20afcb882f5d3c266d65f
--
2.25.1
From 3434aafeb425bdf2d663a0633ae1fe84e070aefe Mon Sep 17 00:00:00 2001
From: Josef Schlehofer <pepe.schlehofer@gmail.com>
Date: Fri, 16 Apr 2021 12:55:20 +0200
Subject: [PATCH 3/3] host-pip-requirements: add package pytz
pytz is required by Babel
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
---
lang/python/host-pip-requirements/pytz.txt | 1 +
1 file changed, 1 insertion(+)
create mode 100644 lang/python/host-pip-requirements/pytz.txt
diff --git a/lang/python/host-pip-requirements/pytz.txt b/lang/python/host-pip-requirements/pytz.txt
new file mode 100644
index 000000000..52ca543e3
--- /dev/null
+++ b/lang/python/host-pip-requirements/pytz.txt
@@ -0,0 +1 @@
+pytz==2022.7.1 --hash=sha256:01a0681c4b9684a28304615eba55d1ab31ae00bf68ec157ec3708a8182dbbcd0
--
2.25.1
From da25423d253fa77b91db23cfb8094de748b46703 Mon Sep 17 00:00:00 2001
From: Josef Schlehofer <pepe.schlehofer@gmail.com>
Date: Mon, 19 Apr 2021 20:11:37 +0200
Subject: [PATCH] host-pip-requirements: add reForis distutils
According to:
https://github.com/openwrt/packages/tree/master/lang/python#installing-host-side-python-packages
This allows us to specify hash for reForis distutils on PyPI
and once we specified hash, we can then set Host package in Makefile of
reForis
This patch can not be accepted in upstream.
See: https://github.com/openwrt/packages/pull/14329
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
---
lang/python/host-pip-requirements/reforis-distutils.txt | 3 +++
1 file changed, 3 insertions(+)
create mode 100644 lang/python/host-pip-requirements/reforis-distutils.txt
diff --git a/lang/python/host-pip-requirements/reforis-distutils.txt b/lang/python/host-pip-requirements/reforis-distutils.txt
new file mode 100644
index 000000000..9e8e3b0f1
--- /dev/null
+++ b/lang/python/host-pip-requirements/reforis-distutils.txt
@@ -0,0 +1,3 @@
+reforis-distutils==0.1.0 --hash=sha256:f95432eca1bf4faced68d20d93e00fbdd0ae63801db4c701a42d0738cd0db37b
+Babel==2.9.0 --hash=sha256:da031ab54472314f210b0adcff1588ee5d1d1d0ba4dbd07b94dba82bde791e05
+pytz==2020.4 --hash=sha256:3e6b7dd2d1e0a59084bcee14a17af60c5c562cdc16d828e8eba2e683d3a7e268
--
2.25.1
From 69adfa944bc93e2d6e0be9cdc9ffb7b607179dbb Mon Sep 17 00:00:00 2001
From: Josef Schlehofer <pepe.schlehofer@gmail.com>
Date: Wed, 27 Oct 2021 16:24:36 +0200
Subject: [PATCH] host-pip-requirements: add l18n
This is required for turris-timezone package
---
lang/python/host-pip-requirements/l18n.txt | 3 +++
1 file changed, 3 insertions(+)
create mode 100644 lang/python/host-pip-requirements/l18n.txt
diff --git a/lang/python/host-pip-requirements/l18n.txt b/lang/python/host-pip-requirements/l18n.txt
new file mode 100644
index 000000000..6f06d9648
--- /dev/null
+++ b/lang/python/host-pip-requirements/l18n.txt
@@ -0,0 +1,3 @@
+l18n==2021.3 --hash=sha256:1956e890d673d17135cc20913253c154f6bc1c00266c22b7d503cc1a5a42d848
+pytz==2022.1 --hash=sha256:1e760e2fe6a8163bc0b3d9a19c4f84342afa0a2affebfaa84b01b978a02ecaa7
+six==1.16.0 --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926
--
2.30.2
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment