From b77c415819a420d4906e6205b946d7f48122b99f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 28 Feb 2021 14:18:28 +0100 Subject: [PATCH] debian: run with python 3 (#41871) --- debian/compat | 2 +- debian/control | 26 +++++++++++++------------- debian/py3dist-overrides | 2 ++ debian/pydist-overrides | 2 -- debian/rules | 2 +- debian/uwsgi.ini | 2 +- debian/zoo-manage | 3 +-- setup.py | 2 +- 8 files changed, 20 insertions(+), 21 deletions(-) create mode 100644 debian/py3dist-overrides delete mode 100644 debian/pydist-overrides diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index c230591..23344e9 100644 --- a/debian/control +++ b/debian/control @@ -2,26 +2,26 @@ Source: zoo Section: python Priority: optional Maintainer: Benjamin Dauvergne -Build-Depends: debhelper (>= 9), +Build-Depends: debhelper (>= 10), dh-python, dh-systemd, - python-setuptools, - python-all, - python-django + python3-setuptools, + python3-all, + python3-django Standards-Version: 3.9.6 Homepage: https://dev.entrouvert.org/projects/zoo Package: zoo Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, adduser, - python-django (>= 1.10), - python-hobo, - python-django-tenant-schemas, - python-psycopg2, - python-memcache, - python-cached-property, - python-django-admin-rangefilter, +Depends: ${misc:Depends}, ${python3:Depends}, adduser, + python3-django (>= 1:1.11), + python3-hobo, + python3-django-tenant-schemas, + python3-psycopg2, + python3-memcache, + python3-cached-property, + python3-django-admin-rangefilter, uwsgi, - uwsgi-plugin-python + uwsgi-plugin-python3 Recommends: nginx, postgresql, memcached Description: Maintain a graph of objects diff --git a/debian/py3dist-overrides b/debian/py3dist-overrides new file mode 100644 index 0000000..6873c33 --- /dev/null +++ b/debian/py3dist-overrides @@ -0,0 +1,2 @@ +django_admin_rangefilter python3-django-admin-rangefilter +gadjo python3-gadjo diff --git a/debian/pydist-overrides b/debian/pydist-overrides deleted file mode 100644 index a208147..0000000 --- a/debian/pydist-overrides +++ /dev/null @@ -1,2 +0,0 @@ -django_admin_rangefilter python-django-admin-rangefilter -gadjo python-gadjo diff --git a/debian/rules b/debian/rules index 3e577c0..56d0873 100755 --- a/debian/rules +++ b/debian/rules @@ -4,4 +4,4 @@ export PYBUILD_DISABLE=test %: - dh $@ --with python2,systemd --buildsystem=pybuild + dh $@ --with python3,systemd --buildsystem=pybuild diff --git a/debian/uwsgi.ini b/debian/uwsgi.ini index d61c5ce..3fb78a1 100644 --- a/debian/uwsgi.ini +++ b/debian/uwsgi.ini @@ -2,7 +2,7 @@ auto-procname = true procname-prefix-spaced = zoo -plugin = python +plugin = python3 module = zoo.wsgi:application http-socket = /run/zoo/zoo.sock diff --git a/debian/zoo-manage b/debian/zoo-manage index a5f2e07..d130a23 100755 --- a/debian/zoo-manage +++ b/debian/zoo-manage @@ -22,5 +22,4 @@ then exit 1 fi -python ${MANAGE} "$@" - +python3 ${MANAGE} "$@" diff --git a/setup.py b/setup.py index 6492e3a..309b4dd 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # -*- coding: utf-8 -*- import os