Skip to content
Merged
4 changes: 2 additions & 2 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
- name: Checkout current branch
uses: actions/checkout@v3

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

- name: install deps
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

- name: Install Python 3.10
- name: Install Python 3.13
uses: actions/setup-python@v4
with:
python-version: "3.10"
python-version: "3.13"

- name: install poetry
if: always()
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:
echo ::set-output name=current::$(grep version main/pyproject.toml | awk -F\" '{print $2}')
echo ::set-output name=candidate::$(grep version pr/pyproject.toml | awk -F\" '{print $2}')

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

- name: Compare versions
run: python pr/scripts/compare_version.py ${{ steps.versions.outputs.current }} ${{ steps.versions.outputs.candidate }}
801 changes: 452 additions & 349 deletions poetry.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion proxygen_cli/lib/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ def customise_sources(
)


SETTINGS = Settings()
SETTINGS = Settings()
4 changes: 2 additions & 2 deletions proxygen_cli/test/validate_cli_version_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ def test_validate_cli_version_success(patch_request):


def test_validate_cli_version_failure(patch_request):
required_version = "3.0.0"
required_version = "4.0.0"

mocked_response = {"proxygen_cli": {"min_version": required_version}}
with patch_request(200, mocked_response), pytest.raises(RuntimeError) as e:
validate_cli_version()

assert (
str(e.value)
== "This version proxygen-cli is out-of-date. Please update to 3.0.0"
== "This version proxygen-cli is out-of-date. Please update to 4.0.0"
)
23 changes: 12 additions & 11 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "proxygen-cli"
version = "2.1.21"
version = "3.0.0"
description = "CLI for interacting with NHSD APIM's proxygen service"
authors = ["Ben Strutt <ben.strutt1@nhs.net>"]
readme = "README.md"
Expand All @@ -11,23 +11,24 @@ repository = "https://github.com/NHSDigital/proxygen-cli"
proxygen = 'proxygen_cli.cli.command_main:main'

[tool.poetry.dependencies]
python = "^3.9"
python = "^3.13"
pydantic = "^1.9.1"
click = "^8.1.3"
pyjwt = "^2.3.0"
requests = "^2.27.1"
lxml = "^4.7.1"
cryptography = ">=42,<44"
pyyaml = "^6.0"
yaspin = "^2.2.0"
click="^8.1.2"
pyjwt = "^2.9.0"
requests = "^2.32.3"
lxml = "^6.0.1"
cryptography = "44.0.1"
pyyaml = "^6.0.3"
yaspin = "^3.2.0"
tabulate = "^0.9.0"
packaging = "^24.2"
cffi = "^1.17.1"

[tool.poetry.group.dev.dependencies]
pytest = "^7.2.1"
pytest = "^8.4.2"
pytest-cov = "^4.0.0"
pytest-icdiff = "^0.6"

[build-system]
requires = ["poetry-core"]
build-backend = "poetry.core.masonry.api"
build-backend = "poetry.core.masonry.api"
Loading