Update dependency ubuntu to v24

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
containers · Sep 27, 2024 · a07f273 · a07f273
1 parent 85af8e8
commit a07f273
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,15 +2,15 @@ name: ci
 on: [push, pull_request]
 jobs:
   linux:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: install bats
         shell: bash
         run: |
            sudo apt-get update
            sudo apt-get install bats bash
-           pip install omlmd
+           pipx install omlmd
       - name: run test
         run: make test
 

diff --git a/.github/workflows/latest.yml b/.github/workflows/latest.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   linux:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: Run a one-line script
@@ -24,7 +24,7 @@ jobs:
         run: make test
 
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: [linux, macos]
     steps:
         - uses: actions/checkout@v4

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   linux:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: Run a one-line script
@@ -24,7 +24,7 @@ jobs:
         run: make test
 
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: [linux, macos]
     steps:
         - uses: actions/checkout@v4

diff --git a/Makefile b/Makefile
@@ -47,12 +47,12 @@ install-shortnames:
 .PHONY:
 install: install-program install-shortnames install-docs
 	RAMALAMA_VERSION=$(RAMALAMA_VERSION) \
-	pip install . --root $(DESTDIR) --prefix ${PREFIX}
+	pipx install . --root $(DESTDIR) --prefix ${PREFIX}
 
 .PHONY:
 build:
 ifeq ($(OS),Linux)
-	$(PYTHON) -m pip install --user -r requirements.txt
+	$(PYTHON) -m pipx install --user -r requirements.txt
 	./container_build.sh
 endif
 
@@ -66,13 +66,13 @@ docs:
 
 .PHONY: lint
 lint:
-	@pip install -q black flake8
+	@pipx install -q black flake8
 	black --line-length 120 --exclude 'venv/*' *.py ramalama/*.py  # Format the code
 	flake8 --max-line-length=120 --exclude=venv *.py ramalama/*.py  # Check for any inconsistencies
 
 .PHONY: codespell
 codespell:
-	@pip install -q codespell
+	@pipx install -q codespell
 	codespell --dictionary=- -w
 
 .PHONY: validate

diff --git a/rpm/python-ramalama.spec b/rpm/python-ramalama.spec
@@ -39,6 +39,7 @@ BuildRequires: pyproject-rpm-macros
 BuildRequires: python%{python3_pkgversion}-pip
 BuildRequires: python%{python3_pkgversion}-setuptools
 BuildRequires: python%{python3_pkgversion}-wheel
+Requires: pipx
 Summary: %{summary}
 Provides: %{pypi_name} = %{version}-%{release}
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}