From 2ad8c644528947bf05f0b0a813391ae30ac262cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Fri, 19 Feb 2021 01:35:29 +0000 Subject: [PATCH 1/5] Bump to bionic. --- byov.conf | 21 +++------------------ setup.py | 4 +++- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/byov.conf b/byov.conf index a658e4b50a..9cb4f79ef5 100644 --- a/byov.conf +++ b/byov.conf @@ -2,25 +2,12 @@ vm.class = lxd # Start with an up to date system by default vm.update = True # External sources dependencies, packages are not recent enough -dulwich.clone = (git clone git://jelmer.uk/dulwich -b 0.19 ../dulwich-0.19.git) -dulwich.clone3 = (git clone git://jelmer.uk/dulwich ../dulwich.git) -dulwich.install = (cd ../dulwich-0.19.git && ./setup.py install --user) -dulwich.install3 = (cd ../dulwich.git && python3 ./setup.py install --user) subunit.clone = (git clone https://github.com/testing-cabal/subunit.git ../subunit) -fastimport.clone = (git clone git://jelmer.uk/python-fastimport.git ../fastimport.git) -fastimport.install = (cd ../fastimport.git && ./setup.py install --user) -fastimport.install3 = (cd ../fastimport.git && python3 ./setup.py install --user) -sphinx_epytext.install = (pip install "setuptools<45" sphinx==1.8.5 sphinx_epytext) -sphinx_epytext.install3 = (pip3 install sphinx_epytext) flake8.install = (pip install flake8) flake8.install3 = (pip3 install flake8) -patiencediff.install = (pip install patiencediff) -patiencediff.install3 = (pip3 install patiencediff) -cython.install = (pip install cython) -cython.install3 = (pip3 install cython) +brz.extras = fastimport,launchpad,workspace,git,cext,doc [brz] -# FIXME: we're stuck on xenial # because paramiko 2.0.0 is broken: # breezy.tests.test_transport.TestSSHConnections.test_bzr_connect_to_bzr_ssh # runs into a deprecation issue which is only fixed in 2.3.0 which is @@ -34,12 +21,10 @@ brz.build_deps = gcc, debhelper, python, python-all-dev, python3-all-dev, python subunit.build_deps = python-testscenarios, python3-testscenarios, python-testtools, python3-testtools, cython, cython3, quilt vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-junitxml [brz-xenial] -vm.release = xenial -byoci.setup.command = ({dulwich.clone} && {dulwich.install} && {dulwich.clone3} && {dulwich.install3} && {fastimport.clone} && {fastimport.install} && {fastimport.install3} && {subunit.clone} && {flake8.install} && {flake8.install3} && {patiencediff.install} && {patiencediff.install3} && {sphinx_epytext.install} && {sphinx_epytext.install3} && {cython.install} && {cython.install3}) +vm.release = bionic +byoci.setup.command = (pip install --upgrade pip cython sphinx && pip3 install --upgrade pip cython sphinx && {flake8.install} && {flake8.install3} && python setup.py develop --user && python3 setup.py develop --user && pip install -e '.[{brz.extras}]' && pip3 install -e '.[{brz.extras}]') # FIXME: bzr log -l2 should be by default -- vila 2018-03-09 byoci.tests.command = bash -o pipefail -c "bzr log -l2 && PYTHONPATH=../subunit/python:$PYTHONPATH PATH=../subunit/filters:$HOME/.local/bin:$PATH make check-ci | subunit2junitxml -o ../results.xml -f | subunit2pyunit" -[brz-bionic] -vm.release = bionic [brz-cosmic] vm.release = cosmic [brz-disco] diff --git a/setup.py b/setup.py index d4be570449..9ca73a6072 100755 --- a/setup.py +++ b/setup.py @@ -72,10 +72,12 @@ def get_long_description(): 'dulwich<0.20,>=0.19.12;python_version<"3.0"', ], 'extras_require': { - 'fastimport': [], + 'cext': ['cython>=0.29'], + 'fastimport': ['fastimport'], 'git': [], 'launchpad': ['launchpadlib>=1.6.3'], 'workspace': ['pyinotify'], + 'doc': ['setuptools<45;python_version<"3.0"', 'sphinx==1.8.5;python_version<"3.0"', 'sphinx_epytext'], }, 'tests_require': [ 'testtools', From 508191f64a7ba7da57c666e11edb1debf755f5af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Fri, 19 Feb 2021 01:53:44 +0000 Subject: [PATCH 2/5] Install custom copy of subunit. --- byov.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/byov.conf b/byov.conf index 9cb4f79ef5..c8ca1c25b9 100644 --- a/byov.conf +++ b/byov.conf @@ -22,7 +22,7 @@ subunit.build_deps = python-testscenarios, python3-testscenarios, python-testtoo vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-junitxml [brz-xenial] vm.release = bionic -byoci.setup.command = (pip install --upgrade pip cython sphinx && pip3 install --upgrade pip cython sphinx && {flake8.install} && {flake8.install3} && python setup.py develop --user && python3 setup.py develop --user && pip install -e '.[{brz.extras}]' && pip3 install -e '.[{brz.extras}]') +byoci.setup.command = (pip install --upgrade pip cython sphinx && pip3 install --upgrade pip cython sphinx && {subunit.clone} && {flake8.install} && {flake8.install3} && python setup.py develop --user && python3 setup.py develop --user && pip install -e '.[{brz.extras}]' && pip3 install -e '.[{brz.extras}]') # FIXME: bzr log -l2 should be by default -- vila 2018-03-09 byoci.tests.command = bash -o pipefail -c "bzr log -l2 && PYTHONPATH=../subunit/python:$PYTHONPATH PATH=../subunit/filters:$HOME/.local/bin:$PATH make check-ci | subunit2junitxml -o ../results.xml -f | subunit2pyunit" [brz-cosmic] From 7969e5c4caed597a9ee797e98d9910eb3436711d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Fri, 19 Feb 2021 02:15:37 +0000 Subject: [PATCH 3/5] Upgrade paramiko. --- Makefile | 2 +- byov.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5510115d9f..2972f54021 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ check-ci: docs extensions # https://github.com/paramiko/paramiko/issues/713 is not a concern # anymore -- vila 2017-05-24 set -o pipefail; \ - BRZ_PLUGIN_PATH=$(BRZ_PLUGIN_PATH) $(PYTHON2) -Werror -Wignore::FutureWarning -Wignore::DeprecationWarning -Wignore::ImportWarning -Wignore::ResourceWarning -O \ + BRZ_PLUGIN_PATH=$(BRZ_PLUGIN_PATH) $(PYTHON2) -Werror -Wignore::FutureWarning -Wignore::DeprecationWarning -Wignore::ImportWarning -O \ ./brz selftest -v --parallel=fork -Oselftest.timeout=120 --subunit2 \ | subunit-filter -s --passthrough --rename "^" "python2."; \ BRZ_PLUGIN_PATH=$(BRZ_PLUGIN_PATH) $(PYTHON3) -Werror -Wignore::FutureWarning -Wignore::DeprecationWarning -Wignore::PendingDeprecationWarning -Wignore::ImportWarning -Wignore::ResourceWarning -O \ diff --git a/byov.conf b/byov.conf index c8ca1c25b9..4280a7a568 100644 --- a/byov.conf +++ b/byov.conf @@ -22,7 +22,7 @@ subunit.build_deps = python-testscenarios, python3-testscenarios, python-testtoo vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-junitxml [brz-xenial] vm.release = bionic -byoci.setup.command = (pip install --upgrade pip cython sphinx && pip3 install --upgrade pip cython sphinx && {subunit.clone} && {flake8.install} && {flake8.install3} && python setup.py develop --user && python3 setup.py develop --user && pip install -e '.[{brz.extras}]' && pip3 install -e '.[{brz.extras}]') +byoci.setup.command = (pip install --upgrade pip cython sphinx && pip3 install --upgrade pip cython sphinx paramiko && {subunit.clone} && {flake8.install} && {flake8.install3} && python setup.py develop --user && python3 setup.py develop --user && pip install -e '.[{brz.extras}]' && pip3 install -e '.[{brz.extras}]') # FIXME: bzr log -l2 should be by default -- vila 2018-03-09 byoci.tests.command = bash -o pipefail -c "bzr log -l2 && PYTHONPATH=../subunit/python:$PYTHONPATH PATH=../subunit/filters:$HOME/.local/bin:$PATH make check-ci | subunit2junitxml -o ../results.xml -f | subunit2pyunit" [brz-cosmic] From c2824d09fd4a5f4b89d2a2bc2876f467df152804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Fri, 19 Feb 2021 02:30:12 +0000 Subject: [PATCH 4/5] Upgrade pip first. --- byov.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/byov.conf b/byov.conf index 4280a7a568..96bc9b59b3 100644 --- a/byov.conf +++ b/byov.conf @@ -22,7 +22,7 @@ subunit.build_deps = python-testscenarios, python3-testscenarios, python-testtoo vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-junitxml [brz-xenial] vm.release = bionic -byoci.setup.command = (pip install --upgrade pip cython sphinx && pip3 install --upgrade pip cython sphinx paramiko && {subunit.clone} && {flake8.install} && {flake8.install3} && python setup.py develop --user && python3 setup.py develop --user && pip install -e '.[{brz.extras}]' && pip3 install -e '.[{brz.extras}]') +byoci.setup.command = (pip install --upgrade pip && pip install --upgrade cython sphinx && pip3 install --upgrade pip && pip3 install --upgrade cython sphinx paramiko && {subunit.clone} && {flake8.install} && {flake8.install3} && python setup.py develop --user && python3 setup.py develop --user && pip install -e '.[{brz.extras}]' && pip3 install -e '.[{brz.extras}]') # FIXME: bzr log -l2 should be by default -- vila 2018-03-09 byoci.tests.command = bash -o pipefail -c "bzr log -l2 && PYTHONPATH=../subunit/python:$PYTHONPATH PATH=../subunit/filters:$HOME/.local/bin:$PATH make check-ci | subunit2junitxml -o ../results.xml -f | subunit2pyunit" [brz-cosmic] From 2ed17d7b4255a91ed989120133c831f9b0c26779 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Fri, 19 Feb 2021 03:14:41 +0000 Subject: [PATCH 5/5] FIx syntax. --- byov.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/byov.conf b/byov.conf index 91a0544a5f..70726bad17 100644 --- a/byov.conf +++ b/byov.conf @@ -22,7 +22,7 @@ subunit.build_deps = python3-testscenarios, python3-testtools, cython, cython3, vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-junitxml [brz-xenial] vm.release = bionic -byoci.setup.command = (pip3 install --upgrade pip && pip3 install --upgrade cython sphinx paramiko && {subunit.clone} && {flake8.install3} && python3 setup.py develop --user && && pip3 install -e '.[{brz.extras}]') +byoci.setup.command = (pip3 install --upgrade pip && pip3 install --upgrade cython sphinx paramiko && {subunit.clone} && {flake8.install3} && python3 setup.py develop --user && pip3 install -e '.[{brz.extras}]') # FIXME: bzr log -l2 should be by default -- vila 2018-03-09 byoci.tests.command = bash -o pipefail -c "bzr log -l2 && PYTHONPATH=../subunit/python:$PYTHONPATH PATH=../subunit/filters:$HOME/.local/bin:$PATH make check-ci | subunit2junitxml -o ../results.xml -f | subunit2pyunit" [brz-cosmic]