This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch AIRAVATA-3698--Add-support-for-Python-3.11 in repository https://gitbox.apache.org/repos/asf/airavata.git
commit e036cf70a0ce36f0683363047b239b91385e9b10 Author: Marcus Christie <[email protected]> AuthorDate: Thu Jun 22 16:14:08 2023 -0400 AIRAVATA-3698 Switch Django deploy to Python 3.9 --- dev-tools/ansible/roles/django/defaults/main.yml | 5 +++-- dev-tools/ansible/roles/django_setup/defaults/main.yml | 3 ++- dev-tools/ansible/roles/django_setup/tasks/install_deps_Rocky_8.yml | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dev-tools/ansible/roles/django/defaults/main.yml b/dev-tools/ansible/roles/django/defaults/main.yml index 329fa6f212..91a8e732bc 100644 --- a/dev-tools/ansible/roles/django/defaults/main.yml +++ b/dev-tools/ansible/roles/django/defaults/main.yml @@ -21,7 +21,9 @@ --- doc_root_dir: "/var/www/django-{{ gateway_id }}" user_data_dir: "/var/www/user_data" -django_venv_dir: "{{ doc_root_dir }}/venv" +python_virtualenv_command: "pyvenv-3.9" +# Upgrading Python version from 3.6 to 3.9, so creating a separate virtual env directory for 3.9 +django_venv_dir: "{{ doc_root_dir }}/venv3.9" # real_user_data_dir is the same as user_data_dir but without symbolic links in it real_user_data_dir: "{{ user_data_dir }}" vhost_servername: "{{ groups['django'][0] }}" @@ -68,7 +70,6 @@ django_wsgi_processes: 1 django_debug: false django_error_emails: "{{ admin_emails }}" -python_virtualenv_command: "pyvenv-3.6" # These directories need to be copied out of the build container and then # separately rsynced to deployment diff --git a/dev-tools/ansible/roles/django_setup/defaults/main.yml b/dev-tools/ansible/roles/django_setup/defaults/main.yml index e09cec4468..bb09dcd182 100644 --- a/dev-tools/ansible/roles/django_setup/defaults/main.yml +++ b/dev-tools/ansible/roles/django_setup/defaults/main.yml @@ -19,7 +19,8 @@ # --- -mod_wsgi_dir: /opt/mod_wsgi +# Upgrade to Python 3.9, separate install directory +mod_wsgi_dir: /opt/mod_wsgi-py3.9 mod_wsgi_url: https://github.com/GrahamDumpleton/mod_wsgi/archive/4.5.17.tar.gz mod_wsgi_tarball_dest: "{{ mod_wsgi_dir }}/{{ mod_wsgi_url | basename }}" mod_wsgi_unarchive_dir: "{{ mod_wsgi_dir }}/mod_wsgi-4.5.17" diff --git a/dev-tools/ansible/roles/django_setup/tasks/install_deps_Rocky_8.yml b/dev-tools/ansible/roles/django_setup/tasks/install_deps_Rocky_8.yml index 5bf9207b61..0b0803e1c6 100644 --- a/dev-tools/ansible/roles/django_setup/tasks/install_deps_Rocky_8.yml +++ b/dev-tools/ansible/roles/django_setup/tasks/install_deps_Rocky_8.yml @@ -23,9 +23,9 @@ - name: Install Airavata Django Portal prerequisites (Rocky 8) dnf: name={{ item }} state=latest with_items: - - python36 + - python39 - httpd-devel - - python36-devel + - python39-devel - mysql-devel - gcc - zlib-devel @@ -53,7 +53,7 @@ become: yes - name: Configure mod_wsgi - command: ./configure --with-python=/usr/bin/python3 + command: ./configure --with-python=/usr/bin/python3.9 args: chdir: "{{ mod_wsgi_unarchive_dir }}" creates: "{{ mod_wsgi_unarchive_dir }}/Makefile"
