From d958989b7b7a3cbfc35fb8f8c57dc3b7d27b4388 Mon Sep 17 00:00:00 2001
From: Caner Derici <caner.derici@canonical.com>
Date: Tue, 3 Oct 2023 09:44:10 -0600
Subject: [PATCH 1/5] Rev module coverage to 7.3.2

---
 test-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 7454ecc..ffd0f6d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,7 +1,7 @@
 # Copyright 2017 Canonical Ltd.
 # Licensed under the LGPLv3, see LICENCE file for details.
 
-coverage==3.7.1
+coverage==7.3.2
 extras==1.0.0
 fixtures==3.0.0
 flake8==2.4.0

From b486308639589e3639aab7f55cdbb065f24636b1 Mon Sep 17 00:00:00 2001
From: Caner Derici <caner.derici@canonical.com>
Date: Tue, 3 Oct 2023 09:44:45 -0600
Subject: [PATCH 2/5] Rev protobuf to >=4.21.1,<=4.21.12

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 889c512..eea0db2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,5 +5,5 @@ requests>=2.18.4,<3.0
 PyNaCl>=1.1.2,<2.0
 pymacaroons>=0.12.0,<1.0
 six>=1.11.0,<2.0
-protobuf>=3.4.0,<4.0
+protobuf>=4.21.1,<=4.21.12
 pyRFC3339>=1.0,<2.0

From 3ef8aee29c9a14691ee8ae0eb556c58d8e56e24f Mon Sep 17 00:00:00 2001
From: Caner Derici <caner.derici@canonical.com>
Date: Thu, 5 Oct 2023 10:59:23 -0600
Subject: [PATCH 3/5] Update nose2

---
 CONTRIBUTING.rst      |  2 +-
 Makefile              | 13 ++++++-------
 test-requirements.txt |  2 +-
 tox.ini               |  2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 2993720..d0489a0 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -101,4 +101,4 @@ Tips
 
 To run a subset of tests::
 
-    $ devenv/bin/nosetests macaroonbakery/tests/...
+    $ devenv/bin/nose2 macaroonbakery/tests/...
diff --git a/Makefile b/Makefile
index 03b5766..d5dfe7f 100644
--- a/Makefile
+++ b/Makefile
@@ -10,13 +10,13 @@ PIP_SYSDEPS = tox
 PIP = sudo pip install $(1)
 
 SYSDEPS_INSTALLED = .sysdeps-installed
-DEVENV = devenv
+DEVENV = venv
 DEVENVPIP = $(DEVENV)/bin/pip
 
 .DEFAULT_GOAL := setup
 
 $(DEVENVPIP):
-	@tox -e devenv
+	@tox devenv -e devenv
 
 $(SYSDEPS_INSTALLED): sysdeps.mk
 ifeq ($(shell command -v apt-get > /dev/null; echo $$?),0)
@@ -28,7 +28,7 @@ else
 	@echo 'Debian packages:'
 	@echo '$(APT_SYSDEPS).'
 endif
-	sudo pip2 install $(PIP_SYSDEPS)
+	sudo pip3 install $(PIP_SYSDEPS)
 	touch $(SYSDEPS_INSTALLED)
 
 
@@ -68,7 +68,7 @@ help:
 	@echo -e '\nAfter creating the development environment with "make", it is'
 	@echo 'also possible to do the following:'
 	@echo '- run a specific subset of the test suite, e.g. with'
-	@echo '  "$(DEVENV)/bin/nosetests bakery/tests/...";'
+	@echo '  "$(DEVENV)/bin/nose2 bakery/tests/...";'
 	@echo '- use tox as usual on this project;'
 	@echo '  see https://tox.readthedocs.org/en/latest/'
 
@@ -93,9 +93,8 @@ sysdeps: $(SYSDEPS_INSTALLED)
 
 .PHONY: test
 test: setup
-	@$(DEVENV)/bin/nosetests \
-		--verbosity 2 --with-coverage --cover-erase \
-		--cover-package macaroonbakery
+	@$(DEVENV)/bin/nose2 \
+		--verbosity 2 --with-coverage macaroonbakery
 
 .PHONY: isort
 isort:
diff --git a/test-requirements.txt b/test-requirements.txt
index ffd0f6d..864d66a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,7 +8,7 @@ flake8==2.4.0
 httmock==1.2.5
 linecache2==1.0.0
 mock==1.0.1
-nose==1.3.6
+nose2==0.13.0
 pbr==3.1.1
 python-mimeparse==1.6.0
 testtools==2.3.0
diff --git a/tox.ini b/tox.ini
index 9a773b6..b9b393d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,7 +11,7 @@ setenv =
 # drop into debugger with: nosetests --pdb
 # coverage with  --with-coverage --cover-inclusive --cover-html
 commands =
-    nosetests
+    nose2
 deps =
     -r{toxinidir}/test-requirements.txt
 

From a8e08fe1885aa0e150581efce962798ac9d9d40d Mon Sep 17 00:00:00 2001
From: Caner Derici <caner.derici@canonical.com>
Date: Thu, 5 Oct 2023 10:59:58 -0600
Subject: [PATCH 4/5] Update to python3

---
 sysdeps.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysdeps.mk b/sysdeps.mk
index 519844b..d3bffee 100644
--- a/sysdeps.mk
+++ b/sysdeps.mk
@@ -1 +1 @@
-APT_SYSDEPS = python-dev python-pip python-setuptools libsodium-dev python-dev libffi-dev libssl-dev
+APT_SYSDEPS = python3-pip python3-setuptools libsodium-dev libffi-dev libssl-dev

From 9042980e4807266bda0b995a5755a8dcb8b403c0 Mon Sep 17 00:00:00 2001
From: Caner Derici <caner.derici@canonical.com>
Date: Tue, 24 Oct 2023 14:12:30 -0600
Subject: [PATCH 5/5] Drop the upper bound on protobuf version

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index eea0db2..c0bf6bf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,5 +5,5 @@ requests>=2.18.4,<3.0
 PyNaCl>=1.1.2,<2.0
 pymacaroons>=0.12.0,<1.0
 six>=1.11.0,<2.0
-protobuf>=4.21.1,<=4.21.12
+protobuf>=3.4.0
 pyRFC3339>=1.0,<2.0