diff options
| author | Paride Legovini <paride.legovini@canonical.com> | 2020-05-02 02:57:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-01 18:57:24 -0600 |
| commit | 4d2684848722cb2d469ad4fa60999bf81cf7056e (patch) | |
| tree | 2246e875479392fb7e38ee16bbe0815df7d89308 /packages/debian | |
| parent | 70dbccbbb27f7cc3f2decd692d41403f0d745c62 (diff) | |
| download | vyos-cloud-init-4d2684848722cb2d469ad4fa60999bf81cf7056e.tar.gz vyos-cloud-init-4d2684848722cb2d469ad4fa60999bf81cf7056e.zip | |
Adapt the package building scripts to use Python 3 (#231)
Since upstream cloud-init has dropped python2 support,
adapt remaining package build scripts and tools to python3 only
Changes:
* Do not template debian/rules as python3 is the only supported version
* Drop six from requirements.txt
* Makefile: drop everything related to Python 2
* run-container: install the CI deps only on ubuntu|debian
* read-version: update the shebang to use Python 3
* brpm: read_dependencies(): drop unused argument
* read-dependencies: switch to Py3 and drop the --python-version option
* pkg-deps.json: drop the Python version field and update the redhat deps
* pkg-deps.json: drop the unittest2 and contextlib2 renames
* Update RPM the spec file to use Python 3 when building the RPM
* bddeb: drop support for Python 2
Diffstat (limited to 'packages/debian')
| -rw-r--r-- | packages/debian/control.in | 3 | ||||
| -rwxr-xr-x | packages/debian/rules (renamed from packages/debian/rules.in) | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/packages/debian/control.in b/packages/debian/control.in index e9ed64f3..72895b47 100644 --- a/packages/debian/control.in +++ b/packages/debian/control.in @@ -10,11 +10,10 @@ Standards-Version: 3.9.6 Package: cloud-init Architecture: all Depends: ${misc:Depends}, - ${${python}:Depends}, + ${python3:Depends}, iproute2, isc-dhcp-client Recommends: eatmydata, sudo, software-properties-common, gdisk -XB-Python-Version: ${python:Versions} Description: Init scripts for cloud instances Cloud instances need special scripts to run during initialisation to retrieve and install ssh keys and to let the user run various scripts. diff --git a/packages/debian/rules.in b/packages/debian/rules index e542c7f1..d138deeb 100755 --- a/packages/debian/rules.in +++ b/packages/debian/rules @@ -1,12 +1,10 @@ -## template:basic #!/usr/bin/make -f INIT_SYSTEM ?= systemd export PYBUILD_INSTALL_ARGS=--init-system=$(INIT_SYSTEM) -PYVER ?= python${pyver} DEB_VERSION := $(shell dpkg-parsechangelog --show-field=Version) %: - dh $@ --with $(PYVER),systemd --buildsystem pybuild + dh $@ --with python3,systemd --buildsystem pybuild override_dh_install: dh_install @@ -19,7 +17,7 @@ override_dh_install: override_dh_auto_test: ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) - http_proxy= make PYVER=python${pyver} check + http_proxy= make check else @echo check disabled by DEB_BUILD_OPTIONS=$(DEB_BUILD_OPTIONS) endif |