Projet

Général

Profil

0002-debian-switch-to-Python-3-36233.patch

Frédéric Péters, 29 septembre 2019 16:00

Télécharger (8,13 ko)

Voir les différences: 

Subject: [PATCH 2/2] debian: switch to Python 3 (#36233)


 debian/combo-manage                           |  5 +-
 debian/control                                | 59 +++++++++----------
 debian/debian_config.py                       |  6 +-
 debian/py3dist-overrides                      |  8 +++
 debian/pydist-overrides                       |  1 -
 debian/python-combo.install                   |  1 -
 debian/python-combo.maintscript               |  1 -
 .../{python-combo.dirs => python3-combo.dirs} |  0
 .../{python-combo.docs => python3-combo.docs} |  0
 debian/python3-combo.install                  |  1 +
 debian/rules                                  |  5 +-
 debian/settings.py                            |  3 +-
 debian/uwsgi.ini                              |  2 +-
 manage.py                                     |  2 +-
 14 files changed, 49 insertions(+), 45 deletions(-)
 create mode 100644 debian/py3dist-overrides
 delete mode 100644 debian/pydist-overrides
 delete mode 100644 debian/python-combo.install
 delete mode 100644 debian/python-combo.maintscript
 rename debian/{python-combo.dirs => python3-combo.dirs} (100%)
 rename debian/{python-combo.docs => python3-combo.docs} (100%)
 create mode 100644 debian/python3-combo.install
debian/combo-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
  
    
Maintainer: Jérôme Schneider <jschneider@entrouvert.com>

  		




  3
  3
  
    
Section: python

  		




  4
  4
  
    
Priority: optional

  		




  5
  
  
    
Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 9), python-django, dh-python, dh-systemd, sassc

  		




  
  5
  
    
Build-Depends: python3-setuptools, python3-all, python3-django, debhelper (>= 9), dh-python, dh-systemd, sassc

  		




  6
  6
  
    
Standards-Version: 3.9.6

  		




  7
  
  
    
X-Python-Version: >= 2.7

  		




  8
  7
  
    

  		




  9
  
  
    
Package: python-combo

  		




  
  8
  
    
Package: python3-combo

  		




  10
  9
  
    
Architecture: all

  		




  11
  
  
    
Depends: ${misc:Depends}, ${python:Depends},

  		




  12
  
  
    
    python-django (>= 1:1.11),

  		




  13
  
  
    
    python-djangorestframework (>= 3.3),

  		




  14
  
  
    
    python-gadjo (>= 0.53),

  		




  15
  
  
    
    python-pyproj,

  		




  16
  
  
    
    python-requests,

  		




  17
  
  
    
    python-feedparser,

  		




  18
  
  
    
    python-xstatic-josefinsans,

  		




  19
  
  
    
    python-xstatic-leaflet,

  		




  20
  
  
    
    python-xstatic-leaflet-markercluster,

  		




  21
  
  
    
    python-xstatic-opensans,

  		




  22
  
  
    
    python-xstatic-roboto-fontface (<< 0.5.0.0),

  		




  23
  
  
    
    python-eopayment (>= 1.35),

  		




  24
  
  
    
    python-django-haystack (>= 2.4.0),

  		




  25
  
  
    
    python-django-ratelimit,

  		




  26
  
  
    
    python-sorl-thumbnail,

  		




  27
  
  
    
    python-pil,

  		




  28
  
  
    
    python-pywebpush,

  		




  29
  
  
    
    python-pygal,

  		




  30
  
  
    
    python-lxml

  		




  31
  
  
    
Recommends: python-django-mellon, python-whoosh

  		




  
  10
  
    
Depends: ${misc:Depends}, ${python3:Depends},

  		




  
  11
  
    
    python3-django (>= 1:1.11),

  		




  
  12
  
    
    python3-djangorestframework (>= 3.3),

  		




  
  13
  
    
    python3-gadjo (>= 0.53),

  		




  
  14
  
    
    python3-pyproj,

  		




  
  15
  
    
    python3-requests,

  		




  
  16
  
    
    python3-feedparser,

  		




  
  17
  
    
    python3-xstatic-josefinsans,

  		




  
  18
  
    
    python3-xstatic-leaflet,

  		




  
  19
  
    
    python3-xstatic-leaflet-markercluster,

  		




  
  20
  
    
    python3-xstatic-opensans,

  		




  
  21
  
    
    python3-xstatic-roboto-fontface (<< 0.5.0.0),

  		




  
  22
  
    
    python3-eopayment (>= 1.35),

  		




  
  23
  
    
    python3-django-haystack (>= 2.4.0),

  		




  
  24
  
    
    python3-django-ratelimit,

  		




  
  25
  
    
    python3-sorl-thumbnail,

  		




  
  26
  
    
    python3-pil,

  		




  
  27
  
    
    python3-pywebpush,

  		




  
  28
  
    
    python3-pygal,

  		




  
  29
  
    
    python3-lxml

  		




  
  30
  
    
Recommends: python3-django-mellon, python3-whoosh

  		




  32
  31
  
    
Conflicts: python-lingo

  		




  33
  32
  
    
Breaks: combo (<< 2.34.post2)

  		




  34
  33
  
    
Description: Portal Management System (Python module)

  		




  ......




  36
  35
  
    
Package: combo

  		




  37
  36
  
    
Architecture: all

  		




  38
  37
  
    
Depends: ${misc:Depends},

  		




  39
  
  
    
    python-combo (= ${binary:Version}),

  		




  40
  
  
    
    python-hobo (>= 0.63.1),

  		




  41
  
  
    
    python-django-tenant-schemas,

  		




  42
  
  
    
    python-psycopg2,

  		




  43
  
  
    
    python-django-mellon,

  		




  
  38
  
    
    python3-combo (= ${binary:Version}),

  		




  
  39
  
    
    python3-hobo (>= 1.34),

  		




  
  40
  
    
    python3-django-tenant-schemas,

  		




  
  41
  
    
    python3-psycopg2,

  		




  
  42
  
    
    python3-django-mellon,

  		




  44
  43
  
    
    uwsgi,

  		




  45
  
  
    
    uwsgi-plugin-python

  		




  
  44
  
    
    uwsgi-plugin-python3

  		




  46
  45
  
    
Recommends: nginx

  		




  47
  46
  
    
Suggests: postgresql

  		




  48
  47
  
    
Breaks: python-combo (<< 2.34.post2)

  		












  

    
      debian/debian_config.py
    
  





  7
  7
  
    
#

  		




  8
  8
  
    
# hobotization (multitenant)

  		




  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
  
    
# add custom hobo agent module

  		




  13
  13
  
    
INSTALLED_APPS = ('hobo.agent.combo', ) + INSTALLED_APPS

  		




  ......




  18
  18
  
    
#

  		




  19
  19
  
    
# local settings

  		




  20
  20
  
    
#

  		




  21
  
  
    
execfile(os.path.join(ETC_DIR, 'settings.py'))

  		




  
  21
  
    
exec(open(os.path.join(ETC_DIR, 'settings.py')).read())

  		




  22
  22
  
    

  		




  23
  23
  
    
# run additional settings snippets

  		




  24
  
  
    
execfile('/usr/lib/hobo/debian_config_settings_d.py')

  		




  
  24
  
    
exec(open('/usr/lib/hobo/debian_config_settings_d.py').read())

  		












  

    
      debian/py3dist-overrides
    
  





  
  1
  
    
django_ckeditor python3-django-ckeditor

  		




  
  2
  
    
xstatic_leaflet python3-xstatic-leaflet,

  		




  
  3
  
    
xstatic_leaflet_markercluster python3-xstatic-leaflet-markercluster

  		




  
  4
  
    
xstatic_josefinsans python3-xstatic-josefinsans

  		




  
  5
  
    
xstatic_opensans python3-xstatic-opensans

  		




  
  6
  
    
eopayment python3-eopayment

  		




  
  7
  
    
gadjo python3-gadjo

  		




  
  8
  
    
pywebpush python3-pywebpush

  		












  

    
      debian/pydist-overrides
    
  





  1
  
  
    
django_ckeditor python-django-ckeditor

  		












  

    
      debian/python-combo.install
    
  





  1
  
  
    
usr/lib/python2*/*-packages

  		












  

    
      debian/python-combo.maintscript
    
  





  1
  
  
    
rm_conffile /etc/cron.hourly/python-combo 1.3-1 python-combo

  		












  

    
      debian/python3-combo.install
    
  





  
  1
  
    
usr/lib/python3.*

  		












  

    
      debian/rules
    
  





  1
  1
  
    
#!/usr/bin/make -f

  		




  2
  2
  
    
# -*- makefile -*-

  		




  3
  3
  
    

  		




  4
  
  
    
# Uncomment this to turn on verbose mode.

  		




  5
  
  
    
#export DH_VERBOSE=1

  		




  
  4
  
    
export PYBUILD_DISABLE=test

  		




  6
  5
  
    

  		




  7
  6
  
    
%:

  		




  8
  
  
    
	dh $@ --with python2,systemd

  		




  
  7
  
    
	dh $@ --with python3,systemd --buildsystem=pybuild

  		












  

    
      debian/settings.py
    
  





  9
  9
  
    
# WARNING! Quick-start development settings unsuitable for production!

  		




  10
  10
  
    
# See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/

  		




  11
  11
  
    

  		




  12
  
  
    
# This file is sourced by "execfile" from /usr/lib/combo/debian_config.py

  		




  
  12
  
    
# This file is sourced by "exec(open(...).read())" from

  		




  
  13
  
    
# /usr/lib/combo/debian_config.py

  		




  13
  14
  
    

  		




  14
  15
  
    
# SECURITY WARNING: don't run with debug turned on in production!

  		




  15
  16
  
    
DEBUG = False

  		












  

    
      debian/uwsgi.ini
    
  





  2
  2
  
    
auto-procname = true

  		




  3
  3
  
    
procname-prefix-spaced = combo

  		




  4
  4
  
    

  		




  5
  
  
    
plugin = python

  		




  
  5
  
    
plugin = python3

  		




  6
  6
  
    
module = combo.wsgi:application

  		




  7
  7
  
    

  		




  8
  8
  
    
http-socket = /run/combo/combo.sock

  		












  

    
      manage.py
    
  





  1
  
  
    
#!/usr/bin/env python

  		




  
  1
  
    
#!/usr/bin/env python3

  		




  2
  2
  
    
import os

  		




  3
  3
  
    
import sys

  		




  4
  4
  
    

  		




  5
  
  
    
-