From 0c5a4f724b8bb3c6f8fce619ac5154708128d6c7 Mon Sep 17 00:00:00 2001 From: Tim Sandquist Date: Fri, 18 Mar 2022 20:56:11 -0500 Subject: [PATCH 1/2] gns3-server: loosen requirements for new python3-distro package --- srcpkgs/gns3-server/patches/requirements.patch | 3 ++- srcpkgs/gns3-server/template | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gns3-server/patches/requirements.patch b/srcpkgs/gns3-server/patches/requirements.patch index 4cfa85b16ba2..27cd2441e53c 100644 --- a/srcpkgs/gns3-server/patches/requirements.patch +++ b/srcpkgs/gns3-server/patches/requirements.patch @@ -14,7 +14,8 @@ diff --git a/requirements.txt b/requirements.txt -psutil==5.9.0 +psutil>=5.9.0 async-timeout==3.0.1 - distro==1.6.0 +-distro==1.6.0 ++distro>=1.6.0 py-cpuinfo==8.0.0 -setuptools==60.6.0; python_version >= '3.7' # don't upgrade because of https://github.com/pypa/setuptools/issues/3084 +setuptools>=60.5.0; python_version >= '3.7' # don't upgrade because of https://github.com/pypa/setuptools/issues/3084 diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template index 038457a27a3b..c45f0a8f8b82 100644 --- a/srcpkgs/gns3-server/template +++ b/srcpkgs/gns3-server/template @@ -1,7 +1,7 @@ # Template file for 'gns3-server' pkgname=gns3-server version=2.2.31 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-jsonschema python3-aiohttp-cors python3-yarl From ec9179f47484333ff0408a1d7bf63ba9cf392dc1 Mon Sep 17 00:00:00 2001 From: Tim Sandquist Date: Fri, 18 Mar 2022 20:57:06 -0500 Subject: [PATCH 2/2] gns3-gui: loosen requirements for new python3-distro package --- srcpkgs/gns3-gui/patches/requirements.patch | 3 ++- srcpkgs/gns3-gui/template | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gns3-gui/patches/requirements.patch b/srcpkgs/gns3-gui/patches/requirements.patch index ab3d55dea830..6cf6d68d94cc 100644 --- a/srcpkgs/gns3-gui/patches/requirements.patch +++ b/srcpkgs/gns3-gui/patches/requirements.patch @@ -7,7 +7,8 @@ diff --git a/requirements.txt b/requirements.txt -sentry-sdk==1.5.4 -psutil==5.9.0 +psutil>=5.9.0 - distro==1.6.0 +-distro==1.6.0 ++distro>=1.6.0 -setuptools==60.6.0; python_version >= '3.7' # don't upgrade because of https://github.com/pypa/setuptools/issues/3084 +setuptools>=60.5.0; python_version >= '3.7' # don't upgrade because of https://github.com/pypa/setuptools/issues/3084 setuptools==59.6.0; python_version < '3.7' # v59.7.0 dropped support for Python 3.6 diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template index 175eab41080c..348325010d73 100644 --- a/srcpkgs/gns3-gui/template +++ b/srcpkgs/gns3-gui/template @@ -1,7 +1,7 @@ # Template file for 'gns3-gui' pkgname=gns3-gui version=2.2.31 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-psutil python3-jsonschema