Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
with:
fetch-depth: 0 # This causes all history to be fetched, which is required for calculate-version to function

- name: Install Python 3.8
- name: Install Python 3.9
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: 3.9

- name: Install poetry
run: pip install poetry
Expand Down
3 changes: 2 additions & 1 deletion ansible/ansible.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[defaults]
stdout_callback=debug
stderr_callback=debug
check_mode_markers=yes
check_mode_markers=yes
no_log = true
4 changes: 2 additions & 2 deletions ansible/collections/ansible_collections/nhsd/apigee/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ update-schema:
@PYTHONPATH=../../../ poetry run python scripts/update_schema.py

unit-test:
@poetry run ansible-test units --python=3.8
@poetry run ansible-test units --python=3.9

integration-test:
@poetry run ansible-test integration --python=3.8
@poetry run ansible-test integration --python=3.9

test: unit-test integration-test

Expand Down
2 changes: 1 addition & 1 deletion azure/build-prereqs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ parameters:
steps:
- task: UsePythonVersion@0
inputs:
versionSpec: '3.8'
versionSpec: '3.9'

- bash: |
tfenv use 0.14.6
Expand Down
2 changes: 1 addition & 1 deletion azure/common/apigee-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ parameters:
default: []
- name: python_version
type: string
default: "3.8"
default: "3.9"
- name: agent_pool
type: string
default: "AWS-ECS"
Expand Down
2 changes: 1 addition & 1 deletion azure/common/apigee-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ parameters:
default: 'DEPRECATED'
- name: python_version
type: string
default: "3.8"
default: "3.9"
- name: agent_pool
type: string
default: "AWS-ECS"
Expand Down
8 changes: 4 additions & 4 deletions azure/utils-pr-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ jobs:
clean: all
steps:
- task: UsePythonVersion@0
displayName: 'Use Python 3.8'
displayName: 'Use Python 3.9'
inputs:
versionSpec: 3.8
versionSpec: 3.9

- bash: |
instance_id="$(curl -s http://169.254.169.254/latest/meta-data/instance-id)"
Expand Down Expand Up @@ -103,12 +103,12 @@ jobs:
displayName: Install utils pre-requisites

- bash: |
ANSIBLE_FORCE_COLOR=yes poetry run ansible-test units --python=3.8
ANSIBLE_FORCE_COLOR=yes poetry run ansible-test units --python=3.9
workingDirectory: ansible/collections/ansible_collections/nhsd/apigee
displayName: Unit test ansible

- bash: |
ANSIBLE_FORCE_COLOR=yes poetry run ansible-test integration --python=3.8
ANSIBLE_FORCE_COLOR=yes poetry run ansible-test integration --python=3.9
workingDirectory: ansible/collections/ansible_collections/nhsd/apigee
displayName: Integration test ansible

Expand Down
507 changes: 263 additions & 244 deletions poetry.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ license = "MIT"
package-mode = false

[tool.poetry.dependencies]
python = "^3.8"
python = "^3.9"
docopt = "^0.6.2"
jinja2 = "^3.1.2"
requests = "^2.23.0"
flake8 = "^3.7.9"
mypy = "^0.770"
pytest = "^5.4.2"
pytest-cov = "^2.8.1"
ansible = "^2.9.23rc1"
ansible = "^8.5.0"
pyyaml = "^6.0"
jmespath = "^0.10.0"
awscli = "^1.18.80"
Expand Down
Loading