From 1c182622b059237dc365423691c233eb7f0d3ee0 Mon Sep 17 00:00:00 2001 From: Callahan Kovacs Date: Wed, 25 Oct 2023 17:01:38 -0500 Subject: [PATCH 1/3] chore: migrate dev environment to ubuntu 22.04 and python 3.10 Signed-off-by: Callahan Kovacs --- Makefile | 4 ++-- tools/environment-setup.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c8c3a1dd47..7a10a0e0b8 100644 --- a/Makefile +++ b/Makefile @@ -48,11 +48,11 @@ test-shellcheck: .PHONY: test-legacy-units test-legacy-units: - tox run -e py38-legacy + tox run -e py310-legacy .PHONY: test-units test-units: test-legacy-units - tox run -e py38-unit + tox run -e py310-unit .PHONY: tests tests: tests-static test-units diff --git a/tools/environment-setup.sh b/tools/environment-setup.sh index 24abffb7a0..dfe52a4477 100755 --- a/tools/environment-setup.sh +++ b/tools/environment-setup.sh @@ -10,7 +10,7 @@ fi # Create the container. if ! lxc info snapcraft-dev >/dev/null 2>&1; then - lxc init ubuntu:20.04 snapcraft-dev + lxc init ubuntu:22.04 snapcraft-dev fi if ! lxc config get snapcraft-dev raw.idmap | grep -q "both $UID 1000"; then lxc config set snapcraft-dev raw.idmap "both $UID 1000" From 8e0c8e58c2f63bd8476f295981a89b1b7e2bba4c Mon Sep 17 00:00:00 2001 From: Callahan Kovacs Date: Fri, 27 Oct 2023 08:16:30 -0500 Subject: [PATCH 2/3] chore: fix names of make targets Signed-off-by: Callahan Kovacs --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7a10a0e0b8..f24e3b9bc1 100644 --- a/Makefile +++ b/Makefile @@ -48,11 +48,11 @@ test-shellcheck: .PHONY: test-legacy-units test-legacy-units: - tox run -e py310-legacy + tox run -e test-legacy-py310 .PHONY: test-units test-units: test-legacy-units - tox run -e py310-unit + tox run -e test-py310 .PHONY: tests tests: tests-static test-units From aaeebb3697f1bbc88221329204d96e3990da4a21 Mon Sep 17 00:00:00 2001 From: Callahan Kovacs Date: Fri, 27 Oct 2023 08:47:25 -0500 Subject: [PATCH 3/3] chore(deps): bump ruff to 0.1.1 Signed-off-by: Callahan Kovacs --- requirements-devel.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-devel.txt b/requirements-devel.txt index 0fbd48d66f..d082b9af39 100644 --- a/requirements-devel.txt +++ b/requirements-devel.txt @@ -95,7 +95,7 @@ raven==6.10.0 requests==2.31.0 requests-toolbelt==1.0.0 requests-unixsocket==0.3.0 -ruff==0.0.220 +ruff==0.1.1 SecretStorage==3.3.3 simplejson==3.19.1 six==1.16.0