(mirror of https://github.com/vyos/vyos-cloud-init.git) https://git.amelek.net/vyos/vyos-cloud-init.git/atom?h=rolling 2020-05-02T00:57:24+00:00 2020-05-02T00:57:24+00:00 Paride Legovini paride.legovini@canonical.com 2020-05-02T00:57:24+00:00 urn:sha1:4d2684848722cb2d469ad4fa60999bf81cf7056e 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 2018-04-24T21:11:48+00:00 Scott Moser smoser@ubuntu.com 2018-04-24T21:11:48+00:00 urn:sha1:00d7b9c5f5380d01c76b648877943c4c0cfbcfff Ubuntu minimal images do not have iproute2, so correctly identify our dependency on it. LP: #1766711 2018-03-27T17:07:28+00:00 Scott Moser smoser@ubuntu.com 2018-03-27T17:07:28+00:00 urn:sha1:5b9dc4bc6a02acb26d568ab4633661a621d83620 This just correctly adds the missing dependency on isc-dhcp-client. That package is used via 'dhclient' from cloudinit/net/dhcp.py. LP: #1759307 2017-06-14T02:13:34+00:00 Chad Smith chad.smith@canonical.com 2017-06-07T23:26:52+00:00 urn:sha1:744e648eaf6325758282ef23bffcc4194faa6bac This change adds a couple of makefile targets for ci environments to install all necessary dependencies for package builds and test runs. It adds a number of arguments to ./tools/read-dependencies to facilitate reading pip dependencies, translating pip deps to system package names and optionally installing needed system-package dependencies on the local system. This relocates all package dependency and translation logic into ./tools/read-dependencies instead of duplication found in packages/brpm and packages/bddeb. In this branch, we also define buildrequires as including all runtime requires when rendering cloud-init.spec.in and debian/control files because our package build infrastructure will also be running all unit test during the package build process so we need runtime deps at build time. Additionally, this branch converts packages/(redhat|suse)/cloud-init.spec.in from cheetah templates to jinja to allow building python3 envs. 2017-05-24T17:30:14+00:00 Scott Moser smoser@brickies.net 2017-05-24T13:36:57+00:00 urn:sha1:6b5369be71054a677b89fa8080f7ddd029ce4986 When the style/checking dependencies were updated in test-requirements.txt, the debian package build dependencies created by ./packages/bddeb were also updated. Pycodestyle was added to the list in order to pin its version. That broke the package build for 16.04. The reason for this is simply that python3-pycodestyle is not available in 16.04. The change here is to remove style dependencies from test-requirements, and add them to the tox environments directly. We had previously changed the package build process to not run pep8 or flake8 simply to avoid having to code to N different versions of style checkers (3bcb72c593f). The link between package build and test-requirements still exists, though. So future breakage can occur if any package is added to test-requirements.txt (or requirements.txt) if the target distro release does not have a python3-<packagename> in its archive. There is also a bit of a tox.ini cleanup here, in that we do not have to explictly list '-rrequirements.txt' as the setup.py pulls those in. And lastly, we drop the -rtest-requirements.txt from the base 'testenv', and add these test requirements only to environments that need to run test. Finally, a change to packages/debian/control.in to drop the build dependencies that were listed for style checking and also a dependency on iproute2 which was a bad unit test that has been previously fixed. 2016-03-18T14:27:54+00:00 Scott Moser smoser@ubuntu.com 2016-03-18T14:27:54+00:00 urn:sha1:1b91b7cee6f2d4a2a7ddaf5f963225f0d36d1963 python3 support was moved out of pyflakes into python3-pyflakes. Adjust the package to build on trusty where python3-pyflakes was not present and also on xenial where it is. Note, this does mean that sbuild now requires '--resolve-alternatives'. That is how it is used on launchpad but is not the default in sbuild. 2016-03-04T06:45:58+00:00 Scott Moser smoser@ubuntu.com 2016-03-04T06:45:58+00:00 urn:sha1:8092805079d011093724d87e9485e5bf79479a72 Update make check target to run pep8 and run pyflakes or pyflakes3 depending on the value of 'PYVER'. This way the python3 build environment does not need python2 and vice versa. Also have make check run the 'yaml' test. tox: have tox run pep8 in the pyflakes 2016-03-04T00:10:18+00:00 Scott Moser smoser@ubuntu.com 2016-03-04T00:10:18+00:00 urn:sha1:2231c45ac3712c5cb7c1b810c838d3f91f424bf2 The big difference is using: ${python3:Depends} or ${python:Depends} rather than explicitly listing the dependencies (via template ${requires}). which means we get paths of /usr/lib/python3/dist-packages/.. rather than /usr/lib/python3.5/dist-packages/.. when built on xenial. Additionally it seems we no longer need this strange line. # Because setup tools didn't copy data... 2015-07-22T17:37:21+00:00 Scott Moser smoser@ubuntu.com 2015-07-22T17:37:21+00:00 urn:sha1:201cc6d5505d088b2143cc881babc153c9f6d5c4 tests (specifically DataSourceOpenNebula) runs 'ip' which comes from iproute2. 2015-06-05T20:26:20+00:00 Scott Moser smoser@ubuntu.com 2015-06-05T20:26:20+00:00 urn:sha1:0f3736ab501ceebaa3c9f5c7543b6218637cb6c7 some of the partitioning code in 'disk_setup' module needs sgdisk. In the future that could move to using sfdisk also but for now we do need sgdisk for this.