Skip to content
Closed
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/continous-integration-workflow.yaml
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.14
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: 3.14.0

- name: Update apt repositories
run: sudo apt update
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
python 3.8.18
python 3.14.0
nodejs 24.7.0
poetry 1.8.5
467 changes: 289 additions & 178 deletions poetry.lock

Large diffs are not rendered by default.

14 changes: 8 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
[project]
name="mesh_api_specification"
python = "^3.8"
python = "^3.14.0"


[tool.poetry]
name = "mesh-api-specification"
version = "0.0.1-alpha"
description = "MESH Api specification repo"
package-mode = false

license = "MIT"

Expand All @@ -23,7 +24,7 @@ keywords = ["healthcare", "uk", "nhs"]


[tool.poetry.dependencies]
python = "^3.8"
python = "^3.14.0"
docopt = "^0.6.2"
jsonpath-rw = "^1.4.0"
semver = "^3.0.4"
Expand All @@ -32,19 +33,20 @@ gitpython = "^3.1.46"

[tool.poetry.dev-dependencies]
ruff = "^0.15.4"
black = "^24.4.2"
black = "^26.3.1"
pip-licenses = "^4.3.3"
jinja2 = "^3.1.6"
pytest = "^9.0.2"


[tool.poetry.scripts]

[tool.poetry.group.dev.dependencies]
black = "^24.4.2"
black = "^26.3.1"

[tool.black]
line-length = 120
target-version = ['py38', 'py39', 'py310', 'py311']
target-version = ['py314']
include = '\.pyi?$'
#extend-exclude = '''
#/(
Expand All @@ -62,7 +64,7 @@ exclude = [
".venv",
]
line-length = 120
target-version = "py38"
target-version = "py314"


[tool.ruff.lint]
Expand Down
2 changes: 1 addition & 1 deletion scripts/calculate_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def is_minor_inc(commit):

def without_empty(commits):
"""Takes a list of commits and returns a list without empty commits"""
pairs = zip(commits, commits[1:])
pairs = itertools.pairwise(commits)

for fst, snd in pairs:
if fst.tree != snd.tree:
Expand Down
1 change: 1 addition & 0 deletions scripts/generate_examples.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
Usage:
generate_example.py SPEC_FILE OUT_DIR
"""

import json
import os
import os.path
Expand Down
1 change: 1 addition & 0 deletions scripts/nhs_number_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

This is unused and provided as a convenience/reference implementation.
"""

import argparse


Expand Down
1 change: 1 addition & 0 deletions scripts/set_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
Reads an openapi spec on stdin and adds the calculated version to it,
then prints it on stdout.
"""

import json
import sys

Expand Down
1 change: 1 addition & 0 deletions scripts/template.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
-f <path> --file=<path> Template from file at path.
-e --env Replace from environment variables instead of JSON argument.
"""

import json
import os
import sys
Expand Down
Loading