summaryrefslogtreecommitdiff
diff options
authorCorey Bryant <corey.bryant@canonical.com>2019-07-10 14:08:25 -0400
committergit-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com>2019-07-10 21:01:09 +0000
commitf5710cf1eadb799b0fe500acea9685f296c8e8d2 (patch)
tree6a4ed390be83a20d929a9fce74b63d3078536a6c
parent8a389f4ba5354c8e91aac532f6cbd02b2f00b3ff (diff)
parent0f73f77736096091f4dec7283e12cc12510a8330 (diff)
2.2.0-0ubuntu2 (patches applied)applied/2.2.0-0ubuntu2applied/ubuntu/focal-develapplied/ubuntu/focalapplied/ubuntu/eoan-proposedapplied/ubuntu/eoan-develapplied/ubuntu/eoan
Imported using git-ubuntu import.
Diffstat
-rw-r--r--debian/changelog6
-rw-r--r--debian/control55
-rw-r--r--debian/python-watcherclient.postinst11
-rw-r--r--debian/python-watcherclient.postrm11
-rw-r--r--debian/python-watcherclient.prerm11
-rw-r--r--debian/python3-watcherclient.postinst11
-rw-r--r--debian/python3-watcherclient.postrm11
-rw-r--r--debian/python3-watcherclient.prerm11
-rwxr-xr-xdebian/rules12
9 files changed, 15 insertions, 124 deletions
diff --git a/debian/changelog b/debian/changelog
index 3d84314..ceec244 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-watcherclient (2.2.0-0ubuntu2) eoan; urgency=medium
+
+ * d/rules, d/control, d/python(3)-*: Drop Python 2 support.
+
+ -- Corey Bryant <corey.bryant@canonical.com> Wed, 10 Jul 2019 14:08:25 -0400
+
python-watcherclient (2.2.0-0ubuntu1) disco; urgency=medium
* New upstream release for OpenStack Stein.
diff --git a/debian/control b/debian/control
index af2aa4e..7e2dfe6 100644
--- a/debian/control
+++ b/debian/control
@@ -9,37 +9,11 @@ Build-Depends:
debhelper (>= 10~),
dh-python,
openstack-pkg-tools (>= 52~),
- python-all,
- python-pbr (>= 3.1.1),
- python-setuptools,
python3-all,
python3-pbr (>= 3.1.1),
python3-setuptools,
python3-sphinx (>= 1.6.5),
Build-Depends-Indep:
- python-babel (>= 2.5.3),
- python-cliff (>= 2.11.0),
- python-coverage (>= 4.0),
- python-fixtures (>= 3.0.0),
- python-hacking (>= 0.12.0),
- python-keystoneauth1 (>= 3.4.0),
- python-mock (>= 2.0.0),
- python-openstackclient (>= 2.6.0),
- python-os-testr,
- python-osc-lib (>= 1.10.0),
- python-oslo.i18n (>= 3.20.0),
- python-oslo.utils (>= 3.36.0),
- python-oslotest (>= 1:3.2.0),
- python-prettytable (>= 0.7.2),
- python-six (>= 1.11.0),
- python-stestr,
- python-subunit (>= 1.0.0),
- python-tempest (>= 1:17.1.0),
- python-testrepository (>= 0.0.18),
- python-testscenarios (>= 0.4),
- python-testtools (>= 2.2.0),
- python-wheel (>= 0.24.0),
- python-yaml (>= 3.12),
python3-babel (>= 2.5.3),
python3-cliff (>= 2.11.0),
python3-coverage (>= 4.0),
@@ -72,35 +46,6 @@ Vcs-Git: git://git.launchpad.net/~ubuntu-server-dev/ubuntu/+source/python-watche
Homepage: https://github.com/openstack/python-watcherclient
Testsuite: autopkgtest-pkg-python
-Package: python-watcherclient
-Architecture: all
-Depends:
- python-babel (>= 2.5.3),
- python-cliff (>= 2.11.0),
- python-fixtures (>= 3.0.0),
- python-keystoneauth1 (>= 3.4.0),
- python-openstackclient (>= 2.6.0),
- python-osc-lib (>= 1.10.0),
- python-oslo.i18n (>= 3.20.0),
- python-oslo.utils (>= 3.36.0),
- python-pbr (>= 3.1.1),
- python-prettytable (>= 0.7.2),
- python-six (>= 1.11.0),
- python-yaml (>= 3.12),
- ${misc:Depends},
- ${python:Depends},
-Description: OpenStack Cloud Optimization as a Service client - Python 2.7
- OpenStack Watcher provides a flexible and scalable resource optimization
- service for multi-tenant OpenStack-based clouds. Watcher provides a complete
- optimization loop-including everything from a metrics receiver, complex event
- processor and profiler, optimization processor and an action plan applier.
- This provides a robust framework to realize a wide range of cloud optimization
- goals, including the reduction of data center operating costs, increased
- system performance via intelligent virtual machine migration, increased energy
- efficiency-and more!
- .
- This package contains the Python 2.7 module and the Watcher CLI.
-
Package: python-watcherclient-doc
Architecture: all
Section: doc
diff --git a/debian/python-watcherclient.postinst b/debian/python-watcherclient.postinst
deleted file mode 100644
index a60815d..0000000
--- a/debian/python-watcherclient.postinst
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ] ; then
- update-alternatives --install /usr/bin/watcher watcher /usr/bin/python2-watcher 300
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/python-watcherclient.postrm b/debian/python-watcherclient.postrm
deleted file mode 100644
index fbfc77b..0000000
--- a/debian/python-watcherclient.postrm
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "remove" ] || [ "$1" = "disappear" ] ; then
- update-alternatives --remove watcher /usr/bin/python2-watcher
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/python-watcherclient.prerm b/debian/python-watcherclient.prerm
deleted file mode 100644
index e438387..0000000
--- a/debian/python-watcherclient.prerm
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "remove" ] ; then
- update-alternatives --remove watcher /usr/bin/python2-watcher
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/python3-watcherclient.postinst b/debian/python3-watcherclient.postinst
deleted file mode 100644
index 4839d68..0000000
--- a/debian/python3-watcherclient.postinst
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ] ; then
- update-alternatives --install /usr/bin/watcher watcher /usr/bin/python3-watcher 400
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/python3-watcherclient.postrm b/debian/python3-watcherclient.postrm
deleted file mode 100644
index 002ad62..0000000
--- a/debian/python3-watcherclient.postrm
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "remove" ] || [ "$1" = "disappear" ] ; then
- update-alternatives --remove watcher /usr/bin/python3-watcher
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/python3-watcherclient.prerm b/debian/python3-watcherclient.prerm
deleted file mode 100644
index 796dadd..0000000
--- a/debian/python3-watcherclient.prerm
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "remove" ] ; then
- update-alternatives --remove watcher /usr/bin/python3-watcher
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/rules b/debian/rules
index ba99052..bb1d0f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,17 +4,20 @@ UPSTREAM_GIT = https://github.com/openstack/python-watcherclient.git
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_build:
+ python3 setup.py build --force
override_dh_auto_install:
- pkgos-dh_auto_install
+ pkgos-dh_auto_install --no-py2
override_dh_python3:
dh_python3 --shebang=/usr/bin/python3
override_dh_auto_test:
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
- pkgos-dh_auto_test --test-path=./watcherclient/tests/unit
+ pkgos-dh_auto_test --no-py2 --test-path=./watcherclient/tests/unit
endif
override_dh_sphinxdoc:
@@ -27,6 +30,9 @@ override_dh_clean:
dh_clean -O--buildsystem=python_distutils
rm -rf build
+override_dh_auto_clean:
+ python3 setup.py clean -a
+
# Commands not to run
override_dh_installcatalogs:
override_dh_installemacsen override_dh_installifupdown:
generated by cgit v1.2.3 (git 2.25.1) at 2026-07-14 03:43:34 +0000