From e04e4e8c85e31d6add061328c11420eac7c8b733 Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Mon, 7 Dec 2020 13:00:49 +0100 Subject: [PATCH 1/3] Python: Bump to python 3.8 --- Makefile | 8 +++---- awxkit/setup.py | 4 ++-- awxkit/tox.ini | 2 +- pytest.ini | 4 ++-- requirements/updater.sh | 4 ++-- .../roles/dockerfile/templates/Dockerfile.j2 | 24 +++++++++---------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index fb6e25e657..3813380cf8 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PYTHON ?= python3 +PYTHON ?= python3.8 PYTHON_VERSION = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_version; print(get_python_version())") SITELIB=$(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") OFFICIAL ?= no @@ -125,7 +125,7 @@ virtualenv_awx: mkdir $(VENV_BASE); \ fi; \ if [ ! -d "$(VENV_BASE)/awx" ]; then \ - virtualenv -p $(PYTHON) $(VENV_BASE)/awx; \ + $(PYTHON) -m venv $(VENV_BASE)/awx; \ $(VENV_BASE)/awx/bin/pip install $(PIP_OPTIONS) $(VENV_BOOTSTRAP); \ fi; \ fi @@ -164,7 +164,7 @@ version_file: if [ "$(VENV_BASE)" ]; then \ . $(VENV_BASE)/awx/bin/activate; \ fi; \ - python -c "import awx; print(awx.__version__)" > /var/lib/awx/.awx_version; \ + $(PYTHON) -c "import awx; print(awx.__version__)" > /var/lib/awx/.awx_version; \ # Do any one-time init tasks. comma := , @@ -292,7 +292,7 @@ swagger: reports check: black awx-link: - [ -d "/awx_devel/awx.egg-info" ] || python3 /awx_devel/setup.py egg_info_dev + [ -d "/awx_devel/awx.egg-info" ] || $(PYTHON) /awx_devel/setup.py egg_info_dev cp -f /tmp/awx.egg-link /var/lib/awx/venv/awx/lib/python$(PYTHON_VERSION)/site-packages/awx.egg-link TEST_DIRS ?= awx/main/tests/unit awx/main/tests/functional awx/conf/tests awx/sso/tests diff --git a/awxkit/setup.py b/awxkit/setup.py index 23f4e161cb..657fce0a84 100644 --- a/awxkit/setup.py +++ b/awxkit/setup.py @@ -67,7 +67,7 @@ setup( 'PyYAML', 'requests', ], - python_requires=">=3.6", + python_requires=">=3.8", extras_require={'formatting': ['jq'], 'websockets': ['websocket-client==0.57.0'], 'crypto': ['cryptography']}, license='Apache 2.0', classifiers=[ @@ -79,7 +79,7 @@ setup( 'Operating System :: MacOS :: MacOS X', 'Operating System :: POSIX :: Linux', 'Programming Language :: Python', - 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.8', 'Topic :: System :: Software Distribution', 'Topic :: System :: Systems Administration', ], diff --git a/awxkit/tox.ini b/awxkit/tox.ini index 42c72bd608..73c9493e1d 100644 --- a/awxkit/tox.ini +++ b/awxkit/tox.ini @@ -8,7 +8,7 @@ skip_missing_interpreters = true # skipsdist = true [testenv] -basepython = python3.6 +basepython = python3.8 passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH setenv = PYTHONPATH = {toxinidir}:{env:PYTHONPATH:}:. diff --git a/pytest.ini b/pytest.ini index fc407b5f17..d5d7273433 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,7 +1,7 @@ [pytest] DJANGO_SETTINGS_MODULE = awx.settings.development -python_paths = /var/lib/awx/venv/tower/lib/python3.6/site-packages -site_dirs = /var/lib/awx/venv/tower/lib/python3.6/site-packages +python_paths = /var/lib/awx/venv/tower/lib/python3.8/site-packages +site_dirs = /var/lib/awx/venv/tower/lib/python3.8/site-packages python_files = *.py addopts = --reuse-db --nomigrations --tb=native markers = diff --git a/requirements/updater.sh b/requirements/updater.sh index 2911aaf008..cca8b4a8ad 100755 --- a/requirements/updater.sh +++ b/requirements/updater.sh @@ -14,11 +14,11 @@ _cleanup() { generate_requirements() { venv="`pwd`/venv" echo $venv - /usr/bin/python3.6 -m venv "${venv}" + /usr/bin/python3.8 -m venv "${venv}" # shellcheck disable=SC1090 source ${venv}/bin/activate - ${venv}/bin/python3.6 -m pip install -U pip pip-tools + ${venv}/bin/python3.8 -m pip install -U pip pip-tools ${pip_compile} --output-file requirements.txt "${requirements_in}" "${requirements_git}" # consider the git requirements for purposes of resolving deps diff --git a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 index df076ec5c0..8feb7e90dd 100644 --- a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 +++ b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 @@ -34,16 +34,16 @@ RUN dnf -y update && \ patch \ @postgresql:12 \ postgresql-devel \ - python3-devel \ - python3-pip \ - python3-psycopg2 \ - python3-setuptools \ + python38-devel \ + python38-pip \ + python38-psycopg2 \ + python38-setuptools \ swig \ unzip \ xmlsec1-devel \ xmlsec1-openssl-devel -RUN python3 -m ensurepip && pip3 install "virtualenv < 20" +RUN python3.8 -m ensurepip && pip3 install "virtualenv < 20" # Install & build requirements ADD Makefile /tmp/Makefile @@ -94,9 +94,9 @@ RUN dnf -y update && \ @postgresql:12 \ python3-devel \ python3-libselinux \ - python3-pip \ - python3-psycopg2 \ - python3-setuptools \ + python38-pip \ + python38-psycopg2 \ + python38-setuptools \ rsync \ subversion \ sudo \ @@ -119,7 +119,7 @@ RUN curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master RUN curl -L -o /usr/bin/tini https://github.com/krallin/tini/releases/download/v0.19.0/tini-{{ tini_architecture | default('amd64') }} && \ chmod +x /usr/bin/tini -RUN python3 -m ensurepip && pip3 install "virtualenv < 20" supervisor {% if build_dev|bool %}black{% endif %} +RUN python3.8 -m ensurepip && pip3 install "virtualenv < 20" supervisor {% if build_dev|bool %}black{% endif %} RUN rm -rf /root/.cache && rm -rf /tmp/* @@ -228,8 +228,8 @@ RUN for dir in \ RUN for dir in \ /var/lib/awx/venv \ /var/lib/awx/venv/awx/bin \ - /var/lib/awx/venv/awx/lib/python3.6 \ - /var/lib/awx/venv/awx/lib/python3.6/site-packages \ + /var/lib/awx/venv/awx/lib/python3.8 \ + /var/lib/awx/venv/awx/lib/python3.8/site-packages \ /var/lib/awx/projects \ /var/lib/awx/rsyslog \ /var/run/awx-rsyslog \ @@ -238,7 +238,7 @@ RUN for dir in \ do mkdir -m 0775 -p $dir ; chmod g+rw $dir ; chgrp root $dir ; done && \ for file in \ /var/run/nginx.pid \ - /var/lib/awx/venv/awx/lib/python3.6/site-packages/awx.egg-link ; \ + /var/lib/awx/venv/awx/lib/python3.8/site-packages/awx.egg-link ; \ do touch $file ; chmod g+rw $file ; done {% endif %} From 6d8874d627a8703a8c8f86b2348698e5fb076706 Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Mon, 15 Mar 2021 20:51:05 +0100 Subject: [PATCH 2/3] Fix test issues --- awx/main/analytics/collectors.py | 3 ++- awx/main/tests/unit/models/test_ha.py | 3 +-- awx/main/tests/unit/scheduler/test_kubernetes.py | 3 +-- requirements/requirements.in | 1 + requirements/requirements.txt | 2 ++ 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/awx/main/analytics/collectors.py b/awx/main/analytics/collectors.py index abc10682a9..3cb8ade69d 100644 --- a/awx/main/analytics/collectors.py +++ b/awx/main/analytics/collectors.py @@ -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, }, diff --git a/awx/main/tests/unit/models/test_ha.py b/awx/main/tests/unit/models/test_ha.py index 83530f8ded..52d5fdc16c 100644 --- a/awx/main/tests/unit/models/test_ha.py +++ b/awx/main/tests/unit/models/test_ha.py @@ -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 diff --git a/awx/main/tests/unit/scheduler/test_kubernetes.py b/awx/main/tests/unit/scheduler/test_kubernetes.py index dc794ab65e..1f51401fe4 100644 --- a/awx/main/tests/unit/scheduler/test_kubernetes.py +++ b/awx/main/tests/unit/scheduler/test_kubernetes.py @@ -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 diff --git a/requirements/requirements.in b/requirements/requirements.in index f54094ae72..1970b215fb 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -8,6 +8,7 @@ channels channels-redis>=3.1.0 # https://github.com/django/channels_redis/issues/212 cryptography<3.0.0 daphne +distro django==2.2.16 # see UPGRADE BLOCKERs django-auth-ldap django-cors-headers diff --git a/requirements/requirements.txt b/requirements/requirements.txt index ba3cfe3087..720c4fee31 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -83,6 +83,8 @@ defusedxml==0.6.0 # social-auth-core dictdiffer==0.8.1 # via openshift +distro==1.5.0 + # via -r /awx_devel/requirements/requirements.in django-auth-ldap==2.1.0 # via -r /awx_devel/requirements/requirements.in django-cors-headers==3.2.1 From 5544e84f795810a1b2e1aabf8c1ac2100229b96b Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Wed, 24 Mar 2021 22:10:53 +0100 Subject: [PATCH 3/3] Add missing license for distro --- docs/licenses/distro.txt | 202 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) create mode 100644 docs/licenses/distro.txt diff --git a/docs/licenses/distro.txt b/docs/licenses/distro.txt new file mode 100644 index 0000000000..e06d208186 --- /dev/null +++ b/docs/licenses/distro.txt @@ -0,0 +1,202 @@ +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +