Merge pull request #513 from NHSDigital/APM-6129-RevertPythonUpdate

APM-6129-RevertPythonUpdate

Author: NautiyalVikas1

ansible/collections/ansible_collections/nhsd/apigee/Makefile

@@ -4,10 +4,10 @@ update-schema:
 	@PYTHONPATH=../../../ poetry run python scripts/update_schema.py
 
 unit-test:
-	@poetry run ansible-test units --python=3.9
+	@poetry run ansible-test units --python=3.8
 
 integration-test:
-	@poetry run ansible-test integration --python=3.9
+	@poetry run ansible-test integration --python=3.8
 
 test: unit-test integration-test
 

azure/build-prereqs.yml

@@ -6,7 +6,7 @@ parameters:
 steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.9'
+      versionSpec: '3.8'
 
   - bash: |
       tfenv use 0.14.6

azure/common/apigee-build.yml

@@ -29,7 +29,7 @@ parameters:
     default: []
   - name: python_version
     type: string
-    default: "3.9"
+    default: "3.8"
   - name: agent_pool
     type: string
     default: "AWS-ECS"

azure/common/apigee-deployment.yml

@@ -150,7 +150,7 @@ parameters:
     default: 'DEPRECATED'
   - name: python_version
     type: string
-    default: "3.9"
+    default: "3.8"
   - name: agent_pool
     type: string
     default: "AWS-ECS"

azure/utils-pr-pipeline.yml

@@ -32,7 +32,7 @@ jobs:
       - task: UsePythonVersion@0
         displayName: 'Use Python 3.8'
         inputs:
-          versionSpec: 3.9
+          versionSpec: 3.8
 
       - bash: |
           instance_id="$(curl -s http://169.254.169.254/latest/meta-data/instance-id)"
@@ -103,12 +103,12 @@ jobs:
         displayName: Install utils pre-requisites
 
       - bash: |
-          ANSIBLE_FORCE_COLOR=yes poetry run ansible-test units --python=3.9
+          ANSIBLE_FORCE_COLOR=yes poetry run ansible-test units --python=3.8
         workingDirectory: ansible/collections/ansible_collections/nhsd/apigee
         displayName: Unit test ansible
 
       - bash: |
-          ANSIBLE_FORCE_COLOR=yes poetry run ansible-test integration --python=3.9
+          ANSIBLE_FORCE_COLOR=yes poetry run ansible-test integration --python=3.8
         workingDirectory: ansible/collections/ansible_collections/nhsd/apigee
         displayName: Integration test ansible
         

poetry.lock

@@ -7,7 +7,7 @@ license = "MIT"
 package-mode = false
 
 [tool.poetry.dependencies]
-python = "^3.9"
+python = "^3.8"
 docopt = "^0.6.2"
 jinja2 = "^3.1.2"
 requests = "^2.23.0"
@@ -16,7 +16,7 @@ mypy = "^0.770"
 pytest = "^5.4.2"
 pytest-cov = "^2.8.1"
 ansible = "^2.10.7"
-pyyaml = "^5.4.1"
+pyyaml = "^6.0"
 jmespath = "^0.10.0"
 awscli = "^1.18.80"
 pydantic = "^1.9.0"