Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
ef3f1ba
AEA-6044 New config and dependencies.
originalphil Dec 1, 2025
55b5f6a
AEA-6044 Remove placeholder code. Add dynamodb_common and tests plus …
originalphil Dec 2, 2025
79af6f0
AEA-6044 All database layer code and dependencies added. Compiling (i…
originalphil Dec 3, 2025
948b9fc
AEA-6044 Change dynamodb_datastore to snake case.
originalphil Dec 4, 2025
e68a27d
AEA-6044 Add wrapper class for dynamodb_datastore.
originalphil Dec 4, 2025
e3c4942
AEA-6044 Change dynamodb_index to snake case.
originalphil Dec 4, 2025
45c74ed
AEA-6044 Change indexes to snake case.
originalphil Dec 4, 2025
cc9af9e
AEA-6044 Progress changing prescription_record to snake case.
originalphil Dec 4, 2025
7a86760
AEA-6044 Restructure prescription_record.
originalphil Dec 5, 2025
e3ea4e0
AEA-6044 Snake case changes to prescription_record complete.
originalphil Dec 5, 2025
633a747
AEA-6044 Move records into individual files.
originalphil Dec 5, 2025
7c78c2c
AEA-6044 Change repeat dispense to snake case.
originalphil Dec 5, 2025
95f107f
AEA-6044 Change repeat prescribe to snake case.
originalphil Dec 5, 2025
cf65953
AEA-6044 Some extra snake case in records.
originalphil Dec 5, 2025
baae466
AEA-6044 Snake case in next_activity_generator.
originalphil Dec 5, 2025
256cd73
AEA-6044 Move and fix tests from next activity generator.
originalphil Dec 8, 2025
90b3c11
AEA-6044 Move and fix tests for changed issue list.
originalphil Dec 8, 2025
86030c7
AEA-6044 Move and fix tests for next activity for instance.
originalphil Dec 8, 2025
a86a4c7
AEA-6044 Move and fix build indexes tests.
originalphil Dec 8, 2025
c081f51
AEA-6044 Record tests passing.
originalphil Dec 8, 2025
d290579
AEA-6044 Fix index tests.
originalphil Dec 8, 2025
314fcde
AEA-6044 Start fixing dynamodb_datastore tests.
originalphil Dec 9, 2025
4563b92
AEA-6044 Snake case dynamodb_datastore tests.
originalphil Dec 9, 2025
942c78d
AEA-6044 Create ddb table for moto.
originalphil Dec 9, 2025
b46c3c2
AEA-6044 Align table with storage repo.
originalphil Dec 9, 2025
bb9f552
AEA-6044 Fixed dynamodb_datastore tests.
originalphil Dec 9, 2025
7fb08c1
AEA-6044 Fix references to self in dynamodb_index tests.
originalphil Dec 9, 2025
8e2397e
AEA-6044 dynamodb_index tests now discovering.
originalphil Dec 9, 2025
7e46c34
AEA-6044 dynamodb_index tests now passing.
originalphil Dec 9, 2025
321dd9d
AEA-6044 Change dynamodb_index tests to snake case.
originalphil Dec 9, 2025
34e53a0
AEA-6044 Fix issues in issue.
originalphil Dec 10, 2025
4135834
AEA-6044 Add logger class to wrap Spine style logger.
originalphil Dec 10, 2025
06f853f
Merge branch 'main' into feature/phge2-aea-6044-common-code
originalphil Dec 10, 2025
cd6bde7
AEA-6044 Remove unneeded wrapper classes. Rename test classes.
originalphil Dec 11, 2025
7569c50
AEA-6044 Remove another unneeded wrapper class.
originalphil Dec 11, 2025
ee30584
updates pyproject with spine dependency versions
JackSpagnoliNHS Jan 7, 2026
75664ba
Merge branch 'main' into feature/phge2-aea-6044-common-code
originalphil Jan 9, 2026
32dee28
AEA-6044 Test fixes due to python version change.
originalphil Jan 9, 2026
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
24 changes: 24 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# EditorConfig is awesome: https://EditorConfig.org

root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.py]
indent_style = space
indent_size = 4

[*.{yml,yaml}]
indent_style = space
indent_size = 2

[*.{json,toml}]
indent_style = space
indent_size = 2

[Makefile]
indent_style = tab
3 changes: 3 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[flake8]
max-line-length = 120
extend-ignore = E203, W503
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
actionlint 1.6.26
poetry 2.1.3
python 3.12.12
python 3.10.12
shellcheck 0.9.0
935 changes: 932 additions & 3 deletions poetry.lock

Large diffs are not rendered by default.

20 changes: 9 additions & 11 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,32 @@ authors = [
{name = "Jack Spagnoli", email = "[email protected]"},
]
readme = "README.md"
requires-python = "==3.12.12"
dependencies = []
requires-python = "==3.10.12"
dependencies = ["boto3 (>=1.26.159,<2.0.0)", "botocore (>=1.29.159,<1.30.0)", "simplejson (>=3.17.2,<4.0.0)", "python-dateutil (>=2.7.0.post0,<3.0.0)", "six (>=1.5,<2.0.0)"]

[tool.poetry]
packages = [{include = "eps_spine_shared", from = "src"}]

[tool.poetry.group.dev.dependencies]
pytest = "^9.0"
black = "^25.12"
coverage = "^7.13.1"
flake8 = "^7.0"
flake8-bugbear = "^25.11"
black = "^25.12"
freezegun = "^1.5.5"
isort = "^7.0"
pre-commit = "^4.5"
moto = "^5.1.18"
parameterized = "^0.9.0"
pip-licenses = "^5.0"
pre-commit = "^4.5"
pytest = "^9.0"

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

[tool.pytest.ini_options]
testpaths = ["tests"]
python_files = ["test_*.py"]
python_files = ["test_*.py", "*_test.py"]
python_classes = ["Test*"]
python_functions = ["test_*"]

Expand All @@ -44,8 +47,3 @@ target-version = ["py312"]
profile = "black"
line_length = 100
known_first_party = ["eps_spine_shared"]

[tool.flake8]
max-line-length = 100
extend-ignore = ["E203", "W503"]
max-complexity = 10
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ sonar.host.url=https://sonarcloud.io
sonar.organization=nhsdigital
sonar.projectKey=NHSDigital_eps-spine-shared
sonar.python.coverage.reportPaths=.coverage/info.xml
sonar.python.version=3.12.12
sonar.python.version=3.10.12
Loading