diff options
-rw-r--r-- | .SRCINFO | 27 | ||||
-rw-r--r-- | 0000-fix-removed-available_attrs.patch | 67 | ||||
-rw-r--r-- | 0000-set-default-not-debug.patch (renamed from 0002-set-default-not-debug.patch) | 6 | ||||
-rw-r--r-- | 0001-fix-removed-curry.patch | 24 | ||||
-rw-r--r-- | PKGBUILD | 25 |
5 files changed, 22 insertions, 127 deletions
@@ -1,6 +1,6 @@ pkgbase = openstack-horizon pkgdesc = OpenStack Dashboard - pkgver = 20.0.0 + pkgver = 20.1.0 pkgrel = 1 url = https://docs.openstack.org/horizon/latest/ arch = any @@ -30,6 +30,7 @@ pkgbase = openstack-horizon depends = gettext depends = python depends = python-pbr + depends = python-six depends = python-babel depends = python-debtcollector depends = python-django @@ -89,31 +90,23 @@ pkgbase = openstack-horizon depends = python-xstatic-termjs depends = python-xstatic-tv4 depends = python-enmerkar - source = https://pypi.io/packages/source/h/horizon/horizon-20.0.0.tar.gz - source = 0000-fix-removed-available_attrs.patch - source = 0001-fix-removed-curry.patch - source = 0002-set-default-not-debug.patch + source = https://pypi.io/packages/source/h/horizon/horizon-20.1.0.tar.gz + source = 0000-set-default-not-debug.patch source = wsgi-horizon.conf source = tmpfiles.conf source = sysusers.conf - md5sums = 269a8454499c9828bc2bff924f4d3db3 - md5sums = 0fd71d7f09bef8620b17a23b703e5db1 - md5sums = a7e1458d7f9697060175f88c10568a5e - md5sums = 73641056e201c4361995b058df692e1d + md5sums = b5c84a4f161f1c6e8ec9674d8b805f5e + md5sums = d8207cc37544a97a6ace55f37cf22e96 md5sums = 94282686c3903ff4a15e75c519186541 md5sums = ca5311dc0f58af1e2f5a306038128ce7 md5sums = c656448ba05ca49ffc6897d4e92e64d8 - sha256sums = 9abbc4fbb39a5bf3b473651eca7aafa273c07511fb38d5d69680a0d9fdba8777 - sha256sums = 30272a1395e1bbbfd97b97a5e54e57a470921991978ac0bc09a65750211e035e - sha256sums = ee1d5deb3da6dfb9f8995a34e05ff99ce12405b634a9efdb053f338127944f73 - sha256sums = 2081b7cf3c7159422251837fc5c1d84f93501164070ebf9a18f41b03a6152bcb + sha256sums = 940fc81816ca0b3cd5e8e341a603c58f1443d0c28249e883875469fc52995379 + sha256sums = e8982ef8ba683116e517801482280f59736cc6903d6e30b9fb3ecdcc3c163f8b sha256sums = be5b591bde6abef4b445170a2cef4325106e516c5adf15d3de6cd7f34753dc6f sha256sums = fab8d2aaf442c5e7760808a72a1e3209f3099377a7ae9fa7eb1d446effdcdee3 sha256sums = bef6fe090baba05e6a72fb118ba709eb945133ae8094ad5aa932bbf76a9ffe23 - sha512sums = 6cef68ce2d1f917fcf95f132205670657a8ee94eadf4b07f53a24d1f13ce8ab8859a8e7b1dded4d08bc91174e90a58b99a7e7f6ca0748c79d2462c267ca1a571 - sha512sums = c19c20c56b48788661b19536fb2c710d34facb4a0e50d59fea4794ff04fce4e3961fa57b3fcbc823b86df8dfb8ed376698149773079b0a9d05e9a2c5decc3d9f - sha512sums = ad9b72252cdd3ba9b3833b3ba78918907c67000ea935998bddb53ab0352fb5c7f883aa89ce3b93bdbcfac80e9e93013b5b69e52ee426cd26a29ec37ecb7f0ad9 - sha512sums = 3c2e632ca4c0f496aa0455db1db06d97a3a04bb9644d9d5d1095f578722edc1455d24682992a83576d36894bc0521968fec4a1ca369c5a427d02515a2022288e + sha512sums = ba36fccadc6a73cc7b917fb37c96052858947277b3c5e794fdddf3c27a97ccd3550f0b72787f2a3655a6a883b01c066507f217323cb44b84220bb5573f4b37ce + sha512sums = c7bd6d72218a2e11a1903a29899856ef00c0cf43fa1f0890023d7839e099eee5202956a948eaa19975348dbb619f6297d46f8e185406d58a85861d8352737ac5 sha512sums = d2fc3f55fcd224127c18b904be724da6eaeaf1ac7841b1415df038e192a91d6b18421ab17aae817bbbba5a8492e98f96e73539dd1f356c9c844abe141ef31a50 sha512sums = 127e9a9eb8ee19773ee579d86cf19bf8d41be1d222a7a241a3f36b4091d965249f96afba44cded8c79eeb10733f79b7b78bc8beb2c9446e43774a31bd5a04bf4 sha512sums = 58567414da7c38c5987158f2206e7b13617565944b233381faf3576b7124e4e2dc4244c55c791b104d047f2450ce55379c935e259af4f387b1415e60a972f29d diff --git a/0000-fix-removed-available_attrs.patch b/0000-fix-removed-available_attrs.patch deleted file mode 100644 index c925369fc8d0..000000000000 --- a/0000-fix-removed-available_attrs.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git a/horizon-20.0.0/horizon/decorators.py b/horizon-20.0.0/horizon/decorators.py -index fa67761..38cca3f 100644 ---- a/horizon-20.0.0/horizon/decorators.py -+++ b/horizon-20.0.0/horizon/decorators.py -@@ -21,13 +21,12 @@ General-purpose decorators for use with Horizon. - """ - import functools - --from django.utils.decorators import available_attrs - from django.utils.translation import ugettext_lazy as _ - - - def _current_component(view_func, dashboard=None, panel=None): - """Sets the currently-active dashboard and/or panel on the request.""" -- @functools.wraps(view_func, assigned=available_attrs(view_func)) -+ @functools.wraps(view_func, assigned=functools.WRAPPER_ASSIGNMENTS) - def dec(request, *args, **kwargs): - if dashboard: - request.horizon['dashboard'] = dashboard -@@ -46,7 +45,7 @@ def require_auth(view_func): - """ - from horizon.exceptions import NotAuthenticated - -- @functools.wraps(view_func, assigned=available_attrs(view_func)) -+ @functools.wraps(view_func, assigned=functools.WRAPPER_ASSIGNMENTS) - def dec(request, *args, **kwargs): - if request.user.is_authenticated: - return view_func(request, *args, **kwargs) -@@ -77,7 +76,7 @@ def require_perms(view_func, required): - current_perms = getattr(view_func, '_required_perms', set([])) - view_func._required_perms = current_perms | set(required) - -- @functools.wraps(view_func, assigned=available_attrs(view_func)) -+ @functools.wraps(view_func, assigned=functools.WRAPPER_ASSIGNMENTS) - def dec(request, *args, **kwargs): - if request.user.is_authenticated: - if request.user.has_perms(view_func._required_perms): -@@ -103,7 +102,7 @@ def require_component_access(view_func, component): - """ - from horizon.exceptions import NotAuthorized - -- @functools.wraps(view_func, assigned=available_attrs(view_func)) -+ @functools.wraps(view_func, assigned=functools.WRAPPER_ASSIGNMENTS) - def dec(request, *args, **kwargs): - if not component.can_access({'request': request}): - raise NotAuthorized(_("You are not authorized to access %s") -diff --git a/horizon-20.0.0/openstack_dashboard/api/rest/utils.py b/horizon-20.0.0/openstack_dashboard/api/rest/utils.py -index a9bc3ea..8073ffa 100644 ---- a/horizon-20.0.0/openstack_dashboard/api/rest/utils.py -+++ b/horizon-20.0.0/openstack_dashboard/api/rest/utils.py -@@ -17,7 +17,6 @@ import logging - - from django.conf import settings - from django import http --from django.utils import decorators - - from oslo_serialization import jsonutils - -@@ -104,7 +103,7 @@ def ajax(authenticated=True, data_required=False, - def decorator(function, authenticated=authenticated, - data_required=data_required): - @functools.wraps(function, -- assigned=decorators.available_attrs(function)) -+ assigned=functools.WRAPPER_ASSIGNMENTS) - def _wrapped(self, request, *args, **kw): - if authenticated and not request.user.is_authenticated: - return JSONResponse('not logged in', 401) diff --git a/0002-set-default-not-debug.patch b/0000-set-default-not-debug.patch index 4f7fcf81d0ff..b15caf453b37 100644 --- a/0002-set-default-not-debug.patch +++ b/0000-set-default-not-debug.patch @@ -1,7 +1,7 @@ -diff --git a/horizon-20.0.0/openstack_dashboard/local/local_settings.py.example b/horizon-20.0.0/openstack_dashboard/local/local_settings.py.example +diff --git a/horizon-20.1.0/openstack_dashboard/local/local_settings.py.example b/horizon-20.1.0/openstack_dashboard/local/local_settings.py.example index 2b084bf..b588971 100644 ---- a/horizon-20.0.0/openstack_dashboard/local/local_settings.py.example -+++ b/horizon-20.0.0/openstack_dashboard/local/local_settings.py.example +--- a/horizon-20.1.0/openstack_dashboard/local/local_settings.py.example ++++ b/horizon-20.1.0/openstack_dashboard/local/local_settings.py.example @@ -20,7 +20,7 @@ from horizon.utils import secret_key from openstack_dashboard.settings import HORIZON_CONFIG diff --git a/0001-fix-removed-curry.patch b/0001-fix-removed-curry.patch deleted file mode 100644 index d44cedde5ef8..000000000000 --- a/0001-fix-removed-curry.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/horizon-20.0.0/openstack_auth/views.py b/horizon-20.0.0/openstack_auth/views.py -index 353dc99..b7e5b7c 100644 ---- a/horizon-20.0.0/openstack_auth/views.py -+++ b/horizon-20.0.0/openstack_auth/views.py -@@ -12,6 +12,7 @@ - # limitations under the License. - import datetime - import logging -+import functools - - from django.conf import settings - from django.contrib import auth -@@ -116,9 +117,9 @@ def login(request): - initial.update({'region': requested_region}) - - if request.method == "POST": -- form = functional.curry(forms.Login) -+ form = functools.partial(forms.Login) - else: -- form = functional.curry(forms.Login, initial=initial) -+ form = functools.partial(forms.Login, initial=initial) - - choices = settings.WEBSSO_CHOICES - reason = get_csrf_reason(request.GET.get('csrf_failure')) @@ -3,7 +3,7 @@ _pyname=horizon pkgbase=openstack-$_pyname pkgname=(openstack-$_pyname{,-doc}) -pkgver=20.0.0 +pkgver=20.1.0 pkgrel=1 pkgdesc="OpenStack Dashboard" arch=('any') @@ -13,6 +13,7 @@ depends=( gettext python python-pbr + python-six python-babel python-debtcollector python-django @@ -101,31 +102,23 @@ checkdepends=( ) source=( "https://pypi.io/packages/source/${_pyname::1}/$_pyname/$_pyname-$pkgver.tar.gz" - 0000-fix-removed-available_attrs.patch - 0001-fix-removed-curry.patch - 0002-set-default-not-debug.patch + 0000-set-default-not-debug.patch wsgi-horizon.conf tmpfiles.conf sysusers.conf ) -md5sums=('269a8454499c9828bc2bff924f4d3db3' - '0fd71d7f09bef8620b17a23b703e5db1' - 'a7e1458d7f9697060175f88c10568a5e' - '73641056e201c4361995b058df692e1d' +md5sums=('b5c84a4f161f1c6e8ec9674d8b805f5e' + 'd8207cc37544a97a6ace55f37cf22e96' '94282686c3903ff4a15e75c519186541' 'ca5311dc0f58af1e2f5a306038128ce7' 'c656448ba05ca49ffc6897d4e92e64d8') -sha256sums=('9abbc4fbb39a5bf3b473651eca7aafa273c07511fb38d5d69680a0d9fdba8777' - '30272a1395e1bbbfd97b97a5e54e57a470921991978ac0bc09a65750211e035e' - 'ee1d5deb3da6dfb9f8995a34e05ff99ce12405b634a9efdb053f338127944f73' - '2081b7cf3c7159422251837fc5c1d84f93501164070ebf9a18f41b03a6152bcb' +sha256sums=('940fc81816ca0b3cd5e8e341a603c58f1443d0c28249e883875469fc52995379' + 'e8982ef8ba683116e517801482280f59736cc6903d6e30b9fb3ecdcc3c163f8b' 'be5b591bde6abef4b445170a2cef4325106e516c5adf15d3de6cd7f34753dc6f' 'fab8d2aaf442c5e7760808a72a1e3209f3099377a7ae9fa7eb1d446effdcdee3' 'bef6fe090baba05e6a72fb118ba709eb945133ae8094ad5aa932bbf76a9ffe23') -sha512sums=('6cef68ce2d1f917fcf95f132205670657a8ee94eadf4b07f53a24d1f13ce8ab8859a8e7b1dded4d08bc91174e90a58b99a7e7f6ca0748c79d2462c267ca1a571' - 'c19c20c56b48788661b19536fb2c710d34facb4a0e50d59fea4794ff04fce4e3961fa57b3fcbc823b86df8dfb8ed376698149773079b0a9d05e9a2c5decc3d9f' - 'ad9b72252cdd3ba9b3833b3ba78918907c67000ea935998bddb53ab0352fb5c7f883aa89ce3b93bdbcfac80e9e93013b5b69e52ee426cd26a29ec37ecb7f0ad9' - '3c2e632ca4c0f496aa0455db1db06d97a3a04bb9644d9d5d1095f578722edc1455d24682992a83576d36894bc0521968fec4a1ca369c5a427d02515a2022288e' +sha512sums=('ba36fccadc6a73cc7b917fb37c96052858947277b3c5e794fdddf3c27a97ccd3550f0b72787f2a3655a6a883b01c066507f217323cb44b84220bb5573f4b37ce' + 'c7bd6d72218a2e11a1903a29899856ef00c0cf43fa1f0890023d7839e099eee5202956a948eaa19975348dbb619f6297d46f8e185406d58a85861d8352737ac5' 'd2fc3f55fcd224127c18b904be724da6eaeaf1ac7841b1415df038e192a91d6b18421ab17aae817bbbba5a8492e98f96e73539dd1f356c9c844abe141ef31a50' '127e9a9eb8ee19773ee579d86cf19bf8d41be1d222a7a241a3f36b4091d965249f96afba44cded8c79eeb10733f79b7b78bc8beb2c9446e43774a31bd5a04bf4' '58567414da7c38c5987158f2206e7b13617565944b233381faf3576b7124e4e2dc4244c55c791b104d047f2450ce55379c935e259af4f387b1415e60a972f29d') |