From c5cd68153c2e1f9d5dff6c580d08d399cdb75791 Mon Sep 17 00:00:00 2001 From: Tim Sandquist Date: Sat, 28 Aug 2021 08:55:13 -0500 Subject: [PATCH 1/6] python3-py-cpuinfo: update to 8.0.0. --- srcpkgs/python3-py-cpuinfo/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-py-cpuinfo/template b/srcpkgs/python3-py-cpuinfo/template index 6f5d469db551..f3cba9fbf044 100644 --- a/srcpkgs/python3-py-cpuinfo/template +++ b/srcpkgs/python3-py-cpuinfo/template @@ -1,7 +1,7 @@ # Template file for 'python3-py-cpuinfo' pkgname=python3-py-cpuinfo -version=6.0.0 -revision=2 +version=8.0.0 +revision=1 wrksrc="py-cpuinfo-${version}" build_style=python3-module hostmakedepends=python3-setuptools @@ -10,7 +10,7 @@ maintainer="Karol Kosek " license="MIT" homepage="https://github.com/workhorsy/py-cpuinfo" distfiles="${PYPI_SITE}/p/py-cpuinfo/py-cpuinfo-${version}.tar.gz" -checksum=7ffb31dea845b9f359b99bd5f7eea72dc70f852e0e34547d261a630f2b8c9c61 +checksum=5f269be0e08e33fd959de96b34cd4aeeeacac014dd8305f70eb28d06de2345c5 post_install() { vlicense LICENSE From 771a8076b612ff725c4a3ad6b6c00e6ecd07074b Mon Sep 17 00:00:00 2001 From: Tim Sandquist Date: Sat, 28 Aug 2021 08:54:57 -0500 Subject: [PATCH 2/6] gns3-gui: update to 2.2.24. --- srcpkgs/gns3-gui/template | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template index a82996e790ce..edfcf26a2db6 100644 --- a/srcpkgs/gns3-gui/template +++ b/srcpkgs/gns3-gui/template @@ -1,30 +1,19 @@ # Template file for 'gns3-gui' pkgname=gns3-gui -version=2.2.21 +version=2.2.24 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-setuptools python3-psutil python3-jsonschema python3-sentry +depends="python3-setuptools python3-psutil python3-jsonschema python3-PyQt5-svg python3-PyQt5-websockets xterm inetutils-telnet gns3-net-converter python3-distro" -checkdepends="${depends}" +checkdepends="${depends} python3-pytest python3-wheel" short_desc="Graphical Network Simulator 3 - GUI" maintainer="Tim Sandquist " license="GPL-3.0-or-later" homepage="https://gns3.com" distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz" -checksum=@58b12add3fa29a095f14bbf4c61f54f41fdee45c8ca490c651d9ccb37b9884fe - -post_patch() { - # relax requirements - vsed -e 's|jsonschema.*|jsonschema>=2.6.0|' -i requirements.txt -} - -do_check() { - # uses tox, broken - cd build/lib - python3 -c 'import gns3 as m; print(m)' -} +checksum=e5e031853bfd5088f174bdd6028edffa2129f988c4e2793d53bbda1b81e3b8d0 post_install() { vinstall gns3-gui.desktop 644 usr/share/applications From 446ba9ba88f8395daa051ad4a1e5f2662cf87c1f Mon Sep 17 00:00:00 2001 From: Tim Sandquist Date: Sat, 28 Aug 2021 08:54:40 -0500 Subject: [PATCH 3/6] gns3-server: update to 2.2.24. --- .../gns3-server/patches/requirements.patch | 15 +++++++++++ srcpkgs/gns3-server/template | 27 ++++++++----------- 2 files changed, 26 insertions(+), 16 deletions(-) create mode 100644 srcpkgs/gns3-server/patches/requirements.patch diff --git a/srcpkgs/gns3-server/patches/requirements.patch b/srcpkgs/gns3-server/patches/requirements.patch new file mode 100644 index 000000000000..4954850f1dda --- /dev/null +++ b/srcpkgs/gns3-server/patches/requirements.patch @@ -0,0 +1,15 @@ +diff --git a/requirements.txt b/requirements.txt +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,9 +1,8 @@ + jsonschema==3.2.0 +-aiohttp==3.7.4.post0 ++aiohttp>=3.7.4 + aiohttp-cors==0.7.0 + aiofiles==0.7.0 +-Jinja2==3.0.1 ++Jinja2>=2.0.0<3.0.0 +-sentry-sdk==1.3.1 + psutil==5.8.0 + async-timeout==3.0.1 + distro==1.6.0 diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template index 02ae7b2ef438..09c262355963 100644 --- a/srcpkgs/gns3-server/template +++ b/srcpkgs/gns3-server/template @@ -1,32 +1,27 @@ # Template file for 'gns3-server' pkgname=gns3-server -version=2.2.21 +version=2.2.24 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-jsonschema python3-aiohttp-cors python3-yarl - python3-Jinja2 python3-sentry python3-psutil python3-aiofiles + python3-Jinja2 python3-psutil python3-aiofiles python3-py-cpuinfo python3-distro python3-async-timeout dynamips" -checkdepends="${depends}" +checkdepends="${depends} python3-pytest python3-flake8 python3-pytest-timeout python3-pytest-aiohttp" short_desc="Graphical Network Simulator 3 - Server" maintainer="Tim Sandquist " license="GPL-3.0-or-later" homepage="https://gns3.com" distfiles="https://github.com/GNS3/gns3-server/archive/v${version}.tar.gz" -checksum=@9f3d7f4caf6cd420049a62ae9d7579f29b0e3805f1a50913ae9111ab6752bdb0 -make_check=no +checksum=ed47d1dde360805bf97b5269fcb361017e20c975a54c904ebbb9de47a1a58556 -post_patch() { - # relax requirements - vsed -e 's|aiofiles.*|aiofiles>=0.4.0|' \ - -e 's|aiohttp=.*|aiohttp>=3.7.4|' \ - -e 's|jsonschema.*|jsonschema>=2.6.0|' \ - -e 's|py-cpuinfo.*|py-cpuinfo>=5.8.0|' -i requirements.txt -} -post_install() { - # remove tests directory polluting site-packages - rm -rf -- ${DESTDIR}/usr/lib/python*/site-packages/tests -} +# Skip tests that fail upstream +make_check_args="--deselect=tests/compute/qemu/test_qemu_manager.py + --deselect=tests/compute/test_manager.py::test_get_abs_image_recursive_ova[pyloop] + --deselect=tests/compute/qemu/test_qemu_manager.py::test_binary_list + --deselect=tests/compute/qemu/test_qemu_vm.py::test_options[pyloop] + --deselect=tests/compute/qemu/test_qemu_vm.py::test_options_windows[pyloop] + --deselect=tests/compute/qemu/test_qemu_vm.py::test_run_with_kvm_linux_options_no_kvm[pyloop]" # The source archive contains statically linked artifacts for x86_64 # glibc, since this is the only architecture supported by upstream, we From 10a4eb4150f8053a78bbf869a59b3ede7fbaff01 Mon Sep 17 00:00:00 2001 From: Tim Sandquist Date: Sat, 4 Sep 2021 09:15:53 -0500 Subject: [PATCH 4/6] New package: python3-pytest-aiohttp-0.3.0 --- srcpkgs/python3-pytest-aiohttp/template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/python3-pytest-aiohttp/template diff --git a/srcpkgs/python3-pytest-aiohttp/template b/srcpkgs/python3-pytest-aiohttp/template new file mode 100644 index 000000000000..b0a34b27ce70 --- /dev/null +++ b/srcpkgs/python3-pytest-aiohttp/template @@ -0,0 +1,15 @@ +# Template file for 'python3-pytest-aiohttp' +pkgname=python3-pytest-aiohttp +version=0.3.0 +revision=1 +wrksrc="pytest-aiohttp-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-pytest" +short_desc="Pytest plugin for aiohttp support" +maintainer="Tim Sandquist " +license="Apache-2.0" +homepage="https://github.com/aio-libs/pytest-aiohttp/" +distfiles="${PYPI_SITE}/p/pytest-aiohttp/pytest-aiohttp-${version}.tar.gz" +checksum=c929854339637977375838703b62fef63528598bc0a9d451639eba95f4aaa44f +make_check=no # No tests available From 138c34687cc75048ab37c16284f0f5fe4e9b09f3 Mon Sep 17 00:00:00 2001 From: Tim Sandquist Date: Sat, 4 Sep 2021 09:16:14 -0500 Subject: [PATCH 5/6] New package: python3-pytest-timeout-1.4.2 --- srcpkgs/python3-pytest-timeout/template | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 srcpkgs/python3-pytest-timeout/template diff --git a/srcpkgs/python3-pytest-timeout/template b/srcpkgs/python3-pytest-timeout/template new file mode 100644 index 000000000000..354b1eedcd7c --- /dev/null +++ b/srcpkgs/python3-pytest-timeout/template @@ -0,0 +1,25 @@ +# Template file for 'python3-pytest-timeout' +pkgname=python3-pytest-timeout +version=1.4.2 +revision=1 +wrksrc="pytest-timeout-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-pytest" +checkdepends="${depends} python3-pexpect python3-pytest-cov" +short_desc="Pytest plugin which will terminate tests after a certain timeout" +maintainer="Tim Sandquist " +license="MIT" +homepage="https://github.com/pytest-dev/pytest-timeout/" +distfiles="${PYPI_SITE}/p/pytest-timeout/pytest-timeout-${version}.tar.gz" +checksum=20b3113cf6e4e80ce2d403b6fb56e9e1b871b510259206d40ff8d609f48bda76 + +post_install() { + vlicense LICENSE +} + +# adding do_check since the tests depend on this package +do_check() { + python setup.py install + pytest +} From 1dc3ded5af6e58fc2896500d7ebda4c5c1adac31 Mon Sep 17 00:00:00 2001 From: Tim Sandquist Date: Sat, 4 Sep 2021 20:09:25 -0500 Subject: [PATCH 6/6] python3-sentry: remove package * only used by gns3-server and gns3-gui * Sentry is used for crash reports and is not packaged in upstream releases https://github.com/GNS3/gns3-gui/blob/v2.2.24/gns3/crash_report.py#L29 https://github.com/GNS3/gns3-server/blob/master/gns3server/crash_report.py#L23 --- srcpkgs/python3-sentry/template | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 srcpkgs/python3-sentry/template diff --git a/srcpkgs/python3-sentry/template b/srcpkgs/python3-sentry/template deleted file mode 100644 index c2056965cad9..000000000000 --- a/srcpkgs/python3-sentry/template +++ /dev/null @@ -1,24 +0,0 @@ -# Template file for 'python3-sentry' -pkgname=python3-sentry -version=1.0.0 -revision=1 -wrksrc="sentry-python-${version}" -build_style=python3-module -hostmakedepends=python3-setuptools -depends="python3-certifi python3-urllib3" -checkdepends="${depends}" -short_desc="New Python SDK for Sentry.io" -maintainer="Karol Kosek " -license="BSD-2-Clause" -homepage="https://github.com/getsentry/sentry-python" -distfiles="https://github.com/getsentry/sentry-python/archive/${version}.tar.gz" -checksum=@514331143990028b4cecf9f8e4ff5dfe4c0dddd0dcb206b28b7fba22ada6cece - -do_check() { - cd build/lib - python3 -c 'import sentry_sdk as m; print(m)' -} - -post_install() { - vlicense LICENSE -}