Merge pull request #8778 from Spredzy/bump_to_python38

Python: Bump to python 3.8

SUMMARY
Bumping default python used in awx and ansible venv to python 3.8
ISSUE TYPE

Feature Pull Request

COMPONENT NAME

API

AWX VERSION

devel

ADDITIONAL INFORMATION

N/A

Reviewed-by: Ryan Petrello <None>
Reviewed-by: Bill Nottingham <None>
Reviewed-by: Yanis Guenane <None>
This commit is contained in:
softwarefactory-project-zuul[bot]
2021-03-24 21:41:32 +00:00
committed by GitHub
12 changed files with 232 additions and 28 deletions

View File

@@ -2,6 +2,7 @@ import io
import os
import os.path
import platform
import distro
from django.db import connection
from django.db.models import Count
@@ -43,7 +44,7 @@ def config(since, **kwargs):
return {
'platform': {
'system': platform.system(),
'dist': platform.dist(),
'dist': distro.linux_distribution(),
'release': platform.release(),
'type': install_type,
},

View File

@@ -3,13 +3,12 @@ from unittest import mock
from unittest.mock import Mock
from awx.main.models import (
Job,
InstanceGroup,
)
def T(impact):
j = mock.Mock(Job())
j = mock.Mock(spec_set=['task_impact'])
j.task_impact = impact
return j

View File

@@ -1,5 +1,4 @@
import pytest
from unittest import mock
from django.conf import settings
from awx.main.models import (
@@ -14,7 +13,7 @@ from awx.main.scheduler.kubernetes import PodManager
@pytest.fixture
def container_group():
instance_group = mock.Mock(InstanceGroup(name='container-group'))
instance_group = InstanceGroup(name='container-group', id=1)
return instance_group