x/python-redfish
Code Issues Proposed changes

Improved build for deb

Browse Source 
- Add dependencies for deb build (NOTE: the mandatory python-tortilla
  package doesn't exist in Ubuntu or Debian for now)
- reduce setup.cfg in deliveries and fix OpenSTack related content
This commit is contained in:
Bruno Cornec
2016-02-12 15:50:34 +01:00
parent a9d349e68b
commit 2bfff304ed
5 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pbconf/pbfilter/deb.pbf
View File

@@ -14,7 +14,7 @@ filter PBLIC = ASL 2.0
filter PBDEP = python-docopt, python-tortilla, python-jinja2 filter PBDEP = python-docopt, python-tortilla, python-jinja2
# PBBDEP is replaced by the list of build dependencies # PBBDEP is replaced by the list of build dependencies
filter PBBDEP = python-dev, python-setuptools, python-pbr filter PBBDEP = python-dev, python-setuptools, python-pbr, python-tortilla, python-jinja2, python-sphinx
# PBSUG is replaced by the list of suggestions # PBSUG is replaced by the list of suggestions
#filter PBSUG = #filter PBSUG =

2
pbconf/pbfilter/rpm.pbf
View File

@@ -14,7 +14,7 @@ filter PBLIC = ASL 2.0
#filter PBDEP = #filter PBDEP =
# PBBDEP is replaced by the list of build dependencies # PBBDEP is replaced by the list of build dependencies
filter PBBDEP = python-devel, python-setuptools filter PBBDEP = python-devel, python-setuptools, python-pbr, python-sphinx
filter PBDEP = python-docopt, python-tortilla, python-jinja2 filter PBDEP = python-docopt, python-tortilla, python-jinja2
# PBSUF is replaced by the package suffix ($pb->{'suf'} in code) # PBSUF is replaced by the package suffix ($pb->{'suf'} in code)

1
pbconf/python-redfish/deb/control
View File

@@ -4,6 +4,7 @@ Section: PBGRP
Priority: optional Priority: optional
Maintainer: PBPACKAGER Maintainer: PBPACKAGER
Build-Depends: debhelper (>= 4.2.20), python-dev (>= 2.7), PBBDEP Build-Depends: debhelper (>= 4.2.20), python-dev (>= 2.7), PBBDEP
X-Python-Version: >= 2.7
Standards-Version: PBDEBSTD Standards-Version: PBDEBSTD
Vcs-Svn: https://github.com/bcornec/PBPROJ Vcs-Svn: https://github.com/bcornec/PBPROJ
Vcs-Browser: https://github.com/bcornec/PBPROJ Vcs-Browser: https://github.com/bcornec/PBPROJ

5
pbconf/python-redfish/deb/rules
View File

@@ -5,12 +5,9 @@ export PYBUILD_AFTER_INSTALL_python3=rm -rf {destdir}/usr/bin
%: %:
dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
#dh $@ --with python2,python3 --buildsystem=python_distutils
PYPI_DESC = PBSUMMARY PYPI_DESC = PBSUMMARY
DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p') DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
help2man = PYTHONPATH=${CURDIR} help2man -N --version-string=${DEB_UPSTREAM_VERSION} \ help2man = PYTHONPATH=${CURDIR} help2man -N --version-string=${DEB_UPSTREAM_VERSION} \
-o $1 -n '$2' $(CURDIR)/debian/PBPKG/usr/bin/$(subst .1,,$1) -o $1 -n '$2' $(CURDIR)/debian/PBPKG/usr/bin/$(subst .1,,$1)
clean:
#rm -f redfish-client.1
dh $@ --buildsystem=pybuild

28
setup.cfg
View File

@@ -4,10 +4,10 @@ summary = Reference implementation of Redfish standard client.
description-file = description-file =
README.rst README.rst
author = Redfish dev team author = Redfish dev team
author-email = python-redfish@lists.mondorescue.org author-email = python-redfish@mondorescue.org
home-page = http://www.openstack.org/ home-page = http://github.com/bcornec/python-redfish
classifier = classifier =
Environment :: OpenStack #Environment :: OpenStack
Intended Audience :: Information Technology Intended Audience :: Information Technology
Intended Audience :: System Administrators Intended Audience :: System Administrators
License :: OSI Approved :: Apache Software License License :: OSI Approved :: Apache Software License
@@ -32,16 +32,16 @@ all_files = 1
[upload_sphinx] [upload_sphinx]
upload-dir = doc/build/html upload-dir = doc/build/html
[compile_catalog] #[compile_catalog]
directory = redfish/locale #directory = redfish/locale
domain = python-redfish #domain = python-redfish
[update_catalog] #[update_catalog]
domain = python-redfish #domain = python-redfish
output_dir = redfish/locale #output_dir = redfish/locale
input_file = redfish/locale/python-redfish.pot #input_file = redfish/locale/python-redfish.pot
[extract_messages] #[extract_messages]
keywords = _ gettext ngettext l_ lazy_gettext #keywords = _ gettext ngettext l_ lazy_gettext
mapping_file = babel.cfg #mapping_file = babel.cfg
output_file = redfish/locale/python-redfish.pot #output_file = redfish/locale/python-redfish.pot