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
2 changes: 1 addition & 1 deletion .envrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
layout python python3.8
layout python python3.10
4 changes: 2 additions & 2 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
- name: Checkout current branch
uses: actions/checkout@v4

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

- name: install deps
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
- name: Checkout current branch
uses: actions/checkout@v4

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

- name: install
run: |
Expand Down Expand Up @@ -62,10 +62,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.10
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: "3.10"

- name: Compare versions
run: python pr/scripts/compare_version.py ${{ steps.versions.outputs.current }} ${{ steps.versions.outputs.candidate }}
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.PHONY: build clean test install
install-deps:
@pip install --upgrade pip
@pip install poetry
@pip install poetry setuptools
@poetry install

build:
Expand Down
164 changes: 101 additions & 63 deletions poetry.lock

Large diffs are not rendered by default.

8 changes: 3 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "pytest-nhsd-apim"
version = "4.0.1"
version = "5.0.0"
description = "Pytest plugin accessing NHSDigital's APIM proxies"
authors = ["Adrian Ciobanita <adrian.ciobanita1@nhs.net>", "Alex Carrie <alexander.carrie1@nhs.net>", "Lucas Fantini <lucas.fantini@nhs.net>"]
maintainers = ["Alex Carrie <alexander.carrie1@nhs.net>", "Alex Hawdon <alex.hawdon1@nhs.net"]
Expand All @@ -11,9 +11,9 @@ license = "MIT"

[tool.poetry.dependencies]
Authlib = "^1.3.1"
cryptography = ">42.0.0"
cryptography = "^44.0.1"
lxml = "^4.9.1"
python = "^3.8"
python = "^3.10"
pycryptodome = "^3.20.0"
PyJWT = "^2.8.0"
pyotp = "^2.9.0"
Expand All @@ -25,8 +25,6 @@ pydantic = "^2.9.2"
wheel = ">=0.37.1,<0.39.0"
pydantic-settings = "^2.2.1"

[tool.poetry.dev-dependencies]

[tool.pytest.ini_options]
log_cli = true
log_cli_level = "INFO"
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def get_package_dependencies(toml_dependencies):
packages=find_packages(where="src"),
package_dir={"": "src"},
package_data={"": ["data/*"]},
python_requires=">=3.8",
python_requires=">=3.10",
entry_points={"pytest11": ["nhsd_apim = pytest_nhsd_apim.pytest_nhsd_apim"]},
classifiers=PYPROJECT_METADATA['tool']['poetry']['classifiers'],
install_requires=get_package_dependencies(PYPROJECT_METADATA['tool']['poetry']['dependencies']),
Expand Down
Loading