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 54c7adf1ab2d33b062eb77bf0741363529e4717f Author: Marcus Christie <[email protected]> AuthorDate: Mon Jun 26 15:56:25 2023 -0400 AIRAVATA-3698 Update mod_wsgi to work with Py 3.9 --- .../ansible/inventories/scigap/develop/group_vars/django/vars.yml | 2 +- dev-tools/ansible/roles/django/defaults/main.yml | 2 +- dev-tools/ansible/roles/django/tasks/main.yml | 4 ++-- dev-tools/ansible/roles/django_setup/defaults/main.yml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-tools/ansible/inventories/scigap/develop/group_vars/django/vars.yml b/dev-tools/ansible/inventories/scigap/develop/group_vars/django/vars.yml index f189d90968..0b76cae945 100644 --- a/dev-tools/ansible/inventories/scigap/develop/group_vars/django/vars.yml +++ b/dev-tools/ansible/inventories/scigap/develop/group_vars/django/vars.yml @@ -34,7 +34,7 @@ django_database_name: "django_{{ gateway_id }}" django_hidden_airavata_apps: "['django_airavata_dataparsers']" tusd_vhost_servername: "tus.dev.scigap.org" tusd_upload_dir: "{{real_user_data_dir}}/tus-temp-dir" -airavata_django_git_branch: "develop" +airavata_django_git_branch: "AIRAVATA-3698--Add-support-for-Python-3.11" cilogon_userinfo_url: "https://cilogon.org/oauth2/userinfo"; real_user_data_dir: "/media/volume/sdb/gateway-user-data" diff --git a/dev-tools/ansible/roles/django/defaults/main.yml b/dev-tools/ansible/roles/django/defaults/main.yml index 91a8e732bc..4ebf418a38 100644 --- a/dev-tools/ansible/roles/django/defaults/main.yml +++ b/dev-tools/ansible/roles/django/defaults/main.yml @@ -21,7 +21,7 @@ --- doc_root_dir: "/var/www/django-{{ gateway_id }}" user_data_dir: "/var/www/user_data" -python_virtualenv_command: "pyvenv-3.9" +python_virtualenv_python: "python3.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 diff --git a/dev-tools/ansible/roles/django/tasks/main.yml b/dev-tools/ansible/roles/django/tasks/main.yml index 0ede03b774..23d3c9c57c 100644 --- a/dev-tools/ansible/roles/django/tasks/main.yml +++ b/dev-tools/ansible/roles/django/tasks/main.yml @@ -162,7 +162,7 @@ pip: name: "{{ item }}" virtualenv: "{{ django_venv_dir }}" - virtualenv_command: "{{ python_virtualenv_command }}" + virtualenv_python: "{{ python_virtualenv_python }}" chdir: "{{ airavata_django_checkout }}" state: latest become: yes @@ -176,7 +176,7 @@ pip: requirements: "{{ item }}" virtualenv: "{{ django_venv_dir }}" - virtualenv_command: "{{ python_virtualenv_command }}" + virtualenv_python: "{{ python_virtualenv_python }}" chdir: "{{ airavata_django_checkout }}" become: yes become_user: "{{user}}" diff --git a/dev-tools/ansible/roles/django_setup/defaults/main.yml b/dev-tools/ansible/roles/django_setup/defaults/main.yml index bb09dcd182..c75d7f4709 100644 --- a/dev-tools/ansible/roles/django_setup/defaults/main.yml +++ b/dev-tools/ansible/roles/django_setup/defaults/main.yml @@ -21,9 +21,9 @@ --- # 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_url: https://github.com/GrahamDumpleton/mod_wsgi/archive/4.9.4.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" +mod_wsgi_unarchive_dir: "{{ mod_wsgi_dir }}/mod_wsgi-4.9.4" httpd_conf_modules_dir: "/etc/httpd/conf.modules.d" ...
