Projet

Général

Profil

0001-install-only-on-python-3-41244.patch

Emmanuel Cazenave, 02 avril 2020 08:37

Télécharger (5,21 ko)

Voir les différences: 

Subject: [PATCH] install only on python 3 (#41244)


 clean.yml                 |  5 +--
 roles/base/tasks/main.yml | 65 +++++++++------------------------------
 roles/hobo/tasks/main.yml |  5 +--
 roles/wcs/tasks/main.yml  |  4 +--
 4 files changed, 19 insertions(+), 60 deletions(-)
clean.yml
3 3 
  tasks:
4 4 
    - name: delete python venvs
5 5 
      file:
6 
        path: "{{item}}"
6 
        path: "{{venv_py3}}"
7 7 
        state: absent
8 
      loop:
9 
        - "{{venv}}"
10 
        - "{{venv_py3}}"
11 8 

  		




  12
  9
  
    
    - name: delete app /var/lib directory

  		




  13
  10
  
    
      file:

  		












  

    
      roles/base/tasks/main.yml
    
  





  17
  17
  
    
       - make

  		




  18
  18
  
    
       - nginx

  		




  19
  19
  
    
       - postgresql

  		




  20
  
  
    
       - python-apt

  		




  21
  20
  
    
       - python3-apt

  		




  22
  
  
    
       - python-dev

  		




  23
  21
  
    
       - python3-dev

  		




  24
  
  
    
       - python-lasso

  		




  25
  22
  
    
       - python3-lasso

  		




  26
  
  
    
       - python-pip

  		




  27
  
  
    
       - python-psycopg2

  		




  28
  23
  
    
       - python3-psycopg2

  		




  29
  
  
    
       - python-virtualenv

  		




  
  24
  
    
       - python3-pip

  		




  30
  25
  
    
       - rabbitmq-server

  		




  31
  26
  
    
       - sassc

  		




  32
  27
  
    
       - supervisor

  		




  ......




  46
  41
  
    
  pip:

  		




  47
  42
  
    
    name: django

  		




  48
  43
  
    
    version: "{{django_version}}"

  		




  49
  
  
    
    virtualenv: "{{item.venv}}"

  		




  50
  
  
    
    virtualenv_python: "{{item.venv_python}}"

  		




  51
  
  
    
  loop:

  		




  52
  
  
    
    - { venv: '{{venv}}', venv_python: 'python2' }

  		




  53
  
  
    
    - { venv: '{{venv_py3}}', venv_python: 'python3' }

  		




  
  44
  
    
    virtualenv: "{{venv_py3}}"

  		




  
  45
  
    
    virtualenv_python: "python3"

  		




  54
  46
  
    

  		




  55
  47
  
    
- name: install django-debug-toolbar

  		




  56
  48
  
    
  pip:

  		




  57
  49
  
    
    name: django-debug-toolbar

  		




  58
  
  
    
    virtualenv: "{{item}}"

  		




  59
  
  
    
  loop:

  		




  60
  
  
    
    - "{{venv}}"

  		




  61
  
  
    
    - "{{venv_py3}}"

  		




  
  50
  
    
    virtualenv: "{{venv_py3}}"

  		




  62
  51
  
    

  		




  63
  52
  
    
- name: install psycopg2-binary

  		




  64
  53
  
    
  pip:

  		




  65
  54
  
    
    name: psycopg2-binary

  		




  66
  
  
    
    virtualenv: "{{item}}"

  		




  67
  
  
    
  loop:

  		




  68
  
  
    
    - "{{venv}}"

  		




  69
  
  
    
    - "{{venv_py3}}"

  		




  
  55
  
    
    virtualenv: "{{venv_py3}}"

  		




  70
  56
  
    

  		




  71
  57
  
    
- name: "create {{src_dir}} directory"

  		




  72
  58
  
    
  file:

  		




  ......




  77
  63
  
    

  		




  78
  64
  
    
- name: "create misc directory"

  		




  79
  65
  
    
  file:

  		




  80
  
  
    
    path: "{{venv}}/misc"

  		




  
  66
  
    
    path: "{{venv_py3}}/misc"

  		




  81
  67
  
    
    state: directory

  		




  82
  68
  
    

  		




  83
  69
  
    
- name: "create conf directory"

  		




  ......




  93
  79
  
    
- name: create getlasso scripts

  		




  94
  80
  
    
  template:

  		




  95
  81
  
    
    src: getlasso.j2

  		




  96
  
  
    
    dest: "{{item.dest}}/getlasso.sh"

  		




  
  82
  
    
    dest: "{{venv_py3_bin}}/getlasso.sh"

  		




  97
  83
  
    
    mode: "u=rwx,g=rx,o=rx"

  		




  98
  84
  
    
  vars:

  		




  99
  
  
    
    virtualenv_python: "{{item.vp}}"

  		




  100
  
  
    
    system_python: "{{item.sp}}"

  		




  101
  
  
    
  loop:

  		




  102
  
  
    
    - { vp: '{{venv_python}}', sp: '/usr/bin/python', dest: '{{venv_bin}}' }

  		




  103
  
  
    
    - { vp: '{{venv_py3_python}}', sp: '/usr/bin/python3', dest: '{{venv_py3_bin}}' }

  		




  
  85
  
    
    virtualenv_python: "{{venv_py3_python}}"

  		




  
  86
  
    
    system_python: "/usr/bin/python3"

  		




  104
  87
  
    

  		




  105
  88
  
    
- name: execute getlasso

  		




  106
  
  
    
  command: "{{item}}/getlasso.sh"

  		




  107
  
  
    
  loop:

  		




  108
  
  
    
    - "{{venv_bin}}"

  		




  109
  
  
    
    - "{{venv_py3_bin}}"

  		




  
  89
  
    
  command: "{{venv_py3_bin}}/getlasso.sh"

  		




  110
  90
  
    

  		




  111
  91
  
    
- name: source install eopayment

  		




  112
  92
  
    
  include_tasks: install_source.yml

  		




  ......




  120
  100
  
    
  vars:

  		




  121
  101
  
    
    repo: "debian/django-tenant-schemas"

  		




  122
  102
  
    
    repo_dir: "{{ src_dir }}/django-tenant-schemas"

  		




  123
  
  
    
    virtualenv: "{{item}}"

  		




  124
  
  
    
  loop:

  		




  125
  
  
    
    - "{{venv}}"

  		




  126
  
  
    
    - "{{venv_py3}}"

  		




  
  103
  
    
    virtualenv: "{{venv_py3}}"

  		




  127
  104
  
    

  		




  128
  105
  
    
- name: source install django-mellon

  		




  129
  106
  
    
  include_tasks: install_source.yml

  		




  130
  107
  
    
  vars:

  		




  131
  108
  
    
    repo: "django-mellon"

  		




  132
  109
  
    
    repo_dir: "{{ src_dir }}/django-mellon"

  		




  133
  
  
    
    virtualenv: "{{item}}"

  		




  134
  
  
    
  loop:

  		




  135
  
  
    
    - "{{venv}}"

  		




  136
  
  
    
    - "{{venv_py3}}"

  		




  
  110
  
    
    virtualenv: "{{venv_py3}}"

  		




  137
  111
  
    

  		




  138
  112
  
    
- name: source install gadjo

  		




  139
  113
  
    
  include_tasks: install_source.yml

  		




  140
  114
  
    
  vars:

  		




  141
  115
  
    
    repo: "gadjo"

  		




  142
  116
  
    
    repo_dir: "{{ src_dir }}/gadjo"

  		




  143
  
  
    
    virtualenv: "{{item}}"

  		




  144
  
  
    
  loop:

  		




  145
  
  
    
    - "{{venv}}"

  		




  146
  
  
    
    - "{{venv_py3}}"

  		




  
  117
  
    
    virtualenv: "{{venv_py3}}"

  		




  147
  118
  
    

  		




  148
  119
  
    
- name: install python-memcached

  		




  149
  120
  
    
  pip:

  		




  150
  121
  
    
    name: python-memcached

  		




  151
  
  
    
    virtualenv: "{{item}}"

  		




  152
  
  
    
  loop:

  		




  153
  
  
    
    - "{{venv}}"

  		




  154
  
  
    
    - "{{venv_py3}}"

  		




  
  122
  
    
    virtualenv: "{{venv_py3}}"

  		




  155
  123
  
    

  		




  156
  124
  
    
- name: source install django-ckeditor

  		




  157
  125
  
    
  include_tasks: install_source.yml

  		




  158
  126
  
    
  vars:

  		




  159
  127
  
    
    repo: "debian/django-ckeditor"

  		




  160
  128
  
    
    repo_dir: "{{ src_dir }}/django-ckeditor"

  		




  161
  
  
    
    virtualenv: "{{item}}"

  		




  162
  
  
    
  loop:

  		




  163
  
  
    
    - "{{venv}}"

  		




  164
  
  
    
    - "{{venv_py3}}"

  		




  
  129
  
    
    virtualenv: "{{venv_py3}}"

  		




  165
  130
  
    

  		




  166
  131
  
    
- name: install theme

  		




  167
  132
  
    
  import_tasks: tasks/install_theme.yml

  		












  

    
      roles/hobo/tasks/main.yml
    
  





  3
  3
  
    
  vars:

  		




  4
  4
  
    
    repo: "hobo"

  		




  5
  5
  
    
    repo_dir: "{{ src_dir }}/hobo"

  		




  6
  
  
    
    virtualenv: "{{item}}"

  		




  7
  
  
    
  loop:

  		




  8
  
  
    
    - "{{venv}}"

  		




  9
  
  
    
    - "{{venv_py3}}"

  		




  
  6
  
    
    virtualenv: "{{venv_py3}}"

  		




  10
  7
  
    

  		




  11
  8
  
    
- name: hobo app setup

  		




  12
  9
  
    
  import_role:

  		












  

    
      roles/wcs/tasks/main.yml
    
  





  3
  3
  
    
- name: copy wcs requirements.txt

  		




  4
  4
  
    
  copy:

  		




  5
  5
  
    
    src: requirements.txt

  		




  6
  
  
    
    dest: "{{venv}}/misc/wcs_requirements.txt"

  		




  
  6
  
    
    dest: "{{venv_py3}}/misc/wcs_requirements.txt"

  		




  7
  7
  
    

  		




  8
  8
  
    
- name: pip install requirements for wcs

  		




  9
  9
  
    
  pip:

  		




  10
  
  
    
    requirements: "{{venv}}/misc/wcs_requirements.txt"

  		




  
  10
  
    
    requirements: "{{venv_py3}}/misc/wcs_requirements.txt"

  		




  11
  11
  
    
    virtualenv: "{{virtualenv}}"

  		




  12
  12
  
    

  		




  13
  13
  
    
- name: source install wcs

  		




  14
  
  
    
-