Skip to content

Commit

Permalink
build: make most make items work on noble
Browse files Browse the repository at this point in the history
This updates the Makefile and apt dependencies to work on Ubuntu 24.04
  • Loading branch information
lengau committed Sep 18, 2024
1 parent 972e401 commit ad13a69
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
8 changes: 1 addition & 7 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
# Copyright 2017 Canonical Ltd.
# Copyright 2017,2024 Canonical Ltd.
# Licensed under the LGPLv3, see LICENCE file for details.
include sysdeps.mk

PYTHON = python
# Since the python-tox package in Ubuntu uses Python 3, use pip to install tox
# instead. This also works on OSX where tox is not present in Homebrew.
PIP_SYSDEPS = tox

PIP = sudo pip install $(1)

SYSDEPS_INSTALLED = .sysdeps-installed
DEVENV = venv
Expand All @@ -28,7 +23,6 @@ else
@echo 'Debian packages:'
@echo '$(APT_SYSDEPS).'
endif
sudo pip3 install $(PIP_SYSDEPS)
touch $(SYSDEPS_INSTALLED)


Expand Down
2 changes: 1 addition & 1 deletion sysdeps.mk
Original file line number Diff line number Diff line change
@@ -1 +1 @@
APT_SYSDEPS = python3-pip python3-setuptools libsodium-dev libffi-dev libssl-dev
APT_SYSDEPS = python3-pip python3-setuptools libsodium-dev libffi-dev libssl-dev tox isort
3 changes: 2 additions & 1 deletion test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2017 Canonical Ltd.
# Copyright 2017,2024 Canonical Ltd.
# Licensed under the LGPLv3, see LICENCE file for details.

coverage==7.3.2
Expand All @@ -11,6 +11,7 @@ mock==1.0.1
nose2==0.13.0
pbr==3.1.1
python-mimeparse==1.6.0
setuptools==75.1.0
testtools==2.3.0; python_version<"3"
testtools==2.5.0; python_version>="3"
traceback2==1.4.0
Expand Down

0 comments on commit ad13a69

Please sign in to comment.