You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2023/06/26 19:56:41 UTC
[airavata] branch AIRAVATA-3698--Add-support-for-Python-3.11 created (now 54c7adf1ab)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch AIRAVATA-3698--Add-support-for-Python-3.11
in repository https://gitbox.apache.org/repos/asf/airavata.git
at 54c7adf1ab AIRAVATA-3698 Update mod_wsgi to work with Py 3.9
This branch includes the following new commits:
new e036cf70a0 AIRAVATA-3698 Switch Django deploy to Python 3.9
new 54c7adf1ab AIRAVATA-3698 Update mod_wsgi to work with Py 3.9
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[airavata] 02/02: AIRAVATA-3698 Update mod_wsgi to work with Py 3.9
Posted by ma...@apache.org.
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 <ma...@apache.org>
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"
...
[airavata] 01/02: AIRAVATA-3698 Switch Django deploy to Python 3.9
Posted by ma...@apache.org.
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 <ma...@apache.org>
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"