Merge pull request #101 from cobbler/update-packaging

Update packaging

Author: SchoolGuy

.github/workflows/packaging.yml

@@ -5,7 +5,7 @@ on:
     branches:
       - main
     tags:
-      - 'v*'
+      - "v*"
   pull_request:
     branches:
       - main
@@ -15,10 +15,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Build a RockyLinux 8 Package
+      - name: Build a RockyLinux 9 Package
         shell: 'script -q -e -c "bash {0}"'
         run: |
-          ./docker/rpms/build-and-install-rpms.sh rl8 docker/rpms/RockyLinux8/RockyLinux8.dockerfile
+          ./docker/rpms/build-and-install-rpms.sh rl9 docker/rpms/RockyLinux9/RockyLinux9.dockerfile
       - name: Archive RPMs
         uses: actions/upload-artifact@v4
         with:
@@ -45,10 +45,10 @@ jobs:
       - uses: actions/checkout@v4
       - name: Install System dependencies
         run: sudo apt-get install -y rename
-      - name: Build a openSUSE Leap 15.3 Package
+      - name: Build a openSUSE Leap 15 Package
         shell: 'script -q -e -c "bash {0}"'
         run: |
-          ./docker/rpms/build-and-install-rpms.sh opensuse-leap docker/rpms/openSUSE_Leap_15.3/openSUSE_Leap_15.3.dockerfile
+          ./docker/rpms/build-and-install-rpms.sh opensuse-leap docker/rpms/openSUSE_Leap_15/openSUSE_Leap_15.dockerfile
       - name: Rename RPM
         run: |
           file-rename -v -d -e 's/koan-(\d+\.\d+\.\d+)-1\.(\w+)\.rpm/koan-$1-1.leap.$2.rpm/' rpm-build/*.rpm
@@ -111,6 +111,7 @@ jobs:
           python3-pip
           python3-libvirt-python
           python3-Sphinx
+          python3-sphinx_rtd_theme
           python3-netifaces
           tree
       - uses: actions/checkout@v4
@@ -132,14 +133,15 @@ jobs:
   create-release:
     name: Build the release and create a GitHub release
     runs-on: ubuntu-latest
-    needs: [
-      build-rockylinux-rpms,
-      build-fedora-rpms,
-      build-opensuse-leap-rpms,
-      build-opensuse-tumbleweed-rpms,
-      build-debian-debs,
-      build-wheel
-    ]
+    needs:
+      [
+        build-rockylinux-rpms,
+        build-fedora-rpms,
+        build-opensuse-leap-rpms,
+        build-opensuse-tumbleweed-rpms,
+        build-debian-debs,
+        build-wheel,
+      ]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4

.github/workflows/testing.yml

@@ -13,14 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     container: registry.opensuse.org/opensuse/tumbleweed:latest
     steps:
-      - name: Install pre reqs
-        run: zypper -n in git tar
       - uses: actions/checkout@v4
       - name: Install package deps
-        run: zypper -n in --no-recommends python3-devel python3-wheel python3-pip python3-libvirt-python python3-codecov gcc make
+        run: zypper -n in --no-recommends git tar python3 python3-devel python3-wheel python3-pip python3-libvirt-python gcc make
       - name: Install dependencies
         run: pip3 install --break-system-packages .[lint,test]
       - name: Run tests
         run: pytest --cov=./koan
-      - name: Upload report to codecov
-        run: codecov

Makefile

@@ -2,7 +2,7 @@ TOP_DIR:=$(shell pwd)
 DESTDIR=/
 PYFLAKES = $(shell { command -v pyflakes-3 || command -v pyflakes3 || command -v pyflakes; }  2> /dev/null)
 BLACK := $(shell { command -v black; } 2> /dev/null)
-
+PYTHON=/usr/bin/python3
 
 all: clean build
 
@@ -52,11 +52,11 @@ authors:
 
 sdist: authors
 	@echo "creating: sdist"
-	@python3 setup.py sdist
+	${PYTHON} -m build --sdist
 
 bdist: authors
 	@echo "creating: bdist"
-	@python3 setup.py sdist bdist_wheel
+	${PYTHON} -m build
 
 release: clean qa authors sdist bdist doc
 	@echo "creating: release artifacts"
@@ -68,19 +68,16 @@ nosetests:
 	PYTHONPATH=./koan/ nosetests -v -w tests/cli/ 2>&1 | tee test.log
 
 build:
-	python3 setup.py build -f
+	${PYTHON} -m pip wheel -f .
 
 # Debian/Ubuntu requires an additional parameter in setup.py
 install: build
 	if [ -e /etc/debian_version ]; then \
-		python3 setup.py install --root $(DESTDIR) -f --install-layout=deb; \
+		${PYTHON} -m build --root $(DESTDIR) -f --install-layout=deb; \
 	else \
-		python3 setup.py install --root $(DESTDIR) -f; \
+		${PYTHON} -m build --root $(DESTDIR) -f; \
 	fi
 
-savestate:
-	python3 setup.py -v savestate --root $(DESTDIR); \
-
 rpms: release
 	mkdir -p rpm-build
 	cp dist/*.gz rpm-build/

docker/debs/build-and-install-debs.sh

@@ -3,8 +3,7 @@
 
 set -euo pipefail
 
-if [ "$1" == "--with-tests" ]
-then
+if [ "$1" == "--with-tests" ]; then
     RUN_TESTS=true
     shift
 else
@@ -36,8 +35,7 @@ docker exec -it koan bash -c 'dpkg -i deb-build/DEBS/all/koan*.deb'
 #echo "==> Wait 5 sec. and show Koan version ..."
 #docker exec -it koan bash -c 'koan'
 
-if $RUN_TESTS
-then
+if $RUN_TESTS; then
     # Almost all of these requirement are already satisfied in the Dockerfiles!
     echo "==> Running tests ..."
     docker exec -it koan bash -c 'pip3 install coverage distro setuptools sphinx netaddr distro'
@@ -50,4 +48,4 @@ echo "==> Stop Koan container ..."
 docker stop koan
 echo "==> Delete Koan container ..."
 docker rm koan
-rm -rf ./tmp
+rm -rf ./tmp

docker/debs/debian/Debian10.dockerfile

@@ -2,12 +2,12 @@
 
 FROM debian:11
 
-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 
 # TERM=screen is fairly neutral and works with xterm for example, for others
 # you might need to pass -e TERM=<terminal>, like rxvt-unicode.
-ENV TERM screen
-ENV OSCODENAME bullseye
+ENV TERM=screen
+ENV OSCODENAME=bullseye
 
 # Add repo for debbuild and install all packages required
 # hadolint ignore=DL3008,DL3015,DL4006
@@ -21,6 +21,7 @@ RUN apt-get update -qq && \
     debbuild-macros \
     wget \
     pycodestyle \
+    python3-dev \
     python3-pyflakes \
     python3-coverage \
     python3-wheel   \

docker/rpms/Fedora/Fedora.dockerfile

@@ -10,6 +10,7 @@ RUN dnf install -y           \
     make                     \
     rpm-build                \
     virt-install             \
+    fdupes                   \
     python3-devel            \
     python3-wheel            \
     python3-build            \

…/rpms/RockyLinux8/RockyLinux8.dockerfile …/rpms/RockyLinux9/RockyLinux9.dockerfiledocker/rpms/RockyLinux8/RockyLinux8.dockerfile renamed to docker/rpms/RockyLinux9/RockyLinux9.dockerfile docker/rpms/RockyLinux8/RockyLinux8.dockerfile renamed to docker/rpms/RockyLinux9/RockyLinux9.dockerfile

@@ -1,10 +1,11 @@
 # vim: ft=dockerfile
 
-FROM rockylinux:8
+FROM rockylinux:9
 
 RUN dnf makecache && \
     dnf install -y epel-release dnf-utils && \
-    dnf config-manager --set-enabled powertools && \
+    dnf config-manager --set-enabled crb && \
+    dnf config-manager --set-enabled highavailability && \
     dnf makecache
 
 # overlay2 bug with yum/dnf
@@ -22,10 +23,13 @@ RUN touch /var/lib/rpm/* &&   \
     rpm-build                 \
     epel-rpm-macros           \
     virt-install              \
+    fdupes                    \
     python3-devel             \
+    python3-build             \
     python3-setuptools        \
     python3-wheel             \
     python3-sphinx            \
+    python3-sphinx_rtd_theme  \
     python3-distro            \
     python3-netifaces         \
     python3-libvirt

docker/rpms/build-and-install-rpms.sh

@@ -3,8 +3,7 @@
 
 set -eo pipefail
 
-if [ "$1" == "--with-tests" ]
-then
+if [ "$1" == "--with-tests" ]; then
     RUN_TESTS=true
     shift
 else
@@ -23,7 +22,11 @@ docker build -t "$IMAGE" -f "$DOCKERFILE" .
 # Build RPMs
 echo "==> Build RPMs ..."
 mkdir -p rpm-build
-docker run -ti -v "$PWD/rpm-build:/usr/src/koan/rpm-build" "$IMAGE"
+if [ "$TAG" == "opensuse-leap" ]; then
+    docker run -ti -v "$PWD/rpm-build:/usr/src/koan/rpm-build" "$IMAGE" make PYTHON=/usr/bin/python3.11 rpms
+else
+    docker run -ti -v "$PWD/rpm-build:/usr/src/koan/rpm-build" "$IMAGE"
+fi
 
 # Launch container and install koan
 echo "==> Start container ..."
@@ -36,8 +39,7 @@ docker exec -it koan bash -c 'rpm -Uvh rpm-build/koan-*.noarch.rpm'
 #echo "==> Show Koan version ..."
 #docker exec -it koan bash -c 'koan version'
 
-if $RUN_TESTS
-then
+if $RUN_TESTS; then
     echo "==> Running tests ..."
     docker exec -it koan bash -c 'pip3 install coverage distro setuptools sphinx requests netifaces'
     docker exec -it koan bash -c 'pip3 install pyflakes pycodestyle pytest pytest-cov codecov'

docker/rpms/install-rpms.sh

@@ -2,8 +2,7 @@
 # Utility script to run Docker container without building the RPMs,
 # just install them. So make sure they are in rpm-build dir!
 
-if [ "$1" == "--with-tests" ]
-then
+if [ "$1" == "--with-tests" ]; then
     RUN_TESTS=true
     shift
 else
@@ -23,8 +22,7 @@ docker exec -it koan bash -c 'rpm -Uvh rpm-build/koan-*.noarch.rpm'
 #echo "==> Show Koan version ..."
 #docker exec -it koan bash -c 'koan version'
 
-if $RUN_TESTS
-then
+if $RUN_TESTS; then
     echo "==> Running tests ..."
     docker exec -it koan bash -c 'pip3 install coverage distro setuptools sphinx requests netifaces'
     docker exec -it koan bash -c 'pip3 install pyflakes pycodestyle pytest pytest-cov codecov'