Commit db7ff7bf authored by Thomas Goirand's avatar Thomas Goirand

Switch package to Python 3.

parent 46826620
......@@ -14,8 +14,9 @@ ceilometer (1:10.0.0-1) UNRELEASED; urgency=medium
ceilometer-common package Conflicts: on them to ensure removal.
* Standards-Version: is now 4.1.3.
* Fixed ceilometer-agent-central short desc.
* Switch package to Python 3.
-- Thomas Goirand <zigo@debian.org> Fri, 16 Feb 2018 23:24:01 +0100
-- Thomas Goirand <zigo@debian.org> Sat, 17 Feb 2018 10:34:55 +0000
ceilometer (1:9.0.4-1) unstable; urgency=medium
......
......@@ -9,75 +9,74 @@ Build-Depends:
dh-python,
openstack-pkg-tools,
po-debconf,
python-all,
python-pbr (>= 1.8),
python-setuptools,
python-sphinx (>= 1.6.2),
python3-all,
python3-pbr (>= 1.8),
python3-setuptools,
python3-sphinx (>= 1.6.2),
Build-Depends-Indep:
git,
mongodb,
python-awsauth,
python-cachetools,
python-ceilometerclient (>= 2.2.1),
python-cinderclient (>= 1:1.6.0),
python-concurrent.futures,
python-cotyledon (>= 1.3.0),
python-coverage,
python-debtcollector (>= 1.2.0),
python-fixtures,
python-futurist (>= 0.11.0),
python-gabbi (>= 1.30.0),
python-glanceclient (>= 1:2.0.0),
python-gnocchiclient (>= 7.0.0),
python-happybase,
python-jsonpath-rw-ext (>= 0.1.9),
python-keystoneauth1 (>= 2.1.0),
python-keystoneclient (>= 1:1.6.0),
python-kombu,
python-lxml,
python-mock,
python-monotonic,
python-msgpack (>= 0.4.0),
python-mysqldb,
python-neutronclient (>= 1:4.2.0),
python-novaclient (>= 2:2.29.0),
python-openssl,
python-openstackdocstheme (>= 1.11.0),
python-os-api-ref (>= 0.1.0),
python-os-testr (>= 0.4.1),
python-os-win (>= 0.2.3),
python-os-xenapi,
python-oslo.cache (>= 1.5.0),
python-oslo.concurrency (>= 3.5.0),
python-oslo.config (>= 1:3.22.0),
python-oslo.i18n (>= 2.1.0),
python-oslo.log (>= 2.0.0),
python-oslo.messaging (>= 5.12.0),
python-oslo.reports (>= 1.0.0),
python-oslo.rootwrap (>= 2.0.0),
python-oslo.utils (>= 3.5.0),
python-oslo.vmware (>= 1.16.0),
python-oslotest (>= 1:2.15.0),
python-pastedeploy,
python-psycopg2 (>= 2.5),
python-pymongo (>= 3.0.2),
python-pymysql,
python-pysnmp4,
python-requests (>= 2.8.1),
python-six (>= 1.9.0),
python-sphinxcontrib-pecanwsme,
python-sphinxcontrib.httpdomain,
python-stevedore (>= 1.9.0),
python-swiftclient (>= 1:2.2.0),
python-tempest (>= 1:12.1.0),
python-tenacity (>= 3.2.1),
python-testscenarios,
python-testtools (>= 1.4.0),
python-tooz (>= 1.47.0),
python-webtest (>= 2.0),
python-werkzeug,
python-yaml,
python-zaqarclient,
python3-awsauth,
python3-cachetools,
python3-ceilometerclient (>= 2.2.1),
python3-cinderclient (>= 1:1.6.0),
python3-cotyledon (>= 1.3.0),
python3-coverage,
python3-debtcollector (>= 1.2.0),
python3-fixtures,
python3-futurist (>= 0.11.0),
python3-gabbi (>= 1.30.0),
python3-glanceclient (>= 1:2.0.0),
python3-gnocchiclient (>= 7.0.0),
python3-happybase,
python3-jsonpath-rw-ext (>= 0.1.9),
python3-keystoneauth1 (>= 2.1.0),
python3-keystoneclient (>= 1:1.6.0),
python3-kombu,
python3-lxml,
python3-mock,
python3-monotonic,
python3-msgpack (>= 0.4.0),
python3-mysqldb,
python3-neutronclient (>= 1:4.2.0),
python3-novaclient (>= 2:2.29.0),
python3-openssl,
python3-openstackdocstheme (>= 1.11.0),
python3-os-api-ref (>= 0.1.0),
python3-os-testr (>= 0.4.1),
python3-os-win (>= 0.2.3),
python3-os-xenapi,
python3-oslo.cache (>= 1.5.0),
python3-oslo.concurrency (>= 3.5.0),
python3-oslo.config (>= 1:3.22.0),
python3-oslo.i18n (>= 2.1.0),
python3-oslo.log (>= 2.0.0),
python3-oslo.messaging (>= 5.12.0),
python3-oslo.reports (>= 1.0.0),
python3-oslo.rootwrap (>= 2.0.0),
python3-oslo.utils (>= 3.5.0),
python3-oslo.vmware (>= 1.16.0),
python3-oslotest (>= 1:2.15.0),
python3-pastedeploy,
python3-psycopg2 (>= 2.5),
python3-pymongo (>= 3.0.2),
python3-pymysql,
python3-pysnmp4,
python3-requests (>= 2.8.1),
python3-six (>= 1.9.0),
python3-sphinxcontrib-pecanwsme,
python3-sphinxcontrib.httpdomain,
python3-stevedore (>= 1.9.0),
python3-swiftclient (>= 1:2.2.0),
python3-tempest (>= 1:12.1.0),
python3-tenacity (>= 3.2.1),
python3-testscenarios,
python3-testtools (>= 1.4.0),
python3-tooz (>= 1.47.0),
python3-webtest (>= 2.0),
python3-werkzeug,
python3-yaml,
python3-zaqarclient,
subunit,
tempest (>= 1:14.0.0),
testrepository,
......@@ -92,7 +91,7 @@ Depends:
ceilometer-common (= ${binary:Version}),
${misc:Depends},
${ostack-lsb-base},
${python:Depends},
${python3:Depends},
Description: OpenStack efficient metering counters system - agent central
Ceilometer aims to deliver a Single Point Of Contact for billing systems,
providing all the counters they need to establish customer billing, across
......@@ -111,7 +110,7 @@ Depends:
ceilometer-common (= ${binary:Version}),
${misc:Depends},
${ostack-lsb-base},
${python:Depends},
${python3:Depends},
Description: OpenStack efficient metering counters system - compute agent
Ceilometer aims to deliver a Single Point Of Contact for billing systems,
providing all the counters they need to establish customer billing, across
......@@ -131,7 +130,7 @@ Depends:
ipmitool,
${misc:Depends},
${ostack-lsb-base},
${python:Depends},
${python3:Depends},
Description: OpenStack efficient metering counters system - IPMI agent
Ceilometer aims to deliver a Single Point Of Contact for billing systems,
providing all the counters they need to establish customer billing, across
......@@ -150,7 +149,7 @@ Depends:
ceilometer-common (= ${binary:Version}),
${misc:Depends},
${ostack-lsb-base},
${python:Depends},
${python3:Depends},
Description: OpenStack efficient metering counters system - notification agent
Ceilometer aims to deliver a Single Point Of Contact for billing systems,
providing all the counters they need to establish customer billing, across
......@@ -200,9 +199,9 @@ Architecture: all
Depends:
adduser,
dpkg-dev,
python-ceilometer (= ${binary:Version}),
python3-ceilometer (= ${binary:Version}),
${misc:Depends},
${python:Depends},
${python3:Depends},
Conflicts:
ceilometer-api,
ceilometer-collector,
......@@ -236,60 +235,59 @@ Description: OpenStack efficient metering counters system - doc
.
This package contains the documentation.
Package: python-ceilometer
Package: python3-ceilometer
Section: python
Architecture: all
Depends:
libjs-jquery,
python-cachetools,
python-ceilometerclient (>= 2.2.1),
python-cinderclient,
python-concurrent.futures,
python-cotyledon (>= 1.3.0),
python-debtcollector (>= 1.2.0),
python-futurist (>= 0.11.0),
python-glanceclient (>= 1:2.0.0),
python-gnocchiclient (>= 7.0.0),
python-greenlet,
python-happybase,
python-jsonpath-rw-ext (>= 0.1.9),
python-keystoneauth1 (>= 2.1.0),
python-keystoneclient (>= 1:1.6.0),
python-kombu,
python-lxml,
python-monotonic,
python-msgpack (>= 0.4.0),
python-mysqldb,
python-neutronclient (>= 1:4.2.0),
python-novaclient (>= 2:2.29.0),
python-os-xenapi,
python-oslo.concurrency (>= 3.5.0),
python-oslo.config (>= 1:3.22.0),
python-oslo.context (>= 0.2.0),
python-oslo.i18n (>= 2.1.0),
python-oslo.log (>= 2.0.0),
python-oslo.messaging (>= 5.12.0),
python-oslo.reports (>= 1.0.0),
python-oslo.rootwrap (>= 2.0.0),
python-oslo.service (>= 1.0.0),
python-oslo.utils (>= 3.5.0),
python-oslo.vmware (>= 1.16.0),
python-pastedeploy,
python-pbr (>= 1.8),
python-pymongo,
python-pymysql,
python-pysnmp4,
python-requests (>= 2.8.1),
python-six (>= 1.9.0),
python-stevedore (>= 1.9.0),
python-swiftclient (>= 1:2.2.0),
python-tenacity (>= 3.2.1),
python-tooz (>= 1.47.0),
python-werkzeug,
python-yaml,
python-zaqarclient,
python3-cachetools,
python3-ceilometerclient (>= 2.2.1),
python3-cinderclient,
python3-cotyledon (>= 1.3.0),
python3-debtcollector (>= 1.2.0),
python3-futurist (>= 0.11.0),
python3-glanceclient (>= 1:2.0.0),
python3-gnocchiclient (>= 7.0.0),
python3-greenlet,
python3-happybase,
python3-jsonpath-rw-ext (>= 0.1.9),
python3-keystoneauth1 (>= 2.1.0),
python3-keystoneclient (>= 1:1.6.0),
python3-kombu,
python3-lxml,
python3-monotonic,
python3-msgpack (>= 0.4.0),
python3-mysqldb,
python3-neutronclient (>= 1:4.2.0),
python3-novaclient (>= 2:2.29.0),
python3-os-xenapi,
python3-oslo.concurrency (>= 3.5.0),
python3-oslo.config (>= 1:3.22.0),
python3-oslo.context (>= 0.2.0),
python3-oslo.i18n (>= 2.1.0),
python3-oslo.log (>= 2.0.0),
python3-oslo.messaging (>= 5.12.0),
python3-oslo.reports (>= 1.0.0),
python3-oslo.rootwrap (>= 2.0.0),
python3-oslo.service (>= 1.0.0),
python3-oslo.utils (>= 3.5.0),
python3-oslo.vmware (>= 1.16.0),
python3-pastedeploy,
python3-pbr (>= 1.8),
python3-pymongo,
python3-pymysql,
python3-pysnmp4,
python3-requests (>= 2.8.1),
python3-six (>= 1.9.0),
python3-stevedore (>= 1.9.0),
python3-swiftclient (>= 1:2.2.0),
python3-tenacity (>= 3.2.1),
python3-tooz (>= 1.47.0),
python3-werkzeug,
python3-yaml,
python3-zaqarclient,
${misc:Depends},
${python:Depends},
${python3:Depends},
Description: OpenStack efficient metering counters system - Python libraries
Ceilometer aims to deliver a Single Point Of Contact for billing systems,
providing all the counters they need to establish customer billing, across
......
/usr/share/javascript/jquery/jquery.min.js /usr/lib/python2.6/dist-packages/ceilometer/api/v1/static/jquery-1.8.3.js
/usr/share/javascript/jquery/jquery.min.js /usr/lib/python2.7/dist-packages/ceilometer/api/v1/static/jquery-1.8.3.js
/usr/share/javascript/jquery/jquery.min.js /usr/share/pyshared/ceilometer/api/v1/static/jquery-1.8.3.js
......@@ -4,7 +4,7 @@ export HOME="$(CURDIR)/debian/test"
include /usr/share/openstack-pkg-tools/pkgos.make
%:
dh $@ --with python2,systemd,sphinxdoc
dh $@ --with python3,systemd,sphinxdoc
override_dh_clean:
dh_clean
......@@ -16,14 +16,15 @@ override_dh_auto_install:
override_dh_install:
rm -rf $(CURDIR)/debian/tmp
python2.7 setup.py install --install-layout=deb --root $(CURDIR)/debian/tmp
python3 setup.py install --install-layout=deb --root $(CURDIR)/debian/tmp
rm -rf $(CURDIR)/debian/tmp/usr/etc
dh_install --fail-missing
dh_install
dh_missing
# Manage ceilometer.conf
mkdir -p $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common
PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator \
PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python3/dist-packages oslo-config-generator \
--output-file $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf \
--wrap-width 140 \
--namespace ceilometer \
......@@ -70,8 +71,8 @@ endif
override_dh_sphinxdoc:
ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
PYTHONPATH=. sphinx-build -b html doc/source $(CURDIR)/debian/ceilometer-doc/usr/share/doc/ceilometer-doc/html
PYTHONPATH=. PYTHON=python3 python3 -m sphinx -b html doc/source $(CURDIR)/debian/ceilometer-doc/usr/share/doc/ceilometer-doc/html
mkdir -p $(CURDIR)/debian/ceilometer-doc/usr/share/doc/ceilometer-doc/html/_static
touch $(CURDIR)/debian/ceilometer-doc/usr/share/doc/ceilometer-doc/html/_static/toggle.js
dh_sphinxdoc -O--buildsystem=python_distutils
dh_sphinxdoc
endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment