From owner-dev-commits-ports-main@freebsd.org Sun Jun 20 11:44:23 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EF59164E69C; Sun, 20 Jun 2021 11:44:23 +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 4G79ml41kWz4spH; Sun, 20 Jun 2021 11:44:23 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 BE4861329; Sun, 20 Jun 2021 11:44:22 +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 15KBiMJn017116; Sun, 20 Jun 2021 11:44:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15KBiMVx017115; Sun, 20 Jun 2021 11:44:22 GMT (envelope-from git) Date: Sun, 20 Jun 2021 11:44:22 GMT Message-Id: <202106201144.15KBiMVx017115@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 6730f633c04e - main - www/py-horizon: Update to 19.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6730f633c04ecaa2de7fb6e716d26d8eda59abd3 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jun 2021 11:44:24 -0000 The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=6730f633c04ecaa2de7fb6e716d26d8eda59abd3 commit 6730f633c04ecaa2de7fb6e716d26d8eda59abd3 Author: Po-Chuan Hsieh AuthorDate: 2021-06-20 11:38:22 +0000 Commit: Po-Chuan Hsieh CommitDate: 2021-06-20 11:38:22 +0000 www/py-horizon: Update to 19.2.0 - Add PORTSCOUT Changes: https://docs.openstack.org/releasenotes/horizon/ --- www/py-horizon/Makefile | 46 ++++++++++++++--------------- www/py-horizon/distinfo | 6 ++-- www/py-horizon/files/patch-requirements.txt | 11 +++++++ 3 files changed, 36 insertions(+), 27 deletions(-) diff --git a/www/py-horizon/Makefile b/www/py-horizon/Makefile index 48d5e0521006..469cc64fda16 100644 --- a/www/py-horizon/Makefile +++ b/www/py-horizon/Makefile @@ -1,10 +1,9 @@ # Created by: Alexander Nusov PORTNAME= horizon -PORTVERSION= 17.1.0 -PORTREVISION= 3 +PORTVERSION= 19.2.0 CATEGORIES= www python -MASTER_SITES= https://tarballs.openstack.org/horizon/ +MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org @@ -14,28 +13,28 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pint>=0.5:devel/py-pint@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django-babel>=0.6.2:www/py-django-babel@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.6.0:devel/py-babel@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django_compressor>=2.0:www/py-django_compressor@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-debreach>=1.4.2:www/py-django-debreach@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-pyscss>=2.0.2:www/py-django-pyscss@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django22>=2.2<3.0:www/py-django22@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}enmerkar>=0.7.1:www/py-enmerkar@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}futurist>=1.2.0:devel/py-futurist@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.4.0:devel/py-keystoneauth1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.18:net/py-netaddr@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.25.0:devel/py-oslo.concurrency@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.26.0:devel/py-oslo.concurrency@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.30.0:devel/py-oslo.policy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.policy>=3.2.0:devel/py-oslo.policy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oslo.upgradecheck>=0.1.1:devel/py-oslo.upgradecheck@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.40.0:devel/py-oslo.utils@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}osprofiler>=2.3.0:devel/py-osprofiler@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pymongo>=3.0.2:databases/pymongo@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyscss>=1.3.4:textproc/py-pyscss@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyscss>=1.3.7:textproc/py-pyscss@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-cinderclient>=5.0.0:net/py-python-cinderclient@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-glanceclient>=2.8.0:net/py-python-glanceclient@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.22.0:net/py-python-keystoneclient@${PY_FLAVOR} \ @@ -43,9 +42,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-novaclient>=9.1.0:net/py-python-novaclient@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-swiftclient>=3.2.0:databases/py-python-swiftclient@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2013.6:devel/py-pytz@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.12.0:devel/py-yaml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}semantic-version>=2.3.1:devel/py-semantic-version@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xstatic>=1.0.0:devel/py-xstatic@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xstatic-angular>=1.5.8.0:devel/py-xstatic-angular@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xstatic-angular-bootstrap>=2.2.0.0:devel/py-xstatic-angular-bootstrap@${PY_FLAVOR} \ @@ -57,16 +56,16 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xstatic-bootstrap-scss>=3.3.7.1:devel/py-xstatic-bootstrap-scss@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xstatic-bootswatch>=3.3.7.0:devel/py-xstatic-bootswatch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xstatic-d3>=3.5.17.0:devel/py-xstatic-d3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}xstatic-hogan>=2.0.0.2:devel/py-xstatic-hogan@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xstatic-font-awesome>=4.7.0.0:devel/py-xstatic-font-awesome@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xstatic-hogan>=2.0.0.2:devel/py-xstatic-hogan@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xstatic-jasmine>=2.4.1.1:devel/py-xstatic-jasmine@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}xstatic-jquery>=1.8.2.1:devel/py-xstatic-jquery@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xstatic-jquery>=1.12.4.1:devel/py-xstatic-jquery@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xstatic-jquery-migrate>=1.2.1.1:devel/py-xstatic-jquery-migrate@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xstatic-jquery-ui>=1.12.1.1:devel/py-xstatic-jquery-ui@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xstatic-jquery.quicksearch>=2.0.3.1:devel/py-xstatic-jquery.quicksearch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xstatic-jquery.tablesorter>=2.14.5.1:devel/py-xstatic-jquery.tablesorter@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}xstatic-jquery-ui>=1.10.4.1:devel/py-xstatic-jquery-ui@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xstatic-jsencrypt>=2.3.1.1:devel/py-xstatic-jsencrypt@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}xstatic-mdi>=1.4.57.0:devel/py-xstatic-mdi@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xstatic-mdi>=1.6.50.2:devel/py-xstatic-mdi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xstatic-objectpath>=1.2.1.0:devel/py-xstatic-objectpath@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xstatic-rickshaw>=1.5.0.0:devel/py-xstatic-rickshaw@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xstatic-roboto-fontface>=0.5.0.0:devel/py-xstatic-roboto-fontface@${PY_FLAVOR} \ @@ -86,7 +85,9 @@ GROUPS= horizon SUB_FILES= pkg-message SUB_LIST= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} -CONFLICTS_INSTALL= py??-horizon-* +CONFLICTS_INSTALL= py??-horizon + +PORTSCOUT= skipv:2012.2.3,2012.2.4,2013.1,2013.1.1,2013.1.2,2013.1.3,2013.1.4,2013.1.5,2013.2,2013.2.1,2013.2.2,2013.2.3,2013.2.4,2014.1,2014.1.1,2014.1.2,2014.1.3,2014.1.4,2014.1.5,2014.2,2014.2.1,2014.2.2,2014.2.3,2014.2.4,2015.1.0,2015.1.1,2015.1.2,2015.1.3,2015.1.4 OPTIONS_RADIO= CACHE OPTIONS_RADIO_CACHE= MEMCACHED REDIS @@ -94,10 +95,7 @@ OPTIONS_DEFAULT=MEMCACHED MEMCACHED_DESC= Use memcached as caching backend REDIS_DESC= Use Redis as caching backend -MEMCACHED_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-memcached>0:databases/py-python-memcached@${PY_FLAVOR} -REDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis@${PY_FLAVOR} - -post-patch: - @${REINPLACE_CMD} -Ee 's|(pyScss)!=1.3.5,|\1|' ${WRKSRC}/requirements.txt +MEMCACHED_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-memcached>=0:databases/py-python-memcached@${PY_FLAVOR} +REDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=0:databases/py-redis@${PY_FLAVOR} .include diff --git a/www/py-horizon/distinfo b/www/py-horizon/distinfo index 1c28950efac0..f49e3c6ae389 100644 --- a/www/py-horizon/distinfo +++ b/www/py-horizon/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1586160958 -SHA256 (horizon-17.1.0.tar.gz) = 4aa0aa52d1258e4f88b84dde3d67be07f603e302e0cca003b626fa5b89d4c10a -SIZE (horizon-17.1.0.tar.gz) = 5304876 +TIMESTAMP = 1623697086 +SHA256 (horizon-19.2.0.tar.gz) = 3f8f78a23876c3efcbe4cb91898b2594e4203c1535461532cba372f230faf3a5 +SIZE (horizon-19.2.0.tar.gz) = 5592649 diff --git a/www/py-horizon/files/patch-requirements.txt b/www/py-horizon/files/patch-requirements.txt new file mode 100644 index 000000000000..dc4de2616e5d --- /dev/null +++ b/www/py-horizon/files/patch-requirements.txt @@ -0,0 +1,11 @@ +--- requirements.txt.orig 2021-04-12 09:08:50 UTC ++++ requirements.txt +@@ -54,7 +54,7 @@ XStatic-D3>=3.5.17.0 # BSD License (3 clause) + XStatic-Hogan>=2.0.0.2 # Apache 2.0 License + XStatic-Font-Awesome>=4.7.0.0 # SIL OFL 1.1 License, MIT License + XStatic-Jasmine>=2.4.1.1 # MIT License +-XStatic-jQuery>=1.12.4.1,<2 # MIT License ++XStatic-jQuery>=1.12.4.1 # MIT License + XStatic-JQuery-Migrate>=1.2.1.1 # MIT License + XStatic-JQuery.quicksearch>=2.0.3.1 # MIT License + XStatic-JQuery.TableSorter>=2.14.5.1 # MIT License