From: Maksym Yatsenko Date: Mon, 5 Jan 2015 13:05:50 +0000 (+0200) Subject: added patch for python2.6 compatibility X-Git-Tag: mos-9.0~29 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=faa8d3113cd3b4c2bbd2086aa7732912c8fb3428;p=openstack-build%2Fhorizon-build.git added patch for python2.6 compatibility update requirements Related-Bug: #1409025 Change-Id: Id44850c33ccfccfd2cdc1bdf983745ba5e47c807 --- diff --git a/rpm/SOURCES/0012-python26-syntax-fix.patch b/rpm/SOURCES/0012-python26-syntax-fix.patch new file mode 100644 index 0000000..8341d10 --- /dev/null +++ b/rpm/SOURCES/0012-python26-syntax-fix.patch @@ -0,0 +1,43 @@ +From 3d0d61c334e7f62d993010780fa5f57775957aa6 Mon Sep 17 00:00:00 2001 +From: Vasyl Saienko +Date: Wed, 14 Jan 2015 05:40:21 -0500 +Subject: [PATCH] python26 syntax fix + +--- + openstack_dashboard/api/cinder.py | 4 ++-- + openstack_dashboard/api/neutron.py | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/openstack_dashboard/api/cinder.py b/openstack_dashboard/api/cinder.py +index 7179f87..996c6f4 100644 +--- a/openstack_dashboard/api/cinder.py ++++ b/openstack_dashboard/api/cinder.py +@@ -188,8 +188,8 @@ def volume_list(request, search_opts=None): + return [] + + # build a dictionary of volume_id -> transfer +- transfers = {t.volume_id: t +- for t in transfer_list(request, search_opts=search_opts)} ++ transfers = dict([(t.volume_id, t) ++ for t in transfer_list(request, search_opts=search_opts)]) + + volumes = [] + for v in c_client.volumes.list(search_opts=search_opts): +diff --git a/openstack_dashboard/api/neutron.py b/openstack_dashboard/api/neutron.py +index d591bec..ee20baf 100644 +--- a/openstack_dashboard/api/neutron.py ++++ b/openstack_dashboard/api/neutron.py +@@ -427,8 +427,8 @@ class FloatingIpManager(network_base.FloatingIpManager): + config_name='enable_lb', + ext_name='lbaas'): + # Also get the loadbalancer VIPs +- vip_dict = {v['port_id']: v['name'] +- for v in self.client.list_vips().get('vips', [])} ++ vip_dict = dict([(v['port_id'], v['name']) ++ for v in self.client.list_vips().get('vips', [])]) + else: + vip_dict = {} + +-- +1.7.1 + diff --git a/rpm/SPECS/python-django-horizon.spec b/rpm/SPECS/python-django-horizon.spec index a203108..8c11fc2 100644 --- a/rpm/SPECS/python-django-horizon.spec +++ b/rpm/SPECS/python-django-horizon.spec @@ -1,4 +1,5 @@ %global with_compression 1 + Name: python-django-horizon Version: 2014.2.b3 Release: 1%{?dist} @@ -29,6 +30,7 @@ Source4: openstack-dashboard-httpd-logging.conf #Patch0009: 0009-remove-runtime-dep-to-python-pbr.patch #Patch0010: 0010-Add-Change-password-link-to-the-RCUE-theme.patch #Patch0011: 0011-.less-replaced-in-rcue.patch +Patch0012: 0012-python26-syntax-fix.patch # # BuildArch needs to be located below patches in the spec file. Don't ask! @@ -36,40 +38,53 @@ Source4: openstack-dashboard-httpd-logging.conf BuildArch: noarch -# epel6 has a separate Django14 package -BuildRequires: python-django >= 1.5 -Requires: python-django >= 1.5 +BuildRequires: python2-devel +BuildRequires: python-setuptools +BuildRequires: python-sphinx +BuildRequires: python-oslo-sphinx >= 2.2.0 +BuildRequires: python-mock >= 1.0 +BuildRequires: python-mox >= 0.5.3 -Requires: python-dateutil -Requires: pytz -Requires: python-lockfile >= 0.8 -Requires: python-six >= 1.7.0 +BuildRequires: python-pbr >= 0.6, python-pbr < 1.0 +BuildRequires: python-django >= 1.4.2, python-django < 1.7 +BuildRequires: python-Pint >= 0.5 -BuildRequires: python2-devel -BuildRequires: python-setuptools -BuildRequires: python-d2to1 -BuildRequires: python-pbr > 0.7.0 +BuildRequires: python-django-compressor >= 1.4 +BuildRequires: python-django-openstack-auth >= 1.1.7 +BuildRequires: python-django-pyscss >= 1.0.3 BuildRequires: python-lockfile >= 0.8 -BuildRequires: python-eventlet -BuildRequires: git -BuildRequires: python-six >= 1.7.0 -BuildRequires: python-babel -# for checks: -%if 0%{?rhel} == 0 -BuildRequires: python-django-nose >= 1.2 -BuildRequires: python-coverage -BuildRequires: python-mox -BuildRequires: python-nose-exclude -BuildRequires: python-nose -BuildRequires: python-selenium -%endif -BuildRequires: python-netaddr >= 0.7.12 -BuildRequires: python-kombu -BuildRequires: python-anyjson -BuildRequires: python-iso8601 +BuildRequires: python-XStatic >= 1.0.0 +BuildRequires: python-XStatic-Angular >= 1.3.7 +BuildRequires: python-XStatic-Angular-Bootstrap >= 0.11.0.2 +BuildRequires: python-XStatic-Bootstrap-Datepicker >= 1.3.1.0 +BuildRequires: python-XStatic-Bootstrap-SCSS >= 3 +BuildRequires: python-XStatic-D3 >= 3.1.6.2 +BuildRequires: python-XStatic-Hogan >= 2.0.0.2 +BuildRequires: python-XStatic-Font-Awesome >= 4.2.0 +BuildRequires: python-XStatic-Jasmine >= 1.3.1.1 +BuildRequires: python-XStatic-jQuery >= 1.7.2 +BuildRequires: python-XStatic-JQuery-Migrate >= 1.2.1.1 +BuildRequires: python-XStatic-JQuery.quicksearch >= 2.0.3.1 +BuildRequires: python-XStatic-JQuery.TableSorter >= 2.0.5b.0 +BuildRequires: python-XStatic-jquery-ui >= 1.10.1 +BuildRequires: python-XStatic-JSEncrypt >= 2.0.0.2 +BuildRequires: python-XStatic-QUnit >= 1.14.0.2 +BuildRequires: python-XStatic-Rickshaw >= 1.5.0 +BuildRequires: python-XStatic-smart-table >= 1.4.5.3 +BuildRequires: python-XStatic-Spin >= 1.2.5.2 +BuildRequires: python-ceilometerclient >= 1.0.6 +BuildRequires: python-cinderclient >= 1.1.0 +BuildRequires: python-glanceclient >= 0.15.0 +BuildRequires: python-heatclient >= 0.2.9 +BuildRequires: python-keystoneclient >= 0.11.1 +BuildRequires: python-neutronclient >= 2.3.6, python-neutronclient < 3.0 +BuildRequires: python-novaclient >= 2.18.0 +BuildRequires: python-saharaclient >= 0.7.6 +BuildRequires: python-swiftclient >= 2.2.0 +BuildRequires: python-troveclient >= 1.0.7 # additional provides to be consistent with other django packages Provides: django-horizon = %{version}-%{release} @@ -88,86 +103,59 @@ Group: Applications/System Requires: httpd Requires: mod_wsgi -Requires: python-django-horizon >= %{version} -Requires: python-django-openstack-auth >= 1.1.7 -Requires: python-django-compressor >= 1.4 -Requires: python-django-appconf -%if %{?with_compression} > 0 Requires: python-lesscpy -%endif +Requires: python-django-horizon >= %{version} -Requires: python-glanceclient >= 0.14.0 -Requires: python-keystoneclient >= 1:0.10.0 -Requires: python-novaclient >= 2.18.0 -Requires: python-neutronclient >= 2.3.6, python-neutronclient < 3.0 -Requires: python-cinderclient >= 1.0.7 -Requires: python-swiftclient >= 2.2.0 -Requires: python-heatclient >= 0.2.9 -Requires: python-ceilometerclient >= 1.0.6 -Requires: python-troveclient >= 1.0.4 -Requires: python-saharaclient >= 0.7.3 +Requires: python-pbr >= 0.6, python-pbr < 1.0 +Requires: python-django >= 1.4.2, python-django < 1.7 +Requires: python-babel >= 1.3 +Requires: python-Pint >= 0.5 +Requires: python-django-compressor >= 1.4 +Requires: python-django-openstack-auth >= 1.1.7 +Requires: python-django-pyscss >= 1.0.3 +Requires: python-eventlet >= 0.15.2 Requires: python-httplib2 >= 0.7.5 Requires: python-iso8601 >= 0.1.9 Requires: python-kombu >= 2.5.0 -Requires: python-netaddr -Requires: python-oslo-config -Requires: python-pbr >= 0.6, python-pbr < 0.7, python-pbr > 0.7, python-pbr < 1.0 -Requires: python-eventlet >= 0.15.1 -Requires: python-django >= 1.4.2, python-django < 1.7 -Requires: python-django-pyscss >= 1.0.3 +Requires: python-lockfile >= 0.8 +Requires: python-netaddr >= 0.7.12 +Requires: python-oslo-config >= 1.6 +Requires: python-oslo.i18n >= 1.0.0 +Requires: python-oslo-serialization >= 1.2.0 +Requires: python-oslo.utils >= 1.2.0 +Requires: python-pyscss >= 1.2.1, python-pyscss < 1.3 +Requires: python-ceilometerclient >= 1.0.6 +Requires: python-cinderclient >= 1.1.0 +Requires: python-glanceclient >= 0.15.0 +Requires: python-heatclient >= 0.2.9 +Requires: python-keystoneclient >= 0.11.1 +Requires: python-neutronclient >= 2.3.6, python-neutronclient < 3.0 +Requires: python-novaclient >= 2.18.0 +Requires: python-saharaclient >= 0.7.6 +Requires: python-swiftclient >= 2.2.0 +Requires: python-troveclient >= 1.0.7 +Requires: pytz +Requires: PyYAML +Requires: python-six >= 1.7.0 Requires: python-XStatic >= 1.0.0 -Requires: python-XStatic-Angular >= 1.2.1.1 -Requires: python-XStatic-Angular-Cookies >= 1.2.1.1 -Requires: python-XStatic-Angular-Mock >= 1.2.1.1 -Requires: python-XStatic-D3 >= 3.1.6.2 +Requires: python-XStatic-Angular >= 1.3.7 +Requires: python-XStatic-Angular-Bootstrap >= 0.11.0.2 Requires: python-XStatic-Bootstrap-Datepicker >= 1.3.1.0 Requires: python-XStatic-Bootstrap-SCSS >= 3 -Requires: python-XStatic-Font-Awesome >= 4.1.0 +Requires: python-XStatic-D3 >= 3.1.6.2 Requires: python-XStatic-Hogan >= 2.0.0.2 +Requires: python-XStatic-Font-Awesome >= 4.2.0 +Requires: python-XStatic-Jasmine >= 1.3.1.1 +Requires: python-XStatic-jQuery >= 1.7.2 Requires: python-XStatic-JQuery-Migrate >= 1.2.1.1 +Requires: python-XStatic-JQuery.quicksearch >= 2.0.3.1 Requires: python-XStatic-JQuery.TableSorter >= 2.0.5b.0 Requires: python-XStatic-jquery-ui >= 1.10.1 -Requires: python-XStatic-JQuery.quicksearch >= 2.0.3.1 Requires: python-XStatic-JSEncrypt >= 2.0.0.2 -Requires: python-XStatic-Jasmine >= 1.3.1.1 Requires: python-XStatic-QUnit >= 1.14.0.2 Requires: python-XStatic-Rickshaw >= 1.5.0 +Requires: python-XStatic-smart-table >= 1.4.5.3 Requires: python-XStatic-Spin >= 1.2.5.2 -Requires: python-XStatic-jQuery >= 1.7.2 -Requires: python-XStatic-Bootstrap-Datepicker >= 1.3.1.0 -Requires: python-oslo-serialization >= 1.0.0 - -BuildRequires: python-django-openstack-auth >= 1.1.7 -BuildRequires: python-django-compressor >= 1.4 -BuildRequires: python-django-appconf -BuildRequires: python-lesscpy -BuildRequires: python-oslo-config -BuildRequires: python-django-pyscss >= 1.0.3 -BuildRequires: python-XStatic >= 1.0.0 -BuildRequires: python-XStatic-jQuery >= 1.7.2 -BuildRequires: python-XStatic-Angular >= 1.2.1.1 -BuildRequires: python-XStatic-Angular-Cookies >= 1.2.1.1 -BuildRequires: python-XStatic-Angular-Mock >= 1.2.1.1 -BuildRequires: python-XStatic-Bootstrap-SCSS >= 3 -BuildRequires: python-XStatic-D3 >= 3.1.6.2 -BuildRequires: python-XStatic-Bootstrap-Datepicker >= 1.3.1.0 -BuildRequires: python-XStatic-Font-Awesome >= 4.1.0 -BuildRequires: python-XStatic-Hogan >= 2.0.0.2 -BuildRequires: python-XStatic-JQuery-Migrate >= 1.2.1.1 -BuildRequires: python-XStatic-JQuery.TableSorter >= 2.0.5b.0 -BuildRequires: python-XStatic-JQuery.quicksearch >= 2.0.3.1 -BuildRequires: python-XStatic-jquery-ui >= 1.10.1 -BuildRequires: python-XStatic-JSEncrypt >= 2.0.0.2 -BuildRequires: python-XStatic-Jasmine >= 1.3.1.1 -BuildRequires: python-XStatic-QUnit >= 1.14.0.2 -BuildRequires: python-XStatic-Rickshaw >= 1.5.0 -BuildRequires: python-XStatic-Spin >= 1.2.5.2 -BuildRequires: python-oslo-sphinx -BuildRequires: python-oslo-serialization >= 1.0.0 - -BuildRequires: python-six >= 1.7.0 - -BuildRequires: pytz %description -n openstack-dashboard Openstack Dashboard is a web user interface for Openstack. The package @@ -182,22 +170,6 @@ Group: Documentation Requires: %{name} = %{version}-%{release} -BuildRequires: python-sphinx >= 1.1.3 - -# Doc building basically means we have to mirror Requires: -BuildRequires: python-dateutil -BuildRequires: python-glanceclient >= 0.14.0 -BuildRequires: python-keystoneclient >= 1:0.10.0 -BuildRequires: python-novaclient >= 2.18.0 -BuildRequires: python-neutronclient >= 2.3.6, python-neutronclient < 3.0 -BuildRequires: python-cinderclient >= 1.0.7 -BuildRequires: python-swiftclient >= 2.2.0 -BuildRequires: python-heatclient >= 0.2.9 -BuildRequires: python-ceilometerclient >= 1.0.6 -BuildRequires: python-troveclient >= 1.0.4 -BuildRequires: python-saharaclient >= 0.7.3 -BuildRequires: python-oslo-sphinx - %description doc Documentation for the Django Horizon application for talking with Openstack @@ -237,8 +209,7 @@ sed -i 's:COMPRESS_OFFLINE = False:COMPRESS_OFFLINE = True:' openstack_dashboard # set COMPRESS_OFFLINE=False sed -i 's:COMPRESS_OFFLINE = True:COMPRESS_OFFLINE = False:' openstack_dashboard/settings.py %endif - - +%patch0012 -p1 %build %{__python} setup.py build @@ -653,3 +624,4 @@ mkdir -p %{buildroot}%{_var}/log/horizon * Mon Jan 30 2012 Cole Robinson - 2012.1-0.1.e3 - Initial package +