Projet

Général

Profil

0001-debian-run-with-python-3-39164.patch

w.c.s. - Frédéric Péters, 22 janvier 2020 08:45

Télécharger (5,27 ko)

Voir les différences:

Subject: [PATCH] debian: run with python 3 (#39164)

 debian/control          | 45 ++++++++++++++++++++---------------------
 debian/debian_config.py |  8 ++++----
 debian/rules            |  8 +++++---
 debian/uwsgi.ini        |  2 +-
 debian/wcs-manage       |  4 ++--
 debian/wcs.triggers     |  2 +-
 setup.py                |  4 ++--
 7 files changed, 37 insertions(+), 36 deletions(-)
debian/control
2 2
Section: web
3 3
Priority: optional
4 4
Maintainer: Frederic Peters <fpeters@debian.org>
5
Build-Depends: python-quixote, debhelper (>= 9), dh-python, dh-systemd, python-setuptools, gettext, python-gadjo
5
Build-Depends: python3-quixote, debhelper (>= 9), python3-all, dh-python, dh-systemd, python3-setuptools, gettext, python3-gadjo
6 6
Standards-Version: 3.9.6.0
7 7
Homepage: https://dev.entrouvert.org/projects/wcs/
8
X-Python-Version: 2.7
9 8

  
10 9
Package: wcs
11 10
Architecture: all
12
Depends: ${misc:Depends}, ${python:Depends},
13
    python-django (>= 1.8),
14
    python-quixote,
15
    python-hobo,
11
Depends: ${misc:Depends}, ${python3:Depends},
12
    python3-django (>= 1:1.11),
13
    python3-quixote,
14
    python3-hobo,
16 15
    graphviz,
17
    python-django-ckeditor,
18
    python-django-ratelimit,
19
    python-feedparser,
20
    python-imaging,
21
    python-pyproj,
22
    python-requests,
23
    python-vobject,
24
    python-xstatic-leaflet,
16
    python3-django-ckeditor,
17
    python3-django-ratelimit,
18
    python3-feedparser,
19
    python3-imaging,
20
    python3-pyproj,
21
    python3-requests,
22
    python3-vobject,
23
    python3-xstatic-leaflet,
25 24
    uwsgi,
26
    uwsgi-plugin-python
27
Recommends: python-dns,
28
    python-xlwt,
29
    python-qrcode,
30
    python-magic,
31
    python-docutils,
25
    uwsgi-plugin-python3
26
Recommends: python3-dns,
27
    python3-xlwt,
28
    python3-qrcode,
29
    python3-magic,
30
    python3-docutils,
32 31
    poppler-utils
33
Suggests: python-libxml2,
34
    python-lasso,
35
    python-psycopg2
32
Suggests: python3-libxml2,
33
    python3-lasso,
34
    python3-psycopg2
36 35
Description: web application to design and set up online forms
37 36
 w.c.s. is a web application which allows to design and set up online forms.
38 37
 .
debian/debian_config.py
1
# This file is sourced by "execfile" from wcs.settings
1
# This file is sourced by "exec(open(..." from wcs.settings
2 2

  
3 3
import os
4 4

  
......
7 7
#
8 8
# hobotization
9 9
#
10
execfile('/usr/lib/hobo/debian_config_common.py')
10
exec(open('/usr/lib/hobo/debian_config_common.py').read())
11 11

  
12 12
# and some hobo parts that are specific to w.c.s.
13 13
TEMPLATES[0]['OPTIONS']['context_processors'] = [
......
40 40
#
41 41
# local settings
42 42
#
43
execfile(os.path.join(ETC_DIR, 'settings.py'))
43
exec(open(os.path.join(ETC_DIR, 'settings.py')).read())
44 44

  
45 45
# run additional settings snippets
46
execfile('/usr/lib/hobo/debian_config_settings_d.py')
46
exec(open('/usr/lib/hobo/debian_config_settings_d.py').read())
debian/rules
1 1
#!/usr/bin/make -f
2 2
# GNU copyright 1997 to 1999 by Joey Hess.
3 3

  
4
# Uncomment this to turn on verbose mode.
5
#export DH_VERBOSE=1
4
export PYBUILD_NAME=wcs
6 5

  
7 6
%:
8
	dh $@ --with python2,systemd
7
	dh $@ --with python3,systemd --buildsystem=pybuild
9 8

  
10 9
override_dh_install:
11 10
	dh_install
......
15 14
		$(CURDIR)/debian/wcs/usr/lib/wcs/
16 15
	install -d $(CURDIR)/debian/wcs/etc/wcs
17 16
	install -m 644 wcs.cfg-sample $(CURDIR)/debian/wcs/etc/wcs/wcs.cfg
17

  
18
override_dh_auto_test:
19
	# skip upstream tests
debian/uwsgi.ini
2 2
auto-procname = true
3 3
procname-prefix-spaced = wcs
4 4

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

  
8 8
http-socket = /run/wcs/wcs.sock
debian/wcs-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} "$@"
25
python3 ${MANAGE} "$@"
debian/wcs.triggers
1 1
interest-noawait hobo-redeploy
2
interest-noawait /usr/lib/python2.7/dist-packages/gadjo/static
2
interest-noawait /usr/lib/python3/dist-packages/gadjo/static
setup.py
12 12

  
13 13
local_cfg = None
14 14
if os.path.exists('wcs/wcs_cfg.py'):
15
    local_cfg = file('wcs/wcs_cfg.py').read()
15
    local_cfg = open('wcs/wcs_cfg.py').read()
16 16
    os.unlink('wcs/wcs_cfg.py')
17 17

  
18 18

  
......
138 138
    )
139 139

  
140 140
if local_cfg:
141
    file('wcs/wcs_cfg.py', 'w').write(local_cfg)
141
    open('wcs/wcs_cfg.py', 'w').write(local_cfg)
142
-