Project

General

Profile

0001-debian-switch-to-Python-3-41206.patch

Frédéric Péters, 31 Mar 2020 09:07 PM

Download (4.65 KB)

View differences:

Subject: [PATCH] debian: switch to Python 3 (#41206)

 debian/bijoe-manage                           |  5 ++--
 debian/control                                | 26 +++++++++----------
 debian/py3dist-overrides                      |  4 +++
 debian/python-bijoe.dirs                      |  1 -
 debian/python-bijoe.install                   |  1 -
 .../{python-bijoe.docs => python3-bijoe.docs} |  0
 debian/python3-bijoe.install                  |  1 +
 debian/rules                                  |  4 ++-
 debian/uwsgi.ini                              |  2 +-
 manage.py                                     |  2 +-
 10 files changed, 25 insertions(+), 21 deletions(-)
 create mode 100644 debian/py3dist-overrides
 delete mode 100644 debian/python-bijoe.dirs
 delete mode 100644 debian/python-bijoe.install
 rename debian/{python-bijoe.docs => python3-bijoe.docs} (100%)
 create mode 100644 debian/python3-bijoe.install
debian/bijoe-manage
18 18

  
19 19
if test $# -eq 0
20 20
then
21
    python ${MANAGE} help
21
    python3 ${MANAGE} help
22 22
    exit 1
23 23
fi
24 24

  
25
python ${MANAGE} "$@"
26

  
25
python3 ${MANAGE} "$@"
debian/control
2 2
Section: python
3 3
Priority: optional
4 4
Maintainer: Benjamin Dauvergne <bdauvergne@entrouvert.com>
5
Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6), debhelper (>= 9), python-django, dh-python, dh-systemd
5
Build-Depends: python3-setuptools, python3-all, debhelper (>= 9), python3-django, dh-python, dh-systemd
6 6
Standards-Version: 3.9.1
7
Homepage: http://dev.entrouvert.org/projects/publik-bi/
7
Homepage: https://dev.entrouvert.org/projects/bijoe/
8 8

  
9
Package: python-bijoe
9
Package: python3-bijoe
10 10
Architecture: all
11
Depends: ${python:Depends},
11
Depends: ${python3:Depends},
12 12
    ${misc:Depends},
13
    python-django-jsonfield (>= 0.9.19),
14
    python-hobo,
15
    python-django-select2,
16
    python-django-tenant-schemas,
17
    python-psycopg2,
18
    python-django-mellon,
13
    python3-django-jsonfield (>= 0.9.19),
14
    python3-hobo,
15
    python3-django-select2,
16
    python3-django-tenant-schemas,
17
    python3-psycopg2,
18
    python3-django-mellon,
19 19
    wcs-olap
20 20
Description: BI dashboard from Postgres db with star schema
21 21

  
22 22
Package: bijoe
23 23
Architecture: all
24
Depends: ${python:Depends},
24
Depends: ${python3:Depends},
25 25
    ${misc:Depends},
26
    python-bijoe (= ${binary:Version}),
26
    python3-bijoe (= ${binary:Version}),
27 27
    uwsgi,
28
    uwsgi-plugin-python
28
    uwsgi-plugin-python3
29 29
Description: BI dashboard from Postgres db with star schema
debian/py3dist-overrides
1
isodate python3-isodate
2
psycopg2 python3-psycopg2
3
XStatic-ChartNew.js python3-xstatic-chartnew-js
4
xstatic-select2 python3-xstatic-select2
debian/python-bijoe.dirs
1
/usr/lib/bijoe
debian/python-bijoe.install
1
usr/lib/python2*/*-packages
debian/python3-bijoe.install
1
usr/lib/python3.*
debian/rules
1 1
#!/usr/bin/make -f
2 2

  
3
export PYBUILD_DISABLE=test
4

  
3 5
%:
4
	dh $@ --with python2,systemd
6
	dh $@ --with python3,systemd --buildsystem=pybuild
debian/uwsgi.ini
2 2
auto-procname = true
3 3
procname-prefix-spaced = bijoe
4 4

  
5
plugin = python
5
plugin = python3
6 6
module = bijoe.wsgi:application
7 7

  
8 8
http-socket = /run/bijoe/bijoe.sock
manage.py
1
#!/usr/bin/env python
1
#!/usr/bin/env python3
2 2
import os
3 3
import sys
4 4

  
5
-