From 6d724664df5d307e9c66ceac8982bccb4f367cdc Mon Sep 17 00:00:00 2001
From: Dylan Rathbone <drathbone@atlassian.com>
Date: Mon, 2 Nov 2020 10:00:13 +1000
Subject: [PATCH 1/7] Add 'lxml' as a depenency to ansible python env

---
 Pipfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Pipfile b/Pipfile
index e78f929..6f243cc 100644
--- a/Pipfile
+++ b/Pipfile
@@ -7,6 +7,7 @@ name = "pypi"
 ansible = "==2.8.5"
 boto3 = "==1.9.242"
 botocore = "==1.12.242"
+lxml = "==4.6.1"
 
 [dev-packages]
 molecule = "==2.20.2"

From 3c2b000db530bb13a1f0950a70545824030767fd Mon Sep 17 00:00:00 2001
From: Dylan Rathbone <drathbone@atlassian.com>
Date: Mon, 2 Nov 2020 16:40:52 +1000
Subject: [PATCH 2/7] Install lxml into system python env

---
 bin/install-ansible | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/install-ansible b/bin/install-ansible
index 12561c6..bdd74b8 100755
--- a/bin/install-ansible
+++ b/bin/install-ansible
@@ -8,7 +8,8 @@ if [[ $ID = "amzn" ]]; then
         python3-devel \
         python3-pip \
         python2-boto3 \
-        python2-botocore
+        python2-botocore \
+        python-pip \
 
 else
     # FIXME: Currently assumes Debian-based
@@ -21,6 +22,7 @@ export PATH=/usr/local/bin:$PATH
 export PIP_DEFAULT_TIMEOUT=60
 
 pip3 install pipenv
+python -m pip install lxml
 echo "Installing ansible and dependencies..."
 PIPENV_NOSPIN=1 PIPENV_HIDE_EMOJIS=1 pipenv sync 2>&1 | iconv -c -f utf-8 -t ascii
 

From 25ebe4c54b2b88ce11dbe6a7c0bf804f133dae30 Mon Sep 17 00:00:00 2001
From: Dylan Rathbone <drathbone@atlassian.com>
Date: Mon, 2 Nov 2020 16:41:56 +1000
Subject: [PATCH 3/7] Remove lxml from Pipfile

---
 Pipfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Pipfile b/Pipfile
index 6f243cc..e78f929 100644
--- a/Pipfile
+++ b/Pipfile
@@ -7,7 +7,6 @@ name = "pypi"
 ansible = "==2.8.5"
 boto3 = "==1.9.242"
 botocore = "==1.12.242"
-lxml = "==4.6.1"
 
 [dev-packages]
 molecule = "==2.20.2"

From e2e4ce4ba63c025174b63ed2e41bfc968f95f64e Mon Sep 17 00:00:00 2001
From: Dylan Rathbone <drathbone@atlassian.com>
Date: Tue, 3 Nov 2020 08:37:21 +1000
Subject: [PATCH 4/7] Add python2 pip for Debian installs

---
 bin/install-ansible | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/install-ansible b/bin/install-ansible
index bdd74b8..85824f6 100755
--- a/bin/install-ansible
+++ b/bin/install-ansible
@@ -16,7 +16,8 @@ else
     apt-get update && \
     apt-get install -y \
             python3-dev \
-            python3-pip
+            python3-pip \
+            python-pip \
 fi
 export PATH=/usr/local/bin:$PATH
 export PIP_DEFAULT_TIMEOUT=60

From 301f44cbefb3e0e35d878a06fb4eec2d2cf0eb22 Mon Sep 17 00:00:00 2001
From: Dylan Rathbone <drathbone@atlassian.com>
Date: Tue, 3 Nov 2020 09:16:49 +1000
Subject: [PATCH 5/7] Add python2 pip for Debian installs

---
 bin/install-ansible | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/install-ansible b/bin/install-ansible
index 85824f6..1d9fa2f 100755
--- a/bin/install-ansible
+++ b/bin/install-ansible
@@ -9,7 +9,7 @@ if [[ $ID = "amzn" ]]; then
         python3-pip \
         python2-boto3 \
         python2-botocore \
-        python-pip \
+        python-pip 
 
 else
     # FIXME: Currently assumes Debian-based
@@ -17,7 +17,7 @@ else
     apt-get install -y \
             python3-dev \
             python3-pip \
-            python-pip \
+            python-pip 
 fi
 export PATH=/usr/local/bin:$PATH
 export PIP_DEFAULT_TIMEOUT=60

From ccee6e4d8c8509419ac995fdc89448c8bd969618 Mon Sep 17 00:00:00 2001
From: Dylan Rathbone <drathbone@atlassian.com>
Date: Tue, 3 Nov 2020 10:21:13 +1000
Subject: [PATCH 6/7] Remove python2 pip for Debian installs

---
 bin/install-ansible | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/install-ansible b/bin/install-ansible
index 1d9fa2f..58d7b42 100755
--- a/bin/install-ansible
+++ b/bin/install-ansible
@@ -10,6 +10,8 @@ if [[ $ID = "amzn" ]]; then
         python2-boto3 \
         python2-botocore \
         python-pip 
+       
+     python -m pip install lxml
 
 else
     # FIXME: Currently assumes Debian-based
@@ -23,7 +25,6 @@ export PATH=/usr/local/bin:$PATH
 export PIP_DEFAULT_TIMEOUT=60
 
 pip3 install pipenv
-python -m pip install lxml
 echo "Installing ansible and dependencies..."
 PIPENV_NOSPIN=1 PIPENV_HIDE_EMOJIS=1 pipenv sync 2>&1 | iconv -c -f utf-8 -t ascii
 

From 4bda130d5f6b5d58ae0aff3899b359a3346aba56 Mon Sep 17 00:00:00 2001
From: Dylan Rathbone <drathbone@atlassian.com>
Date: Tue, 3 Nov 2020 10:24:02 +1000
Subject: [PATCH 7/7] Remove python2 pip for Debian installs

---
 bin/install-ansible | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/install-ansible b/bin/install-ansible
index 58d7b42..7b994b8 100755
--- a/bin/install-ansible
+++ b/bin/install-ansible
@@ -18,8 +18,7 @@ else
     apt-get update && \
     apt-get install -y \
             python3-dev \
-            python3-pip \
-            python-pip 
+            python3-pip
 fi
 export PATH=/usr/local/bin:$PATH
 export PIP_DEFAULT_TIMEOUT=60