From nobody Sun Apr 30 13:18:41 2023 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q8Rk96P4nz47nQH; Sun, 30 Apr 2023 13:18:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q8Rk95qbZz4Q4f; Sun, 30 Apr 2023 13:18:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682860721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QVTGNmSoKQn/xmG16LKEjzcq/xI9mAEVgimiqEqAscg=; b=dZluim7xDrEH+hW3wQ5+lHjgKJVDNtU7I0ojv5Lmw1tDrfjOL7+FQxwzWpujl4LNarb+81 Izo1un6JN+ahUT16sRMlbNKWqbVAgUXAsgItAPetbCRslNOM04G7gbJTrztG9I+7TAgHUn q9OAFFsa4mGrjf02X6wDPQavtOiKRY0DLTM1rZhAE2NFB8RZxWs9sr8oIB8o7aheSUsu7z uZk9S/vX9H0EflbIShE695se1IltWI1M0FZwY/XGGaamqmvilLJ2fbEE9kxaJ4b7c6J5Mw MF3CySOzbUIRvpWIk0+GH4JV7h5yyinmajWzsCiuv+qi+FzTe5XHKrlkiMEmVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682860721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QVTGNmSoKQn/xmG16LKEjzcq/xI9mAEVgimiqEqAscg=; b=mS+rjvWOZeRamUdZzfmBX/jcZNS81otck/9OPKk7/5Zy+Rx26Isvw9BPQ0yHjH+6GXZ5Rz 7tYJMAmZcs76Pnshgq1iRpAPYpwmAbbVRx2ZCSWD+YfJzaBmGQVHlyZBs59TsjSRX6CrJ1 n037oRNC28MPQTUmw/fFK82jmNHHIMJ0MacYdXu9x83s37c4fGTq7Rv5zs32dsVzpuKkVT 9Zs4eDpoiHPHNoL3RdPXL0v9LzFlX5YELPoTS+7tgLlDDCxftiu9G40yyXZ0h6oUZ4HboZ DtcgVI7eMYW+iX9pCm6V2Pfj9ji5/gUCHRcR1tPX7aurr67I0F6Jxd1RteT6Lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682860721; a=rsa-sha256; cv=none; b=mWEV/oAXMNXwHwCAIUAzYeHnRaN8CxnwzVmNFrXD1A3t9aXKsEOmGcJcznqqR+5a8d9cnP irtM+H3NMqzzy3YkOVunvfkH3b/incfg8coYgrCvQOixxB9zJTPArYRtLIzZOPsH+q5gMC zdQUlYo+J56sH4wZvaKqTVuYg+gvZ0a1AvWJdz3TfoXt9GMWOgipQ4U+FAt5nBdfCWxKTk 8mHUNWMOilEg5j4z7zCwYwIPsyt2ogf4TNOkcqC5Xcmcc9Wb4T9fvgwUlsVsuZUCGSvmG8 EnNY9fcyRZLcSrqP3H9VmZ28jS9RpPRN4nbwdOKzKgg1uwNZfx4TSfNhaxtm1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q8Rk94wCgzQGb; Sun, 30 Apr 2023 13:18:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33UDIfcD001111; Sun, 30 Apr 2023 13:18:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33UDIfNw001110; Sun, 30 Apr 2023 13:18:41 GMT (envelope-from git) Date: Sun, 30 Apr 2023 13:18:41 GMT Message-Id: <202304301318.33UDIfNw001110@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Kai Knoblich Subject: git: 16131078e34d - 2023Q2 - net-mgmt/py-phonebox-plugin: Update to 0.0.5b1 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kai X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 16131078e34d0a2ce7e12d5956ee40ab9c15bab7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=16131078e34d0a2ce7e12d5956ee40ab9c15bab7 commit 16131078e34d0a2ce7e12d5956ee40ab9c15bab7 Author: Kai Knoblich AuthorDate: 2023-04-29 18:21:17 +0000 Commit: Kai Knoblich CommitDate: 2023-04-30 13:17:59 +0000 net-mgmt/py-phonebox-plugin: Update to 0.0.5b1 * Remove upstreamed patch. Changelog: https://github.com/iDebugAll/phonebox_plugin/releases/tag/v0.0.5-beta.1 Reported by: Mike Geiger (via e-mail) MFH: 2023Q2 (cherry picked from commit 3d5e6aa16fa62ca756a7a79f8296db1ede9e42a9) --- net-mgmt/py-phonebox-plugin/Makefile | 3 +- net-mgmt/py-phonebox-plugin/distinfo | 6 +- .../patch-fix-runtime-with-netbox-3.3-and-later | 187 --------------------- 3 files changed, 4 insertions(+), 192 deletions(-) diff --git a/net-mgmt/py-phonebox-plugin/Makefile b/net-mgmt/py-phonebox-plugin/Makefile index a7e22f06d40f..de6f32cf63cd 100644 --- a/net-mgmt/py-phonebox-plugin/Makefile +++ b/net-mgmt/py-phonebox-plugin/Makefile @@ -1,6 +1,5 @@ PORTNAME= phonebox-plugin -DISTVERSION= 0.0.4b1 -PORTREVISION= 1 +DISTVERSION= 0.0.5b1 CATEGORIES= net-mgmt python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net-mgmt/py-phonebox-plugin/distinfo b/net-mgmt/py-phonebox-plugin/distinfo index 223494bd5e1b..c00a23a6498b 100644 --- a/net-mgmt/py-phonebox-plugin/distinfo +++ b/net-mgmt/py-phonebox-plugin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1654793403 -SHA256 (phonebox_plugin-0.0.4b1.tar.gz) = 73a6cac57df8af9f69782e720b7c7336645464fe96af60d340b0854f05ec4bbb -SIZE (phonebox_plugin-0.0.4b1.tar.gz) = 19295 +TIMESTAMP = 1682785060 +SHA256 (phonebox_plugin-0.0.5b1.tar.gz) = 10e3e92cd7d44a800ce3705adaf26ee011b5b7857cdcfae1a1aa3f9b6daa3a4d +SIZE (phonebox_plugin-0.0.5b1.tar.gz) = 19037 diff --git a/net-mgmt/py-phonebox-plugin/files/patch-fix-runtime-with-netbox-3.3-and-later b/net-mgmt/py-phonebox-plugin/files/patch-fix-runtime-with-netbox-3.3-and-later deleted file mode 100644 index b04dd8661c77..000000000000 --- a/net-mgmt/py-phonebox-plugin/files/patch-fix-runtime-with-netbox-3.3-and-later +++ /dev/null @@ -1,187 +0,0 @@ -Fix runtime issues with NetBox 3.3+ - -See also: - -https://github.com/iDebugAll/phonebox_plugin/issues/27 -https://github.com/iDebugAll/phonebox_plugin/pull/28 - ---- MANIFEST.in.orig 2023-02-21 21:36:03 UTC -+++ MANIFEST.in -@@ -1,4 +1,5 @@ recursive-include phonebox_plugin/templates * - include README.md - include LICENSE - recursive-include phonebox_plugin/templates * -+recursive-exclude phonebox_plugin/templates *.orig .DS_Store - recursive-include phonebox_plugin/static * ---- phonebox_plugin/api/nested_serializers.py.orig 2021-09-21 14:31:12 UTC -+++ phonebox_plugin/api/nested_serializers.py -@@ -1,6 +1,12 @@ from phonebox_plugin import models - from rest_framework import serializers - from phonebox_plugin import models --from netbox.api import WritableNestedSerializer -+ -+try: -+ from netbox.api import ChoiceField, WritableNestedSerializer -+except ImportError: -+ from netbox.api.fields import ChoiceField -+ from netbox.api.serializers.nested import WritableNestedSerializer -+ - from tenancy.api.nested_serializers import NestedTenantSerializer - - __all__ = ["NestedNumberSerializer", ] ---- phonebox_plugin/templates/phonebox_plugin/list_view_3.4.html.orig 2023-02-21 21:32:23 UTC -+++ phonebox_plugin/templates/phonebox_plugin/list_view_3.4.html -@@ -0,0 +1,62 @@ -+{% extends 'base/layout.html' %} -+{% load buttons %} -+{% load static %} -+{% load plugins %} -+{% load helpers %} -+ -+ -+{% block controls %} -+ -+
-+ {% if perms.phonebox_plugin.add_number %} -+ -+ Add -+ -+ {% endif %} -+ {% if perms.phonebox_plugin.add_number %} -+ -+ Import -+ -+ {% endif %} -+
-+ -+{% endblock %} -+ -+ -+{% block content %} -+ -+
    -+ -+ -+
-+ -+
-+
-+ -+ {# Applied filters #} -+ {% if filter_form %} -+ {% applied_filters model filter_form request.GET %} -+ {% endif %} -+ -+

{% block title %}Numbers{% endblock %}

-+
-+
-+ {% include 'phonebox_plugin/obj_table.html' with bulk_delete_url="plugins:phonebox_plugin:number_bulk_delete" bulk_edit_url="plugins:phonebox_plugin:number_bulk_edit" %} -+
-+
-+
-+
-+ {% include 'inc/filter_list.html' %} -+
-+
-+ -+{% endblock %} ---- phonebox_plugin/templates/phonebox_plugin/voice_circuit_list_view_3.4.html.orig 2023-02-21 21:32:23 UTC -+++ phonebox_plugin/templates/phonebox_plugin/voice_circuit_list_view_3.4.html -@@ -0,0 +1,62 @@ -+{% extends 'base/layout.html' %} -+{% load buttons %} -+{% load static %} -+{% load plugins %} -+{% load helpers %} -+ -+ -+{% block controls %} -+ -+
-+ {% if perms.phonebox_plugin.add_voice_circuit %} -+ -+ Add -+ -+ {% endif %} -+ {% if perms.phonebox_plugin.add_voice_circuit %} -+ -+ Import -+ -+ {% endif %} -+
-+ -+{% endblock %} -+ -+ -+{% block content %} -+ -+
    -+ -+ -+
-+ -+
-+
-+ -+ {# Applied filters #} -+ {% if filter_form %} -+ {% applied_filters model filter_form request.GET %} -+ {% endif %} -+ -+

{% block title %}Voice Circuits{% endblock %}

-+
-+
-+ {% include 'phonebox_plugin/obj_table.html' with bulk_delete_url="plugins:phonebox_plugin:voice_circuit_bulk_delete" bulk_edit_url="plugins:phonebox_plugin:voice_circuit_bulk_edit" %} -+
-+
-+
-+
-+ {% include 'inc/filter_list.html' %} -+
-+
-+ -+{% endblock %} ---- phonebox_plugin/views.py.orig 2022-06-09 10:46:13 UTC -+++ phonebox_plugin/views.py -@@ -18,8 +18,10 @@ class NumberListView(generic.ObjectListView): - filterset = filters.NumberFilterSet - filterset_form = forms.NumberFilterForm - table = tables.NumberTable -- if NETBOX_CURRENT_VERSION >= version.parse("3.0"): -+ if NETBOX_CURRENT_VERSION >= version.parse("3.0") and NETBOX_CURRENT_VERSION < version.parse("3.4"): - template_name = "phonebox_plugin/list_view_3.x.html" -+ elif NETBOX_CURRENT_VERSION >= version.parse("3.4"): -+ template_name = "phonebox_plugin/list_view_3.4.html" - else: - template_name = "phonebox_plugin/list_view.html" - -@@ -76,8 +78,10 @@ class VoiceCircuitListView(generic.ObjectListView): - filterset = filters.VoiceCircuitFilterSet - filterset_form = forms.VoiceCircuitFilterForm - table = tables.VoiceCircuitTable -- if NETBOX_CURRENT_VERSION >= version.parse("3.0"): -+ if NETBOX_CURRENT_VERSION >= version.parse("3.0") and NETBOX_CURRENT_VERSION < version.parse("3.4"): - template_name = "phonebox_plugin/voice_circuit_list_view_3.x.html" -+ elif NETBOX_CURRENT_VERSION >= version.parse("3.4"): -+ template_name = "phonebox_plugin/voice_circuit_list_view_3.4.html" - else: - template_name = "phonebox_plugin/voice_circuit_list_view.html" -