Merge pull request #662 from furlongm/develop

fix up rpm/deb package builds

Author: furlongm

debian/control

@@ -3,25 +3,24 @@ Section: python
 Priority: optional
 Maintainer: Marcus Furlong <furlongm@gmail.com>
 Uploaders: Marcus Furlong <furlongm@gmail.com>
-Build-Depends: debhelper (>=13), python3 (>= 3.10), dh-python, dh-exec
+Build-Depends: debhelper (>=13), python3 (>= 3.11), dh-python, dh-exec
 Standards-Version: 4.6.2
 Homepage: https://github.com/furlongm/patchman
 Vcs-Git: git://github.com/furlongm/patchman
 Vcs-Browser: https://github.com/furlongm/patchman
-X-Python3-Version: >= 3.10
+X-Python3-Version: >= 3.11
 
 Package: python3-patchman
 Architecture: all
 Homepage: https://github.com/furlongm/patchman
-Depends: ${misc:Depends}, python3 (>= 3.10), python3-django (>= 3.2),
- python3-django-tagging, python3-django-extensions, python3-django-bootstrap3,
- python3-djangorestframework, python3-django-filters, python3-debian,
+Depends: ${misc:Depends}, python3 (>= 3.11), python3-django (>= 4.2),
+ python3-django-extensions, python3-django-bootstrap3, python3-cvss,
+ python3-djangorestframework, python3-debian, python3-django-filters,
  python3-rpm, python3-tqdm, python3-lxml, python3-defusedxml,
  python3-requests, python3-colorama, python3-magic, python3-humanize,
  python3-pip, python3-pymemcache, python3-yaml, memcached, libapache2-mod-wsgi-py3,
- apache2, python3-django-taggit
->>>>>>> 922796e (switch from obsolete django-tagging to django-taggit)
-Suggests: python3-django-celery, python3-mysqldb, python3-psycopg2
+ apache2, python3-django-taggit, python3-django-celery, python3-django-celery-beat
+Suggests: python3-mysqldb, python3-psycopg2
 Description: Django-based patch status monitoring tool for linux systems.
  .
  Patchman provides a web interface for monitoring host package updates.

etc/systemd/patchman-celery.service …c/systemd/system/patchman-celery.serviceetc/systemd/patchman-celery.service renamed to etc/systemd/system/patchman-celery.service etc/systemd/patchman-celery.service renamed to etc/systemd/system/patchman-celery.service

@@ -9,7 +9,7 @@ chardet==4.0.0
 requests==2.32.3
 colorama==0.4.4
 djangorestframework==3.14.0
-django-filter==21.1
+django-filter==25.1
 humanize==3.13.1
 version-utils==0.3.0
 python-magic==0.4.25

requirements.txt

@@ -3,8 +3,7 @@ doc_files = README.md AUTHORS COPYING INSTALL.md
 install-script = scripts/rpm-install.sh
 post-install = scripts/rpm-post-install.sh
 requires = /usr/bin/python3
-    python3-django >= 3.2.20
-    python3-django-tagging
+    python3-django >= 4.2.20
     python3-django-taggit
     python3-django-extensions
     python3-django-bootstrap3
@@ -24,6 +23,7 @@ requires = /usr/bin/python3
     python3-pymemcache
     python3-mod_wsgi
     python3-importlib-metadata
+    python3-cvss
     policycoreutils-python-utils
     httpd
     python3-dnf-plugin-post-transaction-actions