From 229ed53c0e6266c21f1894e4a81defafe5fb1e2b Mon Sep 17 00:00:00 2001
From: Satoe Imaishi <simaishi@redhat.com>
Date: Thu, 24 Mar 2022 23:02:30 -0400
Subject: [PATCH] Add setuptools_scm[toml] and pkgconfig, xmlsec's build dep

---
 Makefile                      |  2 +-
 requirements/README.md        |  2 +-
 requirements/requirements.in  |  3 +++
 requirements/requirements.txt | 12 +++++++++++-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 82145505d4..56ee18a44d 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ RECEPTOR_IMAGE ?= quay.io/ansible/receptor:devel
 SRC_ONLY_PKGS ?= cffi,pycparser,psycopg2,twilio
 # These should be upgraded in the AWX and Ansible venv before attempting
 # to install the actual requirements
-VENV_BOOTSTRAP ?= pip==21.2.4 setuptools==58.2.0 wheel==0.36.2
+VENV_BOOTSTRAP ?= pip==21.2.4 setuptools==58.2.0 setuptools_scm[toml]==6.4.2 wheel==0.36.2
 
 NAME ?= awx
 
diff --git a/requirements/README.md b/requirements/README.md
index a10d412f2c..0f5f48f1b6 100644
--- a/requirements/README.md
+++ b/requirements/README.md
@@ -105,7 +105,7 @@ Upgrading to 4.0.0 causes error because imports changed.
 ImportError: cannot import name 'KeyVaultClient'
 ```
 
-### pip and setuptools
+### pip, setuptools and setuptools_scm
 
 The offline installer needs to have functionality confirmed before upgrading these.
 Versions need to match the versions used in the pip bootstrapping step
diff --git a/requirements/requirements.in b/requirements/requirements.in
index 48f4153086..b32b5e6b92 100644
--- a/requirements/requirements.in
+++ b/requirements/requirements.in
@@ -58,6 +58,9 @@ uwsgitop
 wheel
 pip==21.2.4  # see UPGRADE BLOCKERs
 setuptools==58.2.0  # see UPGRADE BLOCKERs
+setuptools_scm[toml]>=3.4  # see UPGRADE BLOCKERs, xmlsec build dep
+lxml>=3.8 # xmlsec build dep
+pkgconfig>=1.5.1 # xmlsec build dep
 
 # Temporarily added to use ansible-runner from git branch, to be removed
 # when ansible-runner moves from requirements_git.txt to here
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 1349f34ffd..0488b17a25 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -192,6 +192,7 @@ lockfile==0.12.2
     # via python-daemon
 lxml==4.7.0
     # via
+    #   -r /awx_devel/requirements/requirements.in
     #   python3-saml
     #   xmlsec
 markdown==3.2.1
@@ -225,13 +226,17 @@ oauthlib==3.2.0
 openshift==0.11.0
     # via -r /awx_devel/requirements/requirements.in
 packaging==21.3
-    # via ansible-runner
+    # via
+    #   ansible-runner
+    #   setuptools-scm
 pbr==5.6.0
     # via -r /awx_devel/requirements/requirements.in
 pexpect==4.7.0
     # via
     #   -r /awx_devel/requirements/requirements.in
     #   ansible-runner
+pkgconfig==1.5.5
+    # via -r /awx_devel/requirements/requirements.in
 prometheus-client==0.7.1
     # via -r /awx_devel/requirements/requirements.in
 psutil==5.8.0
@@ -339,6 +344,8 @@ schedule==0.6.0
     # via -r /awx_devel/requirements/requirements.in
 service-identity==18.1.0
     # via twisted
+setuptools-scm[toml]==6.4.2
+    # via -r /awx_devel/requirements/requirements.in
 six==1.14.0
     # via
     #   ansible-runner
@@ -380,6 +387,8 @@ tempora==2.1.0
     # via
     #   irc
     #   jaraco-logging
+tomli==2.0.1
+    # via setuptools-scm
 twilio==6.37.0
     # via -r /awx_devel/requirements/requirements.in
 twisted[tls]==20.3.0
@@ -421,4 +430,5 @@ setuptools==58.2.0
     #   kubernetes
     #   markdown
     #   python-daemon
+    #   setuptools-scm
     #   zope-interface