git: 547ee8e902f4 - main - net-mgmt/netbox: Change RUN_DEPENDS
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 26 May 2024 10:19:49 UTC
The branch main has been updated by kai:
URL: https://cgit.FreeBSD.org/ports/commit/?id=547ee8e902f46e8b2642dc0bb3f4d09eff230d16
commit 547ee8e902f46e8b2642dc0bb3f4d09eff230d16
Author: Kai Knoblich <kai@FreeBSD.org>
AuthorDate: 2024-05-26 10:16:23 +0000
Commit: Kai Knoblich <kai@FreeBSD.org>
CommitDate: 2024-05-26 10:18:17 +0000
net-mgmt/netbox: Change RUN_DEPENDS
* Switch the port from the repo-copied py-dj42-django* ports to the
original ones as they're using Django 4.2 now since 680c68fd4d69.
* An exception here is devel/py-dj42-graphene-django, which is renamed
to devel/py-graphene-django300 because NetBox has known problems with
newer versions of devel/py-graphene-django. Add an entry to MOVED for
it as well.
* Adjust www/py-{dj42-}-graphiql-debug-toolbar accordingly due to the
rename of devel/py-dj42-graphene-django as described above and to
avoid installation conflicts.
* Bump PORTREVISION where necessary due changed dependencies.
PR: 276319
---
MOVED | 1 +
devel/Makefile | 2 +-
.../Makefile | 5 ++--
.../distinfo | 0
.../files/patch-setup.py | 0
.../pkg-descr | 0
net-mgmt/netbox/Makefile | 33 +++++++++++-----------
www/py-dj42-django-graphiql-debug-toolbar/Makefile | 3 +-
www/py-django-graphiql-debug-toolbar/Makefile | 4 +--
9 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/MOVED b/MOVED
index b53bd3b25b52..ea941e2d7b61 100644
--- a/MOVED
+++ b/MOVED
@@ -3254,3 +3254,4 @@ irc/sic||2024-05-15|Has expired: Last upstream release was in 2001 and no upstre
devel/tarpaulin|devel/cargo-tarpaulin|2024-05-19|Rename port and package to reflect that this is a Cargo plugin
sysutils/uutils-coreutils|sysutils/rust-coreutils|2024-05-21|Remove duplicate
databases/foundationdb|databases/foundationdb71-server|2024-05-23|Reintegrated into databases/foundationdb71-server
+devel/py-dj42-graphene-django|devel/py-graphene-django300|2024-05-26|Renamed to py-graphene-django300 for backwards compatibility with net-mgmt/netbox
diff --git a/devel/Makefile b/devel/Makefile
index 0971f2e38c73..e88694af9821 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -4685,7 +4685,6 @@
SUBDIR += py-distlib
SUBDIR += py-distributed
SUBDIR += py-dj42-django-rq
- SUBDIR += py-dj42-graphene-django
SUBDIR += py-django-rq
SUBDIR += py-dm-tree
SUBDIR += py-docformatter
@@ -4848,6 +4847,7 @@
SUBDIR += py-grab
SUBDIR += py-graphene
SUBDIR += py-graphene-django
+ SUBDIR += py-graphene-django300
SUBDIR += py-graphene-sqlalchemy
SUBDIR += py-graphene2
SUBDIR += py-graphql-core
diff --git a/devel/py-dj42-graphene-django/Makefile b/devel/py-graphene-django300/Makefile
similarity index 85%
rename from devel/py-dj42-graphene-django/Makefile
rename to devel/py-graphene-django300/Makefile
index 7c8895753a12..92496e622212 100644
--- a/devel/py-dj42-graphene-django/Makefile
+++ b/devel/py-graphene-django300/Makefile
@@ -2,7 +2,8 @@ PORTNAME= graphene-django
PORTVERSION= 3.0.0
CATEGORIES= devel python
MASTER_SITES= PYPI
-PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj42-
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX= 300
MAINTAINER= kai@FreeBSD.org
COMMENT= Graphene Django integration
@@ -31,6 +32,6 @@ OPTIONS_DEFINE= REST_FRAMEWORK
OPTIONS_DEFAULT=REST_FRAMEWORK
REST_FRAMEWORK_DESC= REST framework support
-REST_FRAMEWORK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dj42-djangorestframework>=3.6.3:www/py-dj42-djangorestframework@${PY_FLAVOR}
+REST_FRAMEWORK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}djangorestframework>=3.6.3:www/py-djangorestframework@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/devel/py-dj42-graphene-django/distinfo b/devel/py-graphene-django300/distinfo
similarity index 100%
rename from devel/py-dj42-graphene-django/distinfo
rename to devel/py-graphene-django300/distinfo
diff --git a/devel/py-dj42-graphene-django/files/patch-setup.py b/devel/py-graphene-django300/files/patch-setup.py
similarity index 100%
rename from devel/py-dj42-graphene-django/files/patch-setup.py
rename to devel/py-graphene-django300/files/patch-setup.py
diff --git a/devel/py-dj42-graphene-django/pkg-descr b/devel/py-graphene-django300/pkg-descr
similarity index 100%
rename from devel/py-dj42-graphene-django/pkg-descr
rename to devel/py-graphene-django300/pkg-descr
diff --git a/net-mgmt/netbox/Makefile b/net-mgmt/netbox/Makefile
index 0239c3c47d49..688460cdfa90 100644
--- a/net-mgmt/netbox/Makefile
+++ b/net-mgmt/netbox/Makefile
@@ -1,6 +1,7 @@
PORTNAME= netbox
DISTVERSIONPREFIX= v
DISTVERSION= 3.7.8
+PORTREVISION= 1
CATEGORIES= net-mgmt python
MAINTAINER= kai@FreeBSD.org
@@ -24,22 +25,22 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
# - www/py-dj42-djangorestframework
#
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django42>=4.2.11<4.3:www/py-django42@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dj42-django-cors-headers>=4.3.1<5:www/py-dj42-django-cors-headers@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dj42-django-debug-toolbar>=4.3.0<5:www/py-dj42-django-debug-toolbar@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dj42-django-filter>=23.5<25:www/py-dj42-django-filter@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dj42-django-graphiql-debug-toolbar>=0.2.0<1:www/py-dj42-django-graphiql-debug-toolbar@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dj42-django-mptt>=0.14.0<0.15:www/py-dj42-django-mptt@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dj42-django-prometheus>=2.3.1<2.4:www/py-dj42-django-prometheus@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dj42-django-redis>=5.4.0<6:www/py-dj42-django-redis@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dj42-django-rich>=1.8.0<2:www/py-dj42-django-rich@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dj42-django-rq>=2.10.2<2.11:devel/py-dj42-django-rq@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dj42-django-tables2>=2.7.0<2.8:www/py-dj42-django-tables2@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dj42-django-taggit>=5.0.1<6:www/py-dj42-django-taggit@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dj42-django-timezone-field>=6.1.0<7:www/py-dj42-django-timezone-field@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dj42-djangorestframework>=3.14.0<3.15.0:www/py-dj42-djangorestframework@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dj42-drf-spectacular>=0.27.2<1:www/py-dj42-drf-spectacular@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dj42-drf-spectacular-sidecar>=2024.5.1:www/py-dj42-drf-spectacular-sidecar@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dj42-graphene-django>=3.0.0<3.0.0_99:devel/py-dj42-graphene-django@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-cors-headers>=4.3.1<5:www/py-django-cors-headers@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-debug-toolbar>=4.3.0<5:www/py-django-debug-toolbar@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-filter>=23.5<25:www/py-django-filter@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-graphiql-debug-toolbar>=0.2.0<1:www/py-django-graphiql-debug-toolbar@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-mptt>=0.14.0<0.17:www/py-django-mptt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-prometheus>=2.3.1<2.4:www/py-django-prometheus@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-redis>=5.4.0<6:www/py-django-redis@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-rich>=1.8.0<2:www/py-django-rich@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-rq>=2.10.2<2.11:devel/py-django-rq@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-tables2>=2.7.0<2.8:www/py-django-tables2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-taggit>=5.0.1<6:www/py-django-taggit@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-timezone-field>=6.1.0<7:www/py-django-timezone-field@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}djangorestframework>=3.14.0,1<3.15.0,1:www/py-djangorestframework@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}drf-spectacular>=0.27.2<1:www/py-drf-spectacular@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}drf-spectacular-sidecar>=2024.5.1:www/py-drf-spectacular-sidecar@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}graphene-django300>=3.0.0<3.0.0_99:devel/py-graphene-django300@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}django-pglocks>=1.0.4<1.1:www/py-django-pglocks@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}bleach>=6.1.0<7:www/py-bleach@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}feedparser>=6.0.11<7:textproc/py-feedparser@${PY_FLAVOR} \
diff --git a/www/py-dj42-django-graphiql-debug-toolbar/Makefile b/www/py-dj42-django-graphiql-debug-toolbar/Makefile
index ff6ecfadde8b..5383050f86ae 100644
--- a/www/py-dj42-django-graphiql-debug-toolbar/Makefile
+++ b/www/py-dj42-django-graphiql-debug-toolbar/Makefile
@@ -1,5 +1,6 @@
PORTNAME= django-graphiql-debug-toolbar
DISTVERSION= 0.2.0
+PORTREVISION= 1
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj42-
@@ -12,7 +13,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django42>=2.2:www/py-django42@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dj42-graphene-django>=2.0.0:devel/py-dj42-graphene-django@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}graphene-django300>=2.0.0:devel/py-graphene-django300@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}dj42-django-debug-toolbar>=3.1:www/py-dj42-django-debug-toolbar@${PY_FLAVOR}
USES= python
diff --git a/www/py-django-graphiql-debug-toolbar/Makefile b/www/py-django-graphiql-debug-toolbar/Makefile
index f25e568066e1..e1f505847178 100644
--- a/www/py-django-graphiql-debug-toolbar/Makefile
+++ b/www/py-django-graphiql-debug-toolbar/Makefile
@@ -1,6 +1,6 @@
PORTNAME= django-graphiql-debug-toolbar
DISTVERSION= 0.2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +13,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django42>=2.2:www/py-django42@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}graphene-django>=2.0.0:devel/py-graphene-django@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}graphene-django300>=2.0.0:devel/py-graphene-django300@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}django-debug-toolbar>=3.1:www/py-django-debug-toolbar@${PY_FLAVOR}
USES= python