diff --git a/debian/changelog b/debian/changelog index b08911e..0c5ed5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-castellan (1.2.2-1) experimental; urgency=medium + + * New upstream release. + * Removed Python 2 support. + + -- Thomas Goirand Tue, 26 Mar 2019 17:50:55 +0100 + python-castellan (0.19.0-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index b498fc0..591ae9d 100644 --- a/debian/control +++ b/debian/control @@ -8,76 +8,34 @@ debhelper (>= 9), dh-python, openstack-pkg-tools, - python-all, - python-pbr (>= 2.0.0), - python-setuptools, python3-all, - python3-pbr (>= 2.0.0), + python3-pbr, python3-setuptools, - python3-sphinx (>= 1.6.2), + python3-sphinx, Build-Depends-Indep: - python-babel, - python-barbicanclient (>= 4.5.2), - python-cryptography (>= 2.1), - python-hacking (>= 0.10), - python-keystoneauth1 (>= 3.4.0), - python-oslo.config (>= 1:5.2.0), - python-oslo.context (>= 2.19.2), - python-oslo.i18n (>= 3.15.3), - python-oslo.log (>= 3.36.0), - python-oslo.utils (>= 3.33.0), - python-oslotest (>= 1:3.2.0), - python-stevedore (>= 1.20.0), - python-testscenarios, - python-testtools (>= 2.2.0), python3-babel, - python3-barbicanclient (>= 4.5.2), - python3-cryptography (>= 2.1), - python3-keystoneauth1 (>= 3.4.0), - python3-openstackdocstheme (>= 1.18.1), - python3-oslo.config (>= 1:5.2.0), - python3-oslo.context (>= 2.19.2), - python3-oslo.i18n (>= 3.15.3), - python3-oslo.log (>= 3.36.0), - python3-oslo.utils (>= 3.33.0), - python3-oslotest (>= 1:3.2.0), - python3-stevedore (>= 1.20.0), + python3-barbicanclient, + python3-cryptography, + python3-fixtures, + python3-hacking, + python3-keystoneauth1, + python3-openstackdocstheme, + python3-oslo.config, + python3-oslo.context, + python3-oslo.i18n, + python3-oslo.log, + python3-oslo.utils, + python3-oslotest, + python3-stestr, + python3-stevedore, python3-subunit, python3-testscenarios, - python3-testtools (>= 2.2.0), + python3-testtools, subunit, - testrepository, -Standards-Version: 4.1.3 +Standards-Version: 4.3.0 Vcs-Browser: https://salsa.debian.org/openstack-team/libs/python-castellan Vcs-Git: https://salsa.debian.org/openstack-team/libs/python-castellan.git Homepage: https://github.com/openstack/castellan - -Package: python-castellan -Architecture: all -Depends: - python-babel, - python-barbicanclient (>= 4.5.2), - python-cryptography (>= 2.1), - python-keystoneauth1 (>= 3.4.0), - python-oslo.config (>= 1:5.2.0), - python-oslo.context (>= 2.19.2), - python-oslo.i18n (>= 3.15.3), - python-oslo.log (>= 3.36.0), - python-oslo.utils (>= 3.33.0), - python-pbr (>= 2.0.0), - python-stevedore (>= 1.20.0), - ${misc:Depends}, - ${python:Depends}, -Suggests: - python-castellan-doc, -Description: generic key manager interface for OpenStack - Python 2.x - The Castellan module provides a generic key manager interface so that - OpenStack projects can use Barbican, but also have the flexibilty to choose an - alternative Key Manager as needed. This is helpful during development, for - example, where a simple implementation of the Key Manager Interface can be - used instead of having to spin up a Barbican instance. - . - This package contains the Python 2.x module. Package: python-castellan-doc Section: doc @@ -98,16 +56,16 @@ Architecture: all Depends: python3-babel, - python3-barbicanclient (>= 4.5.2), - python3-cryptography (>= 2.1), - python3-keystoneauth1 (>= 3.4.0), - python3-oslo.config (>= 1:5.2.0), - python3-oslo.context (>= 2.19.2), - python3-oslo.i18n (>= 3.15.3), - python3-oslo.log (>= 3.36.0), - python3-oslo.utils (>= 3.33.0), - python3-pbr (>= 2.0.0), - python3-stevedore (>= 1.20.0), + python3-barbicanclient, + python3-cryptography, + python3-keystoneauth1, + python3-oslo.config, + python3-oslo.context, + python3-oslo.i18n, + python3-oslo.log, + python3-oslo.utils, + python3-pbr, + python3-stevedore, ${misc:Depends}, ${python3:Depends}, Suggests: diff --git a/debian/rules b/debian/rules index 2da7aa0..87d79b0 100755 --- a/debian/rules +++ b/debian/rules @@ -4,10 +4,16 @@ include /usr/share/openstack-pkg-tools/pkgos.make %: - dh $@ --buildsystem=python_distutils --with python2,python3,sphinxdoc + dh $@ --buildsystem=python_distutils --with python3,sphinxdoc + +override_dh_auto_clean: + rm -rf build + +override_dh_auto_build: + echo "Do nothing..." override_dh_auto_install: - pkgos-dh_auto_install + pkgos-dh_auto_install --no-py2 mkdir -p $(CURDIR)/debian/python-castellan/etc/castellan PYTHONPATH=. oslo-config-generator --output-file $(CURDIR)/debian/python-castellan/etc/castellan/castellan.conf \ @@ -16,23 +22,11 @@ override_dh_auto_test: ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) - pkgos-dh_auto_test 'castellan\.tests\.unit.*' + pkgos-dh_auto_test --no-py2 'castellan\.tests\.unit.*' endif override_dh_sphinxdoc: +ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS))) PYTHONPATH=. python3 -m sphinx -b html doc/source debian/python-castellan-doc/usr/share/doc/python-castellan-doc/html dh_sphinxdoc -O--buildsystem=python_distutils - -override_dh_clean: - dh_clean -O--buildsystem=python_distutils - rm -rf build - -# Commands not to run -override_dh_installcatalogs: -override_dh_installemacsen override_dh_installifupdown: -override_dh_installinfo override_dh_installmenu override_dh_installmime: -override_dh_installmodules override_dh_installlogcheck: -override_dh_installpam override_dh_installppp override_dh_installudev override_dh_installwm: -override_dh_installxfonts override_dh_gconf override_dh_icons override_dh_perl override_dh_usrlocal: -override_dh_installcron override_dh_installdebconf: -override_dh_installlogrotate override_dh_installgsettings: +endif