entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 29 Releases Activity

debian: run with python 3 (#39164)

This commit is contained in:
Frédéric Péters 2020-01-18 11:50:24 +01:00
parent 40e5f9dd4c
commit 63378e331d
9 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
debian/control vendored
View File

@ -2,37 +2,36 @@ Source: wcs
Section: web Section: web
Priority: optional Priority: optional
Maintainer: Frederic Peters <fpeters@debian.org> Maintainer: Frederic Peters <fpeters@debian.org>
Build-Depends: python-quixote, debhelper (>= 9), dh-python, dh-systemd, python-setuptools, gettext, python-gadjo Build-Depends: python3-quixote, debhelper (>= 9), python3-all, dh-python, dh-systemd, python3-setuptools, gettext, python3-gadjo
Standards-Version: 3.9.6.0 Standards-Version: 3.9.6.0
Homepage: https://dev.entrouvert.org/projects/wcs/ Homepage: https://dev.entrouvert.org/projects/wcs/
X-Python-Version: 2.7
Package: wcs Package: wcs
Architecture: all Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, Depends: ${misc:Depends}, ${python3:Depends},
python-django (>= 1.8), python3-django (>= 1:1.11),
python-quixote, python3-quixote,
python-hobo, python3-hobo,
graphviz, graphviz,
python-django-ckeditor, python3-django-ckeditor,
python-django-ratelimit, python3-django-ratelimit,
python-feedparser, python3-feedparser,
python-imaging, python3-imaging,
python-pyproj, python3-pyproj,
python-requests, python3-requests,
python-vobject, python3-vobject,
python-xstatic-leaflet, python3-xstatic-leaflet,
uwsgi, uwsgi,
uwsgi-plugin-python uwsgi-plugin-python3
Recommends: python-dns, Recommends: python3-dns,
python-xlwt, python3-xlwt,
python-qrcode, python3-qrcode,
python-magic, python3-magic,
python-docutils, python3-docutils,
poppler-utils poppler-utils
Suggests: python-libxml2, Suggests: python3-libxml2,
python-lasso, python3-lasso,
python-psycopg2 python3-psycopg2
Description: web application to design and set up online forms Description: web application to design and set up online forms
w.c.s. is a web application which allows to design and set up online forms. w.c.s. is a web application which allows to design and set up online forms.
. .

8
debian/debian_config.py vendored
View File

@ -1,4 +1,4 @@
# This file is sourced by "execfile" from wcs.settings # This file is sourced by "exec(open(..." from wcs.settings
import os import os
@ -7,7 +7,7 @@ PROJECT_NAME = 'wcs'
# #
# hobotization # hobotization
# #
execfile('/usr/lib/hobo/debian_config_common.py') exec(open('/usr/lib/hobo/debian_config_common.py').read())
# and some hobo parts that are specific to w.c.s. # and some hobo parts that are specific to w.c.s.
TEMPLATES[0]['OPTIONS']['context_processors'] = [ TEMPLATES[0]['OPTIONS']['context_processors'] = [
@ -40,7 +40,7 @@ LOGGING = {}
# #
# local settings # local settings
# #
execfile(os.path.join(ETC_DIR, 'settings.py')) exec(open(os.path.join(ETC_DIR, 'settings.py')).read())
# run additional settings snippets # run additional settings snippets
execfile('/usr/lib/hobo/debian_config_settings_d.py') exec(open('/usr/lib/hobo/debian_config_settings_d.py').read())

8
debian/rules vendored
View File

@ -1,11 +1,10 @@
#!/usr/bin/make -f #!/usr/bin/make -f
# GNU copyright 1997 to 1999 by Joey Hess. # GNU copyright 1997 to 1999 by Joey Hess.
# Uncomment this to turn on verbose mode. export PYBUILD_NAME=wcs
#export DH_VERBOSE=1
%: %:
dh $@ --with python2,systemd dh $@ --with python3,systemd --buildsystem=pybuild
override_dh_install: override_dh_install:
dh_install dh_install
@ -15,3 +14,6 @@ override_dh_install:
$(CURDIR)/debian/wcs/usr/lib/wcs/ $(CURDIR)/debian/wcs/usr/lib/wcs/
install -d $(CURDIR)/debian/wcs/etc/wcs install -d $(CURDIR)/debian/wcs/etc/wcs
install -m 644 wcs.cfg-sample $(CURDIR)/debian/wcs/etc/wcs/wcs.cfg install -m 644 wcs.cfg-sample $(CURDIR)/debian/wcs/etc/wcs/wcs.cfg
override_dh_auto_test:
# skip upstream tests

2
debian/uwsgi.ini vendored
View File

@ -2,7 +2,7 @@
auto-procname = true auto-procname = true
procname-prefix-spaced = wcs procname-prefix-spaced = wcs
plugin = python plugin = python3
module = wcs.wsgi:application module = wcs.wsgi:application
http-socket = /run/wcs/wcs.sock http-socket = /run/wcs/wcs.sock

4
debian/wcs-manage vendored
View File

@ -18,8 +18,8 @@ fi
if test $# -eq 0 if test $# -eq 0
then then
python ${MANAGE} help python3 ${MANAGE} help
exit 1 exit 1
fi fi
python ${MANAGE} "$@" python3 ${MANAGE} "$@"

2
debian/wcs.triggers vendored
View File

@ -1,2 +1,2 @@
interest-noawait hobo-redeploy interest-noawait hobo-redeploy
interest-noawait /usr/lib/python2.7/dist-packages/gadjo/static interest-noawait /usr/lib/python3/dist-packages/gadjo/static

2
manage.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
import os import os
import sys import sys

6
setup.py
View File

@ -1,4 +1,4 @@
#! /usr/bin/env python #! /usr/bin/env python3
import os import os
import subprocess import subprocess
@ -12,7 +12,7 @@ from setuptools import setup, find_packages
local_cfg = None local_cfg = None
if os.path.exists('wcs/wcs_cfg.py'): if os.path.exists('wcs/wcs_cfg.py'):
local_cfg = file('wcs/wcs_cfg.py').read() local_cfg = open('wcs/wcs_cfg.py').read()
os.unlink('wcs/wcs_cfg.py') os.unlink('wcs/wcs_cfg.py')
@ -138,4 +138,4 @@ setup(
) )
if local_cfg: if local_cfg:
file('wcs/wcs_cfg.py', 'w').write(local_cfg) open('wcs/wcs_cfg.py', 'w').write(local_cfg)

2
wcsctl.py
View File

@ -1,4 +1,4 @@
#! /usr/bin/env python #! /usr/bin/env python3
import os import os
import sys import sys