Merge pull request #90 from cderici/relax-protobuf-version

Relax protobuf version

CONTRIBUTING.rst

@@ -101,4 +101,4 @@ Tips
 
 To run a subset of tests::
 
-    $ devenv/bin/nosetests macaroonbakery/tests/...
+    $ devenv/bin/nose2 macaroonbakery/tests/...

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:

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>=3.4.0
 pyRFC3339>=1.0,<2.0

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

test-requirements.txt

@@ -1,14 +1,14 @@
 # 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
 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

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