Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
build: update all services except ecommerce to Python 3.11
Browse files Browse the repository at this point in the history
UsamaSadiq committed Nov 13, 2024
1 parent 8576712 commit 88a52fc
Showing 16 changed files with 8 additions and 25 deletions.
2 changes: 0 additions & 2 deletions playbooks/roles/blockstore/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -14,8 +14,6 @@ BLOCKSTORE_GIT_PATH: 'edx'
BLOCKSTORE_VERSION: 'master'
BLOCKSTORE_GIT_IDENTITY: !!null

BLOCKSTORE_USE_PYTHON38: True

BLOCKSTORE_REPOS:
- PROTOCOL: '{{ COMMON_GIT_PROTOCOL }}'
DOMAIN: '{{ COMMON_GIT_MIRROR }}'
2 changes: 1 addition & 1 deletion playbooks/roles/blockstore/meta/main.yml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
#
dependencies:
- role: edx_django_service
edx_django_service_use_python38: "{{ BLOCKSTORE_USE_PYTHON38 }}"
edx_django_service_use_python311: true
edx_django_service_name: '{{ blockstore_service_name }}'
edx_django_service_user: '{{ blockstore_user }}'
edx_django_service_home: '{{ COMMON_APP_DIR }}/{{ blockstore_service_name }}'
2 changes: 0 additions & 2 deletions playbooks/roles/commerce_coordinator/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -29,8 +29,6 @@ commerce_coordinator_venv_dir: "{{ commerce_coordinator_venvs_dir }}/commerce_co
commerce_coordinator_celery_default_queue: 'commerce_coordinator.default'
commerce_coordinator_hostname: "commerce-coordinator"

COMMERCE_COORDINATOR_USE_PYTHON38: True

COMMERCE_COORDINATOR_CELERY_ALWAYS_EAGER: false
COMMERCE_COORDINATOR_CELERY_BROKER_TRANSPORT: ''
COMMERCE_COORDINATOR_CELERY_BROKER_USER: ''
2 changes: 1 addition & 1 deletion playbooks/roles/commerce_coordinator/meta/main.yml
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
#
dependencies:
- role: edx_django_service
edx_django_service_use_python38: '{{ COMMERCE_COORDINATOR_USE_PYTHON38 }}'
edx_django_service_use_python311: true
edx_django_service_version: '{{ COMMERCE_COORDINATOR_VERSION }}'
edx_django_service_name: '{{ commerce_coordinator_service_name }}'
edx_django_service_home: '{{ COMMON_APP_DIR }}/{{ commerce_coordinator_service_name }}'
2 changes: 0 additions & 2 deletions playbooks/roles/designer/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -24,8 +24,6 @@ designer_gunicorn_port: 8808

designer_debian_pkgs: []

DESIGNER_USE_PYTHON38: True

DESIGNER_NGINX_PORT: '1{{ designer_gunicorn_port }}'
DESIGNER_SSL_NGINX_PORT: '4{{ designer_gunicorn_port }}'

3 changes: 1 addition & 2 deletions playbooks/roles/designer/meta/main.yml
Original file line number Diff line number Diff line change
@@ -12,8 +12,7 @@

dependencies:
- role: edx_django_service
edx_django_service_use_python38: '{{ DESIGNER_USE_PYTHON38 }}'
edx_django_service_use_python3: '{{ not DESIGNER_USE_PYTHON38 }}'
edx_django_service_use_python311: true
edx_django_service_version: '{{ DESIGNER_VERSION }}'
edx_django_service_name: '{{ designer_service_name }}'
edx_django_service_config_overrides: '{{ designer_service_config_overrides }}'
1 change: 0 additions & 1 deletion playbooks/roles/discovery/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -36,7 +36,6 @@ discovery_code_dir: "{{ discovery_home }}/{{ discovery_service_name }}"

DISCOVERY_NODE_VERSION: '16.14.0'
DISCOVERY_NPM_VERSION: '8.5.5'
DISCOVERY_USE_PYTHON38: True

#
# OS packages
2 changes: 1 addition & 1 deletion playbooks/roles/discovery/meta/main.yml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
# }
dependencies:
- role: edx_django_service
edx_django_service_use_python38: '{{ DISCOVERY_USE_PYTHON38 }}'
edx_django_service_use_python311: true
edx_django_service_repos: '{{ DISCOVERY_REPOS }}'
edx_django_service_name: '{{ discovery_service_name }}'
edx_django_service_user: '{{ discovery_user }}'
2 changes: 0 additions & 2 deletions playbooks/roles/enterprise_catalog/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -35,8 +35,6 @@ ENTERPRISE_CATALOG_CELERY_BROKER_PASSWORD: ''
ENTERPRISE_CATALOG_CELERY_BROKER_HOSTNAME: ''
ENTERPRISE_CATALOG_CELERY_BROKER_VHOST: ''

ENTERPRISE_CATALOG_USE_PYTHON38: True

enterprise_catalog_environment:
ENTERPRISE_CATALOG_CFG: '{{ COMMON_CFG_DIR }}/{{ enterprise_catalog_service_name }}.yml'

2 changes: 1 addition & 1 deletion playbooks/roles/enterprise_catalog/meta/main.yml
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@

dependencies:
- role: edx_django_service
edx_django_service_use_python38: '{{ ENTERPRISE_CATALOG_USE_PYTHON38 }}'
edx_django_service_use_python311: true
edx_django_service_enable_experimental_docker_shim: '{{ ENTERPRISE_CATALOG_ENABLE_EXPERIMENTAL_DOCKER_SHIM }}'
edx_django_service_version: '{{ ENTERPRISE_CATALOG_VERSION }}'
edx_django_service_name: '{{ enterprise_catalog_service_name }}'
3 changes: 0 additions & 3 deletions playbooks/roles/insights/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -231,9 +231,6 @@ insights_requirements:
- production.txt
- optional.txt

# flag to run Insights on Python 3.8
INSIGHTS_USE_PYTHON38: true

#
# OS packages
#
2 changes: 1 addition & 1 deletion playbooks/roles/insights/meta/main.yml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ dependencies:
code: "{{ insights_code_dir | default(None) }}"
env: "{{ insights_home | default(None) }}/insights_env"
- role: edx_service
edx_service_use_python38: "{{ INSIGHTS_USE_PYTHON38 }}"
edx_service_use_python311: true
edx_service_name: "{{ insights_service_name }}"
edx_service_config: "{{ INSIGHTS_CONFIG }}"
edx_service_repos: "{{ INSIGHTS_REPOS }}"
2 changes: 0 additions & 2 deletions playbooks/roles/license_manager/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -29,8 +29,6 @@ license_manager_venv_dir: "{{ license_manager_venvs_dir }}/license_manager"
license_manager_celery_default_queue: 'license_manager.default'
license_manager_hostname: "license-manager"

LICENSE_MANAGER_USE_PYTHON38: True

LICENSE_MANAGER_CELERY_ALWAYS_EAGER: false
LICENSE_MANAGER_CELERY_BROKER_TRANSPORT: ''
LICENSE_MANAGER_CELERY_BROKER_USER: ''
2 changes: 1 addition & 1 deletion playbooks/roles/license_manager/meta/main.yml
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
#
dependencies:
- role: edx_django_service
edx_django_service_use_python38: '{{ LICENSE_MANAGER_USE_PYTHON38 }}'
edx_django_service_use_python311: true
edx_django_service_version: '{{ LICENSE_MANAGER_VERSION }}'
edx_django_service_name: '{{ license_manager_service_name }}'
edx_django_service_home: '{{ COMMON_APP_DIR }}/{{ license_manager_service_name }}'
2 changes: 0 additions & 2 deletions playbooks/roles/registrar/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -26,8 +26,6 @@ registrar_venvs_dir: "{{ registrar_app_dir }}/venvs"
registrar_venv_dir: "{{ registrar_venvs_dir }}/registrar"
registrar_celery_default_queue: 'registrar.default'

REGISTRAR_USE_PYTHON38: True

REGISTRAR_CELERY_ALWAYS_EAGER: false
REGISTRAR_CELERY_BROKER_TRANSPORT: 'redis'
REGISTRAR_CELERY_BROKER_USER: ''
2 changes: 1 addition & 1 deletion playbooks/roles/registrar/meta/main.yml
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
#
dependencies:
- role: edx_django_service
edx_django_service_use_python38: '{{ REGISTRAR_USE_PYTHON38 }}'
edx_django_service_use_python311: true
edx_django_service_version: '{{ REGISTRAR_VERSION }}'
edx_django_service_name: '{{ registrar_service_name }}'
edx_django_service_home: '{{ COMMON_APP_DIR }}/{{ registrar_service_name }}'

0 comments on commit 88a52fc

Please sign in to comment.